rename ca info APIs
Change-Id: Ie1a62f167fff7aeb2051e8642a30e6f0b4e616f3
diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 9125cc6..83a5936 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -111,14 +111,14 @@
}
shared_ptr<Data>
-CaModule::generateCaConfigMetaData()
+CaModule::generateCaProfileMetaData()
{
// @TODO
// make metadata a class member variable m_infoMetadata
// check whether the m_infoMetadata has the latest versioned name, if not, then generate a new one
// otherwise, directly reply m_infoMetadata.makeData
- auto infoPacket = generateCaConfigData();
+ auto infoPacket = generateCaProfileData();
MetadataObject metadata;
metadata.setVersionedName(infoPacket->getName().getPrefix(-1));
Name discoveryInterestName(infoPacket->getName().getPrefix(-2));
@@ -129,7 +129,7 @@
}
shared_ptr<Data>
-CaModule::generateCaConfigData()
+CaModule::generateCaProfileData()
{
// @TODO
// make CaInfo Data packet a class member variable m_infoData
diff --git a/src/ca-module.hpp b/src/ca-module.hpp
index 76713d0..fe4ccf9 100644
--- a/src/ca-module.hpp
+++ b/src/ca-module.hpp
@@ -56,13 +56,10 @@
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
shared_ptr<Data>
- generateCaConfigMetaData();
+ generateCaProfileMetaData();
shared_ptr<Data>
- generateCaConfigData();
-
- void
- onInfo(const Interest& request);
+ generateCaProfileData();
void
onProbe(const Interest& request);
diff --git a/src/name-assignments/assignment-or.cpp b/src/name-assignments/assignment-or.cpp
index cd1f306..6fc3e97 100644
--- a/src/name-assignments/assignment-or.cpp
+++ b/src/name-assignments/assignment-or.cpp
@@ -8,8 +8,6 @@
namespace ndn {
namespace ndncert {
-_LOG_INIT(ndncert.assignment.or);
-
NDNCERT_REGISTER_FUNCFACTORY(AssignmentOr, "or");
AssignmentOr::AssignmentOr()