test: Updated bufstore test to reflect changes in #871

Author: AndreasAakesson

test/net/integration/bufstore/service.cpp

@@ -32,9 +32,9 @@ auto create_packet(BufferStore& bufstore) {
   // get buffer (as packet + data)
   auto* ptr = (Packet*) bufstore.get_buffer();
   // place packet at front of buffer
-  new (ptr) Packet(MTU, 0, {&bufstore, &BufferStore::release});
+  new (ptr) Packet(MTU, 0, &bufstore);
   // regular shared_ptr that calls delete on Packet
-  return std::shared_ptr<Packet>(ptr);
+  return std::unique_ptr<Packet>(ptr);
 }
 
 void Service::start(const std::string&)
@@ -52,7 +52,7 @@ void Service::start(const std::string&)
   // Chain packets
   for (int i = 0; i < chain_size - 1; i++){
     auto chained_packet = create_packet(bufstore_);
-    packet->chain(chained_packet);
+    packet->chain(std::move(chained_packet));
     CHECKSERT(bufstore_.available() == BUFFER_CNT - i - 2, "Bufcount is now %i", BUFFER_CNT - i - 2);
   }
 
@@ -70,20 +70,20 @@ void Service::start(const std::string&)
   // Chain
   for (int i = 0; i < chain_size - 1; i++){
     auto chained_packet = create_packet(bufstore_);
-    packet->chain(chained_packet);
+    packet->chain(std::move(chained_packet));
     CHECKSERT(bufstore_.available() == BUFFER_CNT - i - 2, "Bufcount is now %i", BUFFER_CNT - i - 2);
   }
 
   INFO("Test 2","Releasing packet-chain one-by-one");
 
   // Release one-by-one
-  auto tail = packet;
+  auto tail = std::move(packet);
   size_t i = 0;
   while(tail && i < BUFFER_CNT - 1) {
-    tail = tail->detach_tail();
     CHECKSERT(bufstore_.available() == i,
               "Bufcount is now %i == %i", i,
               bufstore_.available());
+    tail = tail->detach_tail();
     i++;
   }