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/dummy-link-service.hpp

diff --git a/tests/daemon/face/dummy-link-service.hpp b/tests/daemon/face/dummy-link-service.hpp
index b1caf8c..44ed991 100644
--- a/tests/daemon/face/dummy-link-service.hpp
+++ b/tests/daemon/face/dummy-link-service.hpp
@@ -38,10 +38,16 @@
   LogSentData         = 1 << 1, ///< log sent Data packets
   LogSentNacks        = 1 << 2, ///< log sent Nack packets
   LogSentPackets      = LogSentInterests | LogSentData | LogSentNacks, ///< log all sent packets
-  LogReceivedPackets  = 1 << 3, ///< log all received packets (as Transport::Packet)
+  LogReceivedPackets  = 1 << 3, ///< log all received link-layer packets
   LogAllPackets       = LogSentPackets | LogReceivedPackets, ///< log all sent and received packets
 };
 
+struct RxPacket
+{
+  Block packet;
+  EndpointId endpoint;
+};
+
 /** \brief A dummy LinkService that logs all sent and received packets.
  */
 class DummyLinkService final : public LinkService
@@ -67,22 +73,22 @@
 
 private:
   void
-  doSendInterest(const Interest& interest, const EndpointId& endpointId) final;
+  doSendInterest(const Interest& interest, const EndpointId& endpoint) final;
 
   void
-  doSendData(const Data& data, const EndpointId& endpointId) final;
+  doSendData(const Data& data, const EndpointId& endpoint) final;
 
   void
-  doSendNack(const lp::Nack& nack, const EndpointId& endpointId) final;
+  doSendNack(const lp::Nack& nack, const EndpointId& endpoint) final;
 
   void
-  doReceivePacket(Transport::Packet&& packet) final;
+  doReceivePacket(const Block& packet, const EndpointId& endpoint) final;
 
 public:
   std::vector<Interest> sentInterests;
   std::vector<Data> sentData;
   std::vector<lp::Nack> sentNacks;
-  std::vector<Transport::Packet> receivedPackets;
+  std::vector<RxPacket> receivedPackets;
 
 private:
   PacketLoggingFlags m_loggingFlags = LogAllPackets;