tests: set CanBePrefix in daemon tests
This commit also updates makeInterest and makeNack functions
so that their APIs are compatible with ndn-cxx test suite.
refs #4581
Change-Id: I0c81740416c26a03450dc3a12c89944b72ce5901
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index 63b1a99..e123b5e 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -48,12 +48,11 @@
namespace tests {
/** \brief create an Interest
- * \param name Interest name
- * \param nonce if non-zero, set Nonce to this value
- * (useful for creating Nack with same Nonce)
*/
shared_ptr<Interest>
-makeInterest(const Name& name, uint32_t nonce = 0);
+makeInterest(const Name& name, bool canBePrefix = false,
+ optional<time::milliseconds> lifetime = nullopt,
+ optional<uint32_t> nonce = nullopt);
/** \brief create a Data with fake signature
* \note Data may be modified afterwards without losing the fake signature.
@@ -83,14 +82,6 @@
lp::Nack
makeNack(Interest interest, lp::NackReason reason);
-/** \brief create a Nack
- * \param name Interest name
- * \param nonce Interest nonce
- * \param reason Nack reason
- */
-lp::Nack
-makeNack(const Name& name, uint32_t nonce, lp::NackReason reason);
-
/** \brief replace a name component
* \param[inout] name name
* \param index name component index