commit e28d8756ce283217400da735e334746630263abc
author Davide Pesavento <davidepesa@gmail.com> Sat Mar 19 03:55:25 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sat Mar 19 03:55:25 2022 -0400
tree f22b71b83f3db5bfd101762e320b4fe9db4abb92
parent d1f1df802cf4f78b51ce1631a4628997b889afe4

Avoid deprecated ndn-cxx functions

Change-Id: I763368c2ea12902b4ea400f92c23b17ad5a5628e

tests/update/test-advertise-crash.cpp

diff --git a/tests/update/test-advertise-crash.cpp b/tests/update/test-advertise-crash.cpp
index 09a27d7..8925469 100644
--- a/tests/update/test-advertise-crash.cpp
+++ b/tests/update/test-advertise-crash.cpp
@@ -83,7 +83,7 @@
   ndn::nfd::ControlParameters parameters;
   parameters.setName("/prefix/to/advertise");
   ndn::Name advertiseCommand("/localhost/nlsr/prefix-update/advertise");
-  advertiseCommand.append(parameters.wireEncode());
+  advertiseCommand.append(ndn::tlv::GenericNameComponent, parameters.wireEncode());
 
   auto advertiseInterest = std::make_shared<ndn::Interest>(advertiseCommand);
   face.receive(*advertiseInterest);

tests/update/test-nfd-rib-command-processor.cpp

diff --git a/tests/update/test-nfd-rib-command-processor.cpp b/tests/update/test-nfd-rib-command-processor.cpp
index cc23dd0..c9be622 100644
--- a/tests/update/test-nfd-rib-command-processor.cpp
+++ b/tests/update/test-nfd-rib-command-processor.cpp
@@ -54,7 +54,7 @@
   void
   sendCommand(ndn::Name prefix, const ndn::nfd::ControlParameters& parameters)
   {
-    ndn::Interest interest(prefix.append(parameters.wireEncode()));
+    ndn::Interest interest(prefix.append(ndn::tlv::GenericNameComponent, parameters.wireEncode()));
     face.receive(interest);
     this->advanceClocks(ndn::time::milliseconds(10), 10);
   }

tests/update/test-prefix-update-processor.cpp

diff --git a/tests/update/test-prefix-update-processor.cpp b/tests/update/test-prefix-update-processor.cpp
index 9c20114..ac50943 100644
--- a/tests/update/test-prefix-update-processor.cpp
+++ b/tests/update/test-prefix-update-processor.cpp
@@ -161,7 +161,7 @@
   ndn::Name advertiseCommand("/localhost/nlsr/prefix-update/advertise");
 
   // append /<control-parameters>
-  advertiseCommand.append(parameters.wireEncode());
+  advertiseCommand.append(ndn::tlv::GenericNameComponent, parameters.wireEncode());
 
   ndn::security::InterestSigner signer(m_keyChain);
 
@@ -186,7 +186,7 @@
 
   // Withdraw
   ndn::Name withdrawCommand("/localhost/nlsr/prefix-update/withdraw");
-  withdrawCommand.append(parameters.wireEncode());
+  withdrawCommand.append(ndn::tlv::GenericNameComponent, parameters.wireEncode());
 
   auto withdrawInterest= signer.makeCommandInterest(withdrawCommand,
                                                     ndn::security::signingByIdentity(opIdentity));

tests/update/test-save-delete-prefix.cpp

diff --git a/tests/update/test-save-delete-prefix.cpp b/tests/update/test-save-delete-prefix.cpp
index 9843489..c4db1bc 100644
--- a/tests/update/test-save-delete-prefix.cpp
+++ b/tests/update/test-save-delete-prefix.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2021,  The University of Memphis,
+ * Copyright (c) 2014-2022,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -144,11 +144,11 @@
     ndn::security::InterestSigner signer(m_keyChain);
     // type true for advertise, else withdraw
     if (type == "advertise") {
-      advertiseCommand.append(parameters.wireEncode());
+      advertiseCommand.append(ndn::tlv::GenericNameComponent, parameters.wireEncode());
       return signer.makeCommandInterest(advertiseCommand, ndn::security::signingByIdentity(opIdentity));
     }
     else {
-      withdrawCommand.append(parameters.wireEncode());
+      withdrawCommand.append(ndn::tlv::GenericNameComponent, parameters.wireEncode());
       return signer.makeCommandInterest(withdrawCommand, ndn::security::signingByIdentity(opIdentity));
     }
   }