clean closure api
diff --git a/test/test-ccnx-tunnel.cc b/test/test-ccnx-tunnel.cc
index 5a5abc5..6c2ab0d 100644
--- a/test/test-ccnx-tunnel.cc
+++ b/test/test-ccnx-tunnel.cc
@@ -82,14 +82,14 @@
g_dc_o = 0;
t1->publishData(Name(inner), (const unsigned char *)inner.c_str(), inner.size(), 5);
usleep(100000);
- Closure *outerClosure = new Closure(1, bind(outerCallback, _1, _2));
+ Closure *outerClosure = new Closure(bind(outerCallback, _1, _2));
c1->sendInterest(Name("/local/hello"), outerClosure);
usleep(100000);
// it is indeed published as /local/hello
BOOST_CHECK_EQUAL(g_dc_o, 1);
g_dc_i = 0;
- Closure *innerClosure = new Closure(1, bind(innerCallback, _1, _2));
+ Closure *innerClosure = new Closure(bind(innerCallback, _1, _2));
t2->sendInterest(Name(inner), innerClosure);
usleep(100000);
BOOST_CHECK_EQUAL(g_dc_i, 1);
@@ -107,7 +107,7 @@
t3.overridePrefix();
t3.setInterestFilter(Name("/t3"), bind(interestCallback, _1));
usleep(100000);
- Closure *innerClosure = new Closure(1, bind(innerCallback, _1, _2));
+ Closure *innerClosure = new Closure(bind(innerCallback, _1, _2));
t1->sendInterest(Name("/t3/hello"), innerClosure);
usleep(100000);
BOOST_CHECK_EQUAL(g_dc_i, 1);
diff --git a/test/test-ccnx-wrapper.cc b/test/test-ccnx-wrapper.cc
index 7c010ec..651692f 100644
--- a/test/test-ccnx-wrapper.cc
+++ b/test/test-ccnx-wrapper.cc
@@ -53,7 +53,7 @@
usleep(100000);
c2->setInterestFilter(prefix2, bind(publish2, _1));
- Closure *closure = new Closure(1, bind(dataCallback, _1, _2), bind(timeout, _1));
+ Closure *closure = new Closure(bind(dataCallback, _1, _2), bind(timeout, _1));
c1->sendInterest(Name("/c2/hi"), closure);
usleep(100000);
@@ -69,7 +69,7 @@
BOOST_AUTO_TEST_CASE (CcnxWrapperSelector)
{
- Closure *closure = new Closure(1, bind(dataCallback, _1, _2), bind(timeout, _1));
+ Closure *closure = new Closure(bind(dataCallback, _1, _2), bind(timeout, _1));
Selectors selectors;
selectors.interestLifetime(1);