face: face refactoring completion
* delete old Face
* rename LpFace as Face
* eliminate LpFaceWrapper and use new Face
refs #3172
Change-Id: I08c3a5dfb4cc1b9834b30cccd9ab634535d0608c
diff --git a/tests/daemon/fw/topology-tester.hpp b/tests/daemon/fw/topology-tester.hpp
index 9a10ad7..88d73da 100644
--- a/tests/daemon/fw/topology-tester.hpp
+++ b/tests/daemon/fw/topology-tester.hpp
@@ -32,7 +32,7 @@
#include <ndn-cxx/face.hpp>
#include "face/internal-transport.hpp"
-#include "face/lp-face-wrapper.hpp"
+#include "face/face.hpp"
#include "fw/strategy.hpp"
#include "tests/test-common.hpp"
@@ -70,8 +70,12 @@
m_isUp = true;
}
+ /** \brief attach a face to the link
+ * \param i forwarder index
+ * \param face a Face with InternalForwarderTransport
+ */
void
- addFace(TopologyNode i, shared_ptr<face::LpFaceWrapper> face);
+ addFace(TopologyNode i, shared_ptr<Face> face);
/** \return a face of forwarder \p i which is attached to this link
*/
@@ -98,7 +102,7 @@
bool m_isUp;
time::nanoseconds m_delay;
std::unordered_map<TopologyNode, face::InternalTransportBase*> m_transports;
- std::unordered_map<TopologyNode, shared_ptr<face::LpFaceWrapper>> m_faces;
+ std::unordered_map<TopologyNode, shared_ptr<Face>> m_faces;
};
/** \brief represents a link to a local application
@@ -106,8 +110,11 @@
class TopologyAppLink : noncopyable
{
public:
+ /** \brief constructor
+ * \param forwarderFace a Face with InternalForwarderTransport
+ */
explicit
- TopologyAppLink(shared_ptr<face::LpFaceWrapper> forwarderFace);
+ TopologyAppLink(shared_ptr<Face> forwarderFace);
/** \brief fail the link, cause packets to be dropped silently
*/