**breaking** consolidate src/tlv/*lsa* into src/lsa/*lsa*
Lsa de/serialize functions are replaced by wireEncode/Decode.
Update LSA wire formats. Change TLV assignments as required.
Update nlsrc to print using new encoding.
refs: #4787
Change-Id: Ie8d40b7836d51ea5bb444c8db208dc2b3a0d1cec
diff --git a/tests/test-lsa-segment-storage.cpp b/tests/test-lsa-segment-storage.cpp
index 2881d88..7862e45 100644
--- a/tests/test-lsa-segment-storage.cpp
+++ b/tests/test-lsa-segment-storage.cpp
@@ -26,7 +26,7 @@
#include "test-common.hpp"
#include "nlsr.hpp"
#include "name-prefix-list.hpp"
-#include "lsa.hpp"
+// #include "lsa.hpp"
namespace nlsr {
namespace test {
@@ -68,9 +68,9 @@
npl1.insert("name1-" + std::to_string(i));
}
NameLsa nameLsa("/ndn/other-site/%C1.Router/other-router", 12,
- ndn::time::system_clock::now() + ndn::time::seconds(LSA_REFRESH_TIME_DEFAULT), npl1);
- segmentPublisher.publish(interestName, interestName,
- ndn::encoding::makeStringBlock(ndn::tlv::Content, nameLsa.serialize()),
+ ndn::time::system_clock::now() + ndn::time::seconds(LSA_REFRESH_TIME_DEFAULT),
+ npl1);
+ segmentPublisher.publish(interestName, interestName, nameLsa.wireEncode(),
ndn::time::seconds(LSA_REFRESH_TIME_DEFAULT));
}