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/face/websocket-transport.t.cpp b/tests/daemon/face/websocket-transport.t.cpp
index ca9bd72..edee799 100644
--- a/tests/daemon/face/websocket-transport.t.cpp
+++ b/tests/daemon/face/websocket-transport.t.cpp
@@ -24,7 +24,7 @@
*/
#include "face/websocket-transport.hpp"
-#include "face/lp-face.hpp"
+#include "face/face.hpp"
#include "dummy-receive-link-service.hpp"
#include "transport-test-common.hpp"
@@ -39,6 +39,8 @@
BOOST_AUTO_TEST_SUITE(Face)
+using nfd::Face;
+
/** \brief a fixture that accepts a single WebSocket connection from a client
*/
class SingleWebSocketFixture : public BaseFixture
@@ -97,7 +99,7 @@
void
makeFace(const time::milliseconds& pingInterval = time::milliseconds(10000))
{
- face = make_unique<LpFace>(
+ face = make_unique<Face>(
make_unique<DummyReceiveLinkService>(),
make_unique<WebSocketTransport>(serverHdl, ref(server), pingInterval));
transport = static_cast<WebSocketTransport*>(face->getTransport());
@@ -197,7 +199,7 @@
websocket::Server server;
websocketpp::connection_hdl serverHdl;
- unique_ptr<LpFace> face;
+ unique_ptr<Face> face;
WebSocketTransport* transport;
std::vector<Transport::Packet>* serverReceivedPackets;