**breaking change**: Switch Face and related classes to v2::KeyChain
security::v2::KeyChain is now exposed as ndn::KeyChain, which should
ensure that dependent code can be mostly compiled. However, expect code
that explicitly uses the old KeyChain interface to be broken.
Change-Id: I7330d0250d92f3f0f2570ab6d0214ab3dfdd18cc
Refs: #3098
diff --git a/tests/unit-tests/security/validator-config.t.cpp b/tests/unit-tests/security/validator-config.t.cpp
index 14ed721..74c29ae 100644
--- a/tests/unit-tests/security/validator-config.t.cpp
+++ b/tests/unit-tests/security/validator-config.t.cpp
@@ -49,12 +49,14 @@
{
public:
ValidatorConfigFixture()
- : face(nullptr, m_keyChain)
+ : m_v2KeyChain("pib-memory:", "tpm-memory:")
+ , face(nullptr, m_v2KeyChain)
, validator(face)
{
}
public:
+ v2::KeyChain m_v2KeyChain;
Face face;
ValidatorConfig validator;
};
@@ -1078,8 +1080,8 @@
struct FacesFixture : public ValidatorConfigFixture
{
FacesFixture()
- : face1(io, m_keyChain, {true, true})
- , face2(io, m_keyChain, {true, true})
+ : face1(io, m_v2KeyChain, {true, true})
+ , face2(io, m_v2KeyChain, {true, true})
, readInterestOffset1(0)
, readDataOffset1(0)
, readInterestOffset2(0)
@@ -1486,11 +1488,11 @@
advanceClocks(time::milliseconds(10), 20);
}
-class DirectCertFetchFixture : public IdentityManagementV1TimeFixture
+class DirectCertFetchFixture : public ValidatorConfigFixture
{
public:
DirectCertFetchFixture()
- : clientFace(io, m_keyChain, {true, true})
+ : clientFace(io, m_v2KeyChain, {true, true})
, validationResult(boost::logic::indeterminate)
{
auto certName = addIdentity(ca);