Code Review fix 1
Change-Id: I92fa40b6dd0a05913461006acc87542884c1f3a5
diff --git a/tests/unit-tests/bench.t.cpp b/tests/unit-tests/bench.t.cpp
index a36f16f..9589f6e 100644
--- a/tests/unit-tests/bench.t.cpp
+++ b/tests/unit-tests/bench.t.cpp
@@ -103,7 +103,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto newInterest = requester::Requester::genNewInterest(state, Name("/ndn/alice"),
time::system_clock::now(),
time::system_clock::now() + time::days(1));
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 97727c0..64dcfa4 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -231,7 +231,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto interest = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"),
time::system_clock::now(),
time::system_clock::now() + time::days(1));
@@ -282,7 +282,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ 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));
auto interest2 = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"), current_tp, current_tp + time::days(361));
@@ -313,7 +313,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto interest1 = requester::Requester::genNewInterest(state, Name("/ndn/a"), time::system_clock::now(),
time::system_clock::now() + time::days(1));
@@ -354,7 +354,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto current_tp = time::system_clock::now();
auto interest1 = requester::Requester::genNewInterest(state, Name("/ndn"), current_tp, current_tp + time::days(1));
@@ -385,7 +385,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto newInterest = requester::Requester::genNewInterest(state, Name("/ndn/zhiyi"), time::system_clock::now(),
time::system_clock::now() + time::days(1));
@@ -475,7 +475,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::REVOKE);
+ requester::RequestState state(m_keyChain, item, RequestType::REVOKE);
auto interest = requester::Requester::genRevokeInterest(state, issuedCert);
@@ -538,7 +538,7 @@
CaProfile item;
item.m_caPrefix = Name("/ndn");
item.m_cert = std::make_shared<security::Certificate>(cert);
- requester::RequestContext state(m_keyChain, item, RequestType::NEW);
+ requester::RequestState state(m_keyChain, item, RequestType::NEW);
auto interest = requester::Requester::genRevokeInterest(state, clientCert);
diff --git a/tests/unit-tests/protocol-encoders.t.cpp b/tests/unit-tests/protocol-encoders.t.cpp
index f2411f1..c43bf84 100644
--- a/tests/unit-tests/protocol-encoders.t.cpp
+++ b/tests/unit-tests/protocol-encoders.t.cpp
@@ -156,7 +156,7 @@
std::move(aesKey), 0);
auto contentBlock = ChallengeEncoder::encodeDataContent(state, Name("/ndn/ucla/a/b/c"));
- requester::RequestContext context(m_keyChain, caCache.m_caItems.front(), RequestType::NEW);
+ requester::RequestState context(m_keyChain, caCache.m_caItems.front(), RequestType::NEW);
context.m_requestId = id;
std::memcpy(context.m_aesKey.data(), key, sizeof(key));
ChallengeEncoder::decodeDataContent(contentBlock, context);
diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index ffb70a1..588c4c8 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -109,7 +109,7 @@
CaProfile item;
item.m_caPrefix = Name("/site");
item.m_cert = std::make_shared<security::Certificate>(cert);
- RequestContext state(m_keyChain, item, RequestType::NEW);
+ RequestState state(m_keyChain, item, RequestType::NEW);
Data errorPacket;
errorPacket.setName(Name("/site/pretend/this/is/error/packet"));