mgmt+core: Moving SegmentPublisher to core/ and removing KeyChain from nfd::AppFace
This change ensures interface uniformity between nfd::AppFace and
ndn::Face and allow now templated version of SegmentPublisher to be used
with either.
Change-Id: I82e29528b13b37bd2ae27ef47db30e8c87c15a38
Refs: #1749
diff --git a/tests/daemon/mgmt/face-manager.cpp b/tests/daemon/mgmt/face-manager.cpp
index 482330d..601724a 100644
--- a/tests/daemon/mgmt/face-manager.cpp
+++ b/tests/daemon/mgmt/face-manager.cpp
@@ -257,13 +257,14 @@
protected:
shared_ptr<InternalFace> m_face;
bool m_callbackFired;
+ ndn::KeyChain m_testKeyChain;
};
class FaceManagerFixture : public TestFaceTableFixture, public TestFaceManagerCommon
{
public:
FaceManagerFixture()
- : m_manager(m_faceTable, m_face)
+ : m_manager(m_faceTable, m_face, m_testKeyChain)
{
m_manager.setConfigFile(m_config);
}
@@ -923,7 +924,7 @@
public:
ValidatedFaceRequestFixture()
- : FaceManager(TestFaceTableFixture::m_faceTable, TestFaceManagerCommon::m_face),
+ : FaceManager(TestFaceTableFixture::m_faceTable, TestFaceManagerCommon::m_face, m_testKeyChain),
m_createFaceFired(false),
m_destroyFaceFired(false)
{
@@ -1048,7 +1049,7 @@
{
public:
LocalControlFixture()
- : FaceManager(FaceTableFixture::m_faceTable, TestFaceManagerCommon::m_face)
+ : FaceManager(FaceTableFixture::m_faceTable, TestFaceManagerCommon::m_face, m_testKeyChain)
{
}
};
@@ -1417,7 +1418,8 @@
public:
FaceFixture()
: FaceManager(FaceTableFixture::m_faceTable,
- TestFaceManagerCommon::m_face)
+ TestFaceManagerCommon::m_face,
+ m_testKeyChain)
, m_receivedNotification(false)
{
@@ -1674,7 +1676,7 @@
{
public:
FaceListFixture()
- : m_manager(m_table, m_face)
+ : m_manager(m_table, m_face, m_testKeyChain)
{
}
@@ -1687,6 +1689,7 @@
protected:
FaceManager m_manager;
+ ndn::KeyChain m_testKeyChain;
};
BOOST_FIXTURE_TEST_CASE(TestFaceList, FaceListFixture)