commit f2e6bb5d1af8fa6163c3ea7c1ab19a35789f55a8
author tylerliu <tylersiqi@163.com> Sun Dec 13 13:23:05 2020 -0800
committer tylerliu <tylersiqi@163.com> Sun Dec 13 13:23:05 2020 -0800
tree 43990c33fafa8726a58e5b31295926ef6c81ace0
parent 01efccb23d9a0d85d3e3ace5f121e6c20be8fc2a

code review fix

Change-Id: Ie616543094aaa31d596980ba7a3cef05de4351fc

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 a74db0d..9ca8a33 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().m_caProfile.m_caPrefix, "/ndn");
+  BOOST_CHECK_EQUAL(ca.getCaConf().caProfile.m_caPrefix, "/ndn");
 
   advanceClocks(time::milliseconds(20), 60);
   BOOST_CHECK_EQUAL(ca.m_registeredPrefixHandles.size(), 1); // removed local discovery registration
@@ -260,7 +260,7 @@
     RequestId requestId;
     std::memcpy(requestId.data(), contentBlock.get(tlv::RequestId).value(), contentBlock.get(tlv::RequestId).value_size());
     auto ca_encryption_key = ca.getCaStorage()->getRequest(requestId).encryptionKey;
-    BOOST_CHECK_EQUAL_COLLECTIONS(state.m_aesKey.begin(), state.m_aesKey.end(),
+    BOOST_CHECK_EQUAL_COLLECTIONS(state.aesKey.begin(), state.aesKey.end(),
                                   ca_encryption_key.begin(), ca_encryption_key.end());
   });
   face.receive(*interest);
@@ -407,8 +407,8 @@
       BOOST_CHECK(security::verifySignature(response, cert));
 
       requester::Requester::onChallengeResponse(state, response);
-      BOOST_CHECK(state.m_status == Status::CHALLENGE);
-      BOOST_CHECK_EQUAL(state.m_challengeStatus, ChallengePin::NEED_CODE);
+      BOOST_CHECK(state.status == Status::CHALLENGE);
+      BOOST_CHECK_EQUAL(state.challengeStatus, ChallengePin::NEED_CODE);
       auto paramList = requester::Requester::selectOrContinueChallenge(state, "pin");
       challengeInterest2 = requester::Requester::genChallengeInterest(state, std::move(paramList));
     }
@@ -417,8 +417,8 @@
       BOOST_CHECK(security::verifySignature(response, cert));
 
       requester::Requester::onChallengeResponse(state, response);
-      BOOST_CHECK(state.m_status == Status::CHALLENGE);
-      BOOST_CHECK_EQUAL(state.m_challengeStatus, ChallengePin::WRONG_CODE);
+      BOOST_CHECK(state.status == Status::CHALLENGE);
+      BOOST_CHECK_EQUAL(state.challengeStatus, ChallengePin::WRONG_CODE);
 
       auto paramList = requester::Requester::selectOrContinueChallenge(state, "pin");
       auto request = ca.getCertificateRequest(*challengeInterest2);
@@ -430,7 +430,7 @@
       count++;
       BOOST_CHECK(security::verifySignature(response, cert));
       requester::Requester::onChallengeResponse(state, response);
-      BOOST_CHECK(state.m_status == Status::SUCCESS);
+      BOOST_CHECK(state.status == Status::SUCCESS);
     }
   });
 
@@ -507,7 +507,7 @@
     RequestId requestId;
     std::memcpy(requestId.data(), contentBlock.get(tlv::RequestId).value(), contentBlock.get(tlv::RequestId).value_size());
     auto ca_encryption_key = ca.getCaStorage()->getRequest(requestId).encryptionKey;
-    BOOST_CHECK_EQUAL_COLLECTIONS(state.m_aesKey.begin(), state.m_aesKey.end(),
+    BOOST_CHECK_EQUAL_COLLECTIONS(state.aesKey.begin(), state.aesKey.end(),
                                   ca_encryption_key.begin(), ca_encryption_key.end());
   });
   face.receive(*interest);