fw: abstract Nack processing out of BestRouteStrategy2

refs #3176

Change-Id: Ib220269ff52acc47c65f854a610941afd862ad41

tests/test-common.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -119,14 +119,20 @@ makeLink(const Name& name, std::initializer_list<std::pair<uint32_t, Name>> dele
 }
 
 lp::Nack
-makeNack(const Name& name, uint32_t nonce, lp::NackReason reason)
+makeNack(Interest interest, lp::NackReason reason)
 {
-  Interest interest(name);
-  interest.setNonce(nonce);
   lp::Nack nack(std::move(interest));
   nack.setReason(reason);
   return nack;
 }
 
+lp::Nack
+makeNack(const Name& name, uint32_t nonce, lp::NackReason reason)
+{
+  Interest interest(name);
+  interest.setNonce(nonce);
+  return makeNack(std::move(interest), reason);
+}
+
 } // namespace tests
 } // namespace nfd