commons clean up
Change-Id: I13ce15666974e294d2645768dd20194f0584d406
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 76098a0..087a800 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -111,8 +111,8 @@
interest.setCanBePrefix(false);
Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, "name"));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, "name"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "zhiyi"));
paramTLV.encode();
interest.setApplicationParameters(paramTLV);
@@ -123,7 +123,7 @@
BOOST_CHECK(security::verifySignature(response, cert));
Block contentBlock = response.getContent();
contentBlock.parse();
- Block probeResponse = contentBlock.get(tlv_probe_response);
+ Block probeResponse = contentBlock.get(tlv::ProbeResponse);
probeResponse.parse();
Name caName;
caName.wireDecode(probeResponse.get(tlv::Name));
@@ -149,8 +149,8 @@
interest.setCanBePrefix(false);
Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, "name"));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, "name"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "zhiyi"));
paramTLV.encode();
interest.setApplicationParameters(paramTLV);
@@ -161,7 +161,7 @@
BOOST_CHECK(security::verifySignature(response, cert));
auto contentBlock = response.getContent();
contentBlock.parse();
- auto probeResponseBlock = contentBlock.get(tlv_probe_response);
+ auto probeResponseBlock = contentBlock.get(tlv::ProbeResponse);
probeResponseBlock.parse();
Name caPrefix;
caPrefix.wireDecode(probeResponseBlock.get(tlv::Name));
@@ -187,8 +187,8 @@
interest.setCanBePrefix(false);
Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, "name"));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, "name"));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "zhiyi"));
paramTLV.encode();
interest.setApplicationParameters(paramTLV);
@@ -203,7 +203,7 @@
// Test CA sent redirections
std::vector<Name> redirectionItems;
for (auto item : contentBlock.elements()) {
- if (item.type() == tlv_probe_redirect) {
+ if (item.type() == tlv::ProbeRedirect) {
redirectionItems.push_back(Name(item.blockFromValue()));
}
}
@@ -241,13 +241,13 @@
auto contentBlock = response.getContent();
contentBlock.parse();
- BOOST_CHECK(readString(contentBlock.get(tlv_ecdh_pub)) != "");
- BOOST_CHECK(readString(contentBlock.get(tlv_salt)) != "");
- BOOST_CHECK(readString(contentBlock.get(tlv_request_id)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::EcdhPub)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::Salt)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::RequestId)) != "");
auto challengeBlockCount = 0;
for (auto const& element : contentBlock.elements()) {
- if (element.type() == tlv_challenge) {
+ if (element.type() == tlv::Challenge) {
challengeBlockCount++;
}
}
@@ -255,7 +255,7 @@
BOOST_CHECK(challengeBlockCount != 0);
auto challengeList = Requester::onNewRenewRevokeResponse(state, response);
- auto ca_encryption_key = ca.getCaStorage()->getRequest(readString(contentBlock.get(tlv_request_id))).m_encryptionKey;
+ auto ca_encryption_key = ca.getCaStorage()->getRequest(readString(contentBlock.get(tlv::RequestId))).m_encryptionKey;
BOOST_CHECK_EQUAL_COLLECTIONS(state.m_aesKey, state.m_aesKey + sizeof(state.m_aesKey),
ca_encryption_key.value(), ca_encryption_key.value() + ca_encryption_key.value_size());
});
@@ -286,7 +286,7 @@
face.onSendData.connect([&](const Data& response) {
auto contentTlv = response.getContent();
contentTlv.parse();
- auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+ auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv::ErrorCode)));
BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
});
face.receive(*interest1);
@@ -322,12 +322,12 @@
auto contentTlv = response.getContent();
contentTlv.parse();
if (interest3->getName().isPrefixOf(response.getName())) {
- auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+ auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv::ErrorCode)));
BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
}
else {
// should successfully get responses
- BOOST_CHECK_EXCEPTION(readNonNegativeInteger(contentTlv.get(tlv_error_code)), std::runtime_error,
+ BOOST_CHECK_EXCEPTION(readNonNegativeInteger(contentTlv.get(tlv::ErrorCode)), std::runtime_error,
[](const auto& e) { return true; });
}
});
@@ -358,7 +358,7 @@
face.onSendData.connect([&](const Data& response) {
auto contentTlv = response.getContent();
contentTlv.parse();
- auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+ auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv::ErrorCode)));
BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
});
face.receive(*interest1);
@@ -481,13 +481,13 @@
auto contentBlock = response.getContent();
contentBlock.parse();
- BOOST_CHECK(readString(contentBlock.get(tlv_ecdh_pub)) != "");
- BOOST_CHECK(readString(contentBlock.get(tlv_salt)) != "");
- BOOST_CHECK(readString(contentBlock.get(tlv_request_id)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::EcdhPub)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::Salt)) != "");
+ BOOST_CHECK(readString(contentBlock.get(tlv::RequestId)) != "");
auto challengeBlockCount = 0;
for (auto const& element : contentBlock.elements()) {
- if (element.type() == tlv_challenge) {
+ if (element.type() == tlv::Challenge) {
challengeBlockCount++;
}
}
@@ -495,7 +495,7 @@
BOOST_CHECK(challengeBlockCount != 0);
auto challengeList = Requester::onNewRenewRevokeResponse(state, response);
- auto ca_encryption_key = ca.getCaStorage()->getRequest(readString(contentBlock.get(tlv_request_id))).m_encryptionKey;
+ auto ca_encryption_key = ca.getCaStorage()->getRequest(readString(contentBlock.get(tlv::RequestId))).m_encryptionKey;
BOOST_CHECK_EQUAL_COLLECTIONS(state.m_aesKey, state.m_aesKey + sizeof(state.m_aesKey),
ca_encryption_key.value(), ca_encryption_key.value() + ca_encryption_key.value_size());
});
@@ -540,7 +540,7 @@
receiveData = true;
auto contentTlv = response.getContent();
contentTlv.parse();
- BOOST_CHECK(static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code))) != ErrorCode::NO_ERROR);
+ BOOST_CHECK(static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv::ErrorCode))) != ErrorCode::NO_ERROR);
});
face.receive(*interest);
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index 65e5b84..446f6c5 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -47,9 +47,9 @@
auto cert = key.getDefaultCertificate();
CaState request(Name("/ndn/site1"), "123", RequestType::NEW, Status::BEFORE_CHALLENGE, cert, makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_EMAIL));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi@cs.ucla.edu"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengeEmail::PARAMETER_KEY_EMAIL));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "zhiyi@cs.ucla.edu"));
ChallengeEmail challenge("./tests/unit-tests/test-send-email.sh");
challenge.handleChallengeRequest(paramTLV, request);
@@ -96,9 +96,9 @@
auto cert = key.getDefaultCertificate();
CaState request(Name("/ndn/site1"), "123", RequestType::NEW, Status::BEFORE_CHALLENGE, cert, makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_EMAIL));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi@cs"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengeEmail::PARAMETER_KEY_EMAIL));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "zhiyi@cs"));
ChallengeEmail challenge;
challenge.handleChallengeRequest(paramTLV, request);
@@ -119,9 +119,9 @@
"email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
3, time::seconds(3600), std::move(json), makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_CODE));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "4567"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengeEmail::PARAMETER_KEY_CODE));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "4567"));
ChallengeEmail challenge;
challenge.handleChallengeRequest(paramTLV, request);
@@ -141,9 +141,9 @@
"email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
3, time::seconds(3600), std::move(json), makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_CODE));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "7890"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengeEmail::PARAMETER_KEY_CODE));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "7890"));
ChallengeEmail challenge;
challenge.handleChallengeRequest(paramTLV, request);
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 79abbf0..5d4b151 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -41,7 +41,7 @@
CaState request(Name("/ndn/site1"), "123", RequestType::NEW, Status::BEFORE_CHALLENGE, cert, makeEmptyBlock(tlv::ContentType_Key));
ChallengePin challenge;
- challenge.handleChallengeRequest(makeEmptyBlock(tlv_encrypted_payload), request);
+ challenge.handleChallengeRequest(makeEmptyBlock(tlv::EncryptedPayload), request);
BOOST_CHECK(request.m_status == Status::CHALLENGE);
BOOST_CHECK_EQUAL(request.m_challengeState->m_challengeStatus, ChallengePin::NEED_CODE);
@@ -59,9 +59,9 @@
"pin", ChallengePin::NEED_CODE, time::system_clock::now(),
3, time::seconds(3600), std::move(secret), makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengePin::PARAMETER_KEY_CODE));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "12345"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengePin::PARAMETER_KEY_CODE));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "12345"));
ChallengePin challenge;
challenge.handleChallengeRequest(paramTLV, request);
@@ -81,9 +81,9 @@
"pin", ChallengePin::NEED_CODE, time::system_clock::now(),
3, time::seconds(3600), std::move(secret), makeEmptyBlock(tlv::ContentType_Key));
- Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengePin::PARAMETER_KEY_CODE));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "45678"));
+ Block paramTLV = makeEmptyBlock(tlv::EncryptedPayload);
+ paramTLV.push_back(makeStringBlock(tlv::ParameterKey, ChallengePin::PARAMETER_KEY_CODE));
+ paramTLV.push_back(makeStringBlock(tlv::ParameterValue, "45678"));
ChallengePin challenge;
challenge.handleChallengeRequest(paramTLV, request);
diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index 50fc543..590cb77 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -54,7 +54,7 @@
BOOST_CHECK(firstInterest->getName().at(-1).isParametersSha256Digest());
// ignore the last name component (ParametersSha256Digest)
BOOST_CHECK_EQUAL(firstInterest->getName().getPrefix(-1), "/site/CA/PROBE");
- BOOST_CHECK_EQUAL(readString(firstInterest->getApplicationParameters().get(tlv_parameter_value)), "zhiyi@cs.ucla.edu");
+ BOOST_CHECK_EQUAL(readString(firstInterest->getApplicationParameters().get(tlv::ParameterValue)), "zhiyi@cs.ucla.edu");
}
BOOST_AUTO_TEST_CASE(OnProbeResponse){