rename identity challenge dir to challenge
Change-Id: Ieb89704404dae2086bd83987624670432bb69663
diff --git a/tests/unit-tests/bench.t.cpp b/tests/unit-tests/bench.t.cpp
index 2e0be42..9403c39 100644
--- a/tests/unit-tests/bench.t.cpp
+++ b/tests/unit-tests/bench.t.cpp
@@ -19,7 +19,7 @@
*/
#include "ca-module.hpp"
-#include "identity-challenge/challenge-pin.hpp"
+#include "challenge/challenge-pin.hpp"
#include "detail/info-encoder.hpp"
#include "requester.hpp"
#include "test-common.hpp"
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index f9b6ba2..da8284c 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -19,9 +19,9 @@
*/
#include "ca-module.hpp"
-#include "identity-challenge/challenge-module.hpp"
-#include "identity-challenge/challenge-email.hpp"
-#include "identity-challenge/challenge-pin.hpp"
+#include "challenge/challenge-module.hpp"
+#include "challenge/challenge-email.hpp"
+#include "challenge/challenge-pin.hpp"
#include "detail/info-encoder.hpp"
#include "requester.hpp"
#include "test-common.hpp"
diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index 04347ab..4b91aa2 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -18,7 +18,7 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#include "identity-challenge/challenge-credential.hpp"
+#include "challenge/challenge-credential.hpp"
#include "test-common.hpp"
namespace ndn {
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index 426ea03..34f2089 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -18,7 +18,7 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#include "identity-challenge/challenge-email.hpp"
+#include "challenge/challenge-email.hpp"
#include "test-common.hpp"
namespace ndn {
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 4b87a1e..8366a89 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -18,7 +18,7 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#include "identity-challenge/challenge-pin.hpp"
+#include "challenge/challenge-pin.hpp"
#include "test-common.hpp"
namespace ndn {
diff --git a/tests/unit-tests/configuration.t.cpp b/tests/unit-tests/configuration.t.cpp
index 9b5c8b5..f193432 100644
--- a/tests/unit-tests/configuration.t.cpp
+++ b/tests/unit-tests/configuration.t.cpp
@@ -91,9 +91,9 @@
{
requester::ProfileStorage profileStorage;
profileStorage.load("tests/unit-tests/config-files/config-client-1");
- BOOST_CHECK_EQUAL(profileStorage.getCaProfiles().size(), 2);
+ BOOST_CHECK_EQUAL(profileStorage.getKnownProfiles().size(), 2);
- auto& profile1 = profileStorage.getCaProfiles().front();
+ auto& profile1 = profileStorage.getKnownProfiles().front();
BOOST_CHECK_EQUAL(profile1.m_caPrefix, "/ndn/edu/ucla");
BOOST_CHECK_EQUAL(profile1.m_caInfo, "ndn testbed ca");
BOOST_CHECK_EQUAL(profile1.m_maxValidityPeriod, time::seconds(864000));
@@ -103,7 +103,7 @@
BOOST_CHECK_EQUAL(profile1.m_cert->getName(),
"/ndn/site1/KEY/%11%BC%22%F4c%15%FF%17/self/%FD%00%00%01Y%C8%14%D9%A5");
- auto& profile2 = profileStorage.getCaProfiles().back();
+ auto& profile2 = profileStorage.getKnownProfiles().back();
BOOST_CHECK_EQUAL(profile2.m_caPrefix, "/ndn/edu/ucla/zhiyi");
BOOST_CHECK_EQUAL(profile2.m_caInfo, "");
BOOST_CHECK_EQUAL(profile2.m_maxValidityPeriod, time::seconds(86400));
@@ -134,13 +134,13 @@
item.m_caInfo = "test";
profileStorage.addCaProfile(item);
- BOOST_CHECK_EQUAL(profileStorage.getCaProfiles().size(), 3);
- auto lastItem = profileStorage.getCaProfiles().back();
+ BOOST_CHECK_EQUAL(profileStorage.getKnownProfiles().size(), 3);
+ auto lastItem = profileStorage.getKnownProfiles().back();
BOOST_CHECK_EQUAL(lastItem.m_caPrefix, "/test");
profileStorage.removeCaProfile(Name("/test"));
- BOOST_CHECK_EQUAL(profileStorage.getCaProfiles().size(), 2);
- lastItem = profileStorage.getCaProfiles().back();
+ BOOST_CHECK_EQUAL(profileStorage.getKnownProfiles().size(), 2);
+ lastItem = profileStorage.getKnownProfiles().back();
BOOST_CHECK_EQUAL(lastItem.m_caPrefix, "/ndn/edu/ucla/zhiyi");
}
diff --git a/tests/unit-tests/protocol-encoders.t.cpp b/tests/unit-tests/protocol-encoders.t.cpp
index a570e6e..c69131b 100644
--- a/tests/unit-tests/protocol-encoders.t.cpp
+++ b/tests/unit-tests/protocol-encoders.t.cpp
@@ -40,7 +40,7 @@
requester::ProfileStorage caCache;
caCache.load("tests/unit-tests/config-files/config-client-1");
- auto& cert = caCache.getCaProfiles().front().m_cert;
+ auto& cert = caCache.getKnownProfiles().front().m_cert;
auto b = infotlv::encodeDataContent(config.m_caProfile, *cert);
auto item = infotlv::decodeDataContent(b);
@@ -104,7 +104,7 @@
{
requester::ProfileStorage caCache;
caCache.load("tests/unit-tests/config-files/config-client-1");
- auto& certRequest = caCache.getCaProfiles().front().m_cert;
+ auto& certRequest = caCache.getKnownProfiles().front().m_cert;
std::vector<uint8_t> pub = ECDHState().getSelfPubKey();
auto b = requesttlv::encodeApplicationParameters(RequestType::REVOKE, pub, *certRequest);
std::vector<uint8_t> returnedPub;
@@ -145,7 +145,7 @@
0xe0, 0xff, 0x56, 0x83, 0xf2, 0x43, 0xb2, 0x13};
requester::ProfileStorage caCache;
caCache.load("tests/unit-tests/config-files/config-client-1");
- security::Certificate certRequest = *caCache.getCaProfiles().front().m_cert;
+ security::Certificate certRequest = *caCache.getKnownProfiles().front().m_cert;
RequestId id = {{102}};
std::array<uint8_t, 16> aesKey;
std::memcpy(aesKey.data(), key, sizeof(key));
@@ -154,7 +154,7 @@
std::move(aesKey), 0);
auto contentBlock = challengetlv::encodeDataContent(state, Name("/ndn/ucla/a/b/c"));
- requester::RequestState context(m_keyChain, caCache.getCaProfiles().front(), RequestType::NEW);
+ requester::RequestState context(m_keyChain, caCache.getKnownProfiles().front(), RequestType::NEW);
context.m_requestId = id;
std::memcpy(context.m_aesKey.data(), key, sizeof(key));
challengetlv::decodeDataContent(contentBlock, context);
diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index 4f2c8be..8fc2fe5 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -21,7 +21,7 @@
#include "requester.hpp"
#include "detail/error-encoder.hpp"
#include "detail/probe-encoder.hpp"
-#include "identity-challenge/challenge-module.hpp"
+#include "challenge/challenge-module.hpp"
#include "ca-module.hpp"
#include "test-common.hpp"