commit 44c6a35bf38b10d441409fccaa1a31352557b8eb
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Dec 14 10:57:17 2020 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Dec 14 10:57:17 2020 -0800
tree 5277058eb068faac23b8aadeebb6b6209a56ec52
parent 2de4ea3dc75071a48c395af0a97d780c177bf1bf

remove m_ prefix

Change-Id: I67aa409174fcd3f8df477be8aa4efb8ca96cf012

tests/unit-tests/ca-module.t.cpp

diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 9ca8a33..d5c24cb 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -38,7 +38,7 @@
 {
   util::DummyClientFace face(io, m_keyChain, {true, true});
   CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-1", "ca-storage-memory");
-  BOOST_CHECK_EQUAL(ca.getCaConf().caProfile.m_caPrefix, "/ndn");
+  BOOST_CHECK_EQUAL(ca.getCaConf().caProfile.caPrefix, "/ndn");
 
   advanceClocks(time::milliseconds(20), 60);
   BOOST_CHECK_EQUAL(ca.m_registeredPrefixHandles.size(), 1); // removed local discovery registration
@@ -84,11 +84,11 @@
       auto contentBlock = response.getContent();
       contentBlock.parse();
       auto caItem = infotlv::decodeDataContent(contentBlock);
-      BOOST_CHECK_EQUAL(caItem.m_caPrefix, "/ndn");
-      BOOST_CHECK_EQUAL(caItem.m_probeParameterKeys.size(), 1);
-      BOOST_CHECK_EQUAL(caItem.m_probeParameterKeys.front(), "full name");
-      BOOST_CHECK_EQUAL(caItem.m_cert->wireEncode(), cert.wireEncode());
-      BOOST_CHECK_EQUAL(caItem.m_caInfo, "ndn testbed ca");
+      BOOST_CHECK_EQUAL(caItem.caPrefix, "/ndn");
+      BOOST_CHECK_EQUAL(caItem.probeParameterKeys.size(), 1);
+      BOOST_CHECK_EQUAL(caItem.probeParameterKeys.front(), "full name");
+      BOOST_CHECK_EQUAL(caItem.cert->wireEncode(), cert.wireEncode());
+      BOOST_CHECK_EQUAL(caItem.caInfo, "ndn testbed ca");
     }
   });
   face.receive(interest);
@@ -229,8 +229,8 @@
   advanceClocks(time::milliseconds(20), 60);
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
   auto interest = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"),
                                             time::system_clock::now(),
@@ -280,8 +280,8 @@
   advanceClocks(time::milliseconds(20), 60);
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
   auto current_tp = time::system_clock::now();
   auto interest1 = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"), current_tp, current_tp - time::hours(1));
@@ -311,8 +311,8 @@
   advanceClocks(time::milliseconds(20), 60);
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
 
   auto interest1 = requester::Requester::genNewInterest(state, Name("/ndn/a"), time::system_clock::now(),
@@ -352,8 +352,8 @@
   advanceClocks(time::milliseconds(20), 60);
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
 
   auto current_tp = time::system_clock::now();
@@ -383,8 +383,8 @@
 
   // generate NEW Interest
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
 
   auto newInterest = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"), time::system_clock::now(),
@@ -477,8 +477,8 @@
   auto issuedCert = ca.issueCertificate(certRequest);
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::REVOKE);
 
   auto interest = requester::Requester::genRevokeInterest(state, issuedCert);
@@ -540,8 +540,8 @@
   m_keyChain.sign(clientCert, signingByKey(clientKey.getName()).setSignatureInfo(signatureInfo));
 
   CaProfile item;
-  item.m_caPrefix = Name("/ndn");
-  item.m_cert = std::make_shared<security::Certificate>(cert);
+  item.caPrefix = Name("/ndn");
+  item.cert = std::make_shared<security::Certificate>(cert);
   requester::RequestState state(m_keyChain, item, RequestType::NEW);
 
   auto interest = requester::Requester::genRevokeInterest(state, clientCert);