commit b3a23ca7112aa0866e6538ec779a6ccf526195f8
author Davide Pesavento <davidepesa@gmail.com> Sat May 04 20:40:21 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Tue May 07 00:32:57 2019 -0400
tree 8ff908dacb617d9da0ec158f09402e7f2d8cbbd8
parent 075bb7dac4bf72cbfcff5e3c2da25c6476090787

face: eliminate Transport::Packet wrapper type

Refs: #4843
Change-Id: I5977be55e8bdac33c989e3b8523fea764f304c37

tests/daemon/face/unicast-udp-transport.t.cpp

diff --git a/tests/daemon/face/unicast-udp-transport.t.cpp b/tests/daemon/face/unicast-udp-transport.t.cpp
index 9ef5b95..e5962db 100644
--- a/tests/daemon/face/unicast-udp-transport.t.cpp
+++ b/tests/daemon/face/unicast-udp-transport.t.cpp
@@ -84,7 +84,7 @@
 
   int nStateChanges = 0;
   transport->afterStateChange.connect(
-    [this, &nStateChanges] (TransportState oldState, TransportState newState) {
+    [this, &nStateChanges] (auto oldState, auto newState) {
       switch (nStateChanges) {
       case 0:
         BOOST_CHECK_EQUAL(oldState, TransportState::UP);
@@ -98,7 +98,7 @@
         BOOST_CHECK(false);
       }
       nStateChanges++;
-      limitedIo.afterOp();
+      this->limitedIo.afterOp();
     });
 
   BOOST_REQUIRE_EQUAL(limitedIo.run(2, 8_s), LimitedIo::EXCEED_OPS);
@@ -115,18 +115,17 @@
 {
   TRANSPORT_TEST_INIT(Persistency::value);
 
-  transport->afterStateChange.connectSingleShot([this] (TransportState oldState, TransportState newState) {
+  transport->afterStateChange.connectSingleShot([this] (auto oldState, auto newState) {
     BOOST_CHECK_EQUAL(oldState, TransportState::UP);
     BOOST_CHECK_EQUAL(newState, TransportState::FAILED);
     this->limitedIo.afterOp();
   });
 
   remoteSocket.close();
-  Transport::Packet pkt(ndn::encoding::makeStringBlock(300, "hello"));
-  transport->send(std::move(pkt)); // trigger ICMP error
+  transport->send(ndn::encoding::makeStringBlock(300, "hello")); // trigger ICMP error
   BOOST_REQUIRE_EQUAL(limitedIo.run(1, 1_s), LimitedIo::EXCEED_OPS);
 
-  transport->afterStateChange.connectSingleShot([this] (TransportState oldState, TransportState newState) {
+  transport->afterStateChange.connectSingleShot([this] (auto oldState, auto newState) {
     BOOST_CHECK_EQUAL(oldState, TransportState::FAILED);
     BOOST_CHECK_EQUAL(newState, TransportState::CLOSED);
     this->limitedIo.afterOp();
@@ -142,7 +141,7 @@
   remoteSocket.close();
 
   Block block1 = ndn::encoding::makeStringBlock(300, "hello");
-  transport->send(Transport::Packet{Block{block1}}); // make a copy of the block
+  transport->send(block1);
   BOOST_CHECK_EQUAL(transport->getCounters().nOutPackets, 1);
   BOOST_CHECK_EQUAL(transport->getCounters().nOutBytes, block1.size());
 
@@ -151,7 +150,7 @@
 
   remoteConnect();
 
-  transport->send(Transport::Packet{Block{block1}}); // make a copy of the block
+  transport->send(block1);
   BOOST_CHECK_EQUAL(transport->getCounters().nOutPackets, 2);
   BOOST_CHECK_EQUAL(transport->getCounters().nOutBytes, 2 * block1.size());