From 7e47d0458a2893391e4ce72883557878ca85f00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 1 Dec 2019 14:53:50 -0500
Subject: [PATCH] tests/proxy: cleanup
---
tests/dhtproxytester.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/dhtproxytester.cpp b/tests/dhtproxytester.cpp
index ba936950..f8c06a2b 100644
--- a/tests/dhtproxytester.cpp
+++ b/tests/dhtproxytester.cpp
@@ -43,11 +43,10 @@ DhtProxyTester::setUp() {
auto serverCAIdentity = dht::crypto::generateEcIdentity("DHT Node CA");
auto serverIdentity = dht::crypto::generateIdentity("DHT Node", serverCAIdentity);
- serverProxy = std::unique_ptr<dht::DhtProxyServer>(
- new dht::DhtProxyServer(
+ serverProxy = std::make_unique<dht::DhtProxyServer>(
//dht::crypto::Identity{}, // http
serverIdentity, // https
- nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090"));
+ nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090");
clientConfig.server_ca = serverCAIdentity.second;
clientConfig.client_identity = dht::crypto::generateIdentity("DhtProxyTester");
@@ -61,7 +60,8 @@ void
DhtProxyTester::tearDown() {
nodePeer.join();
nodeClient.join();
- serverProxy.reset(nullptr);
+ nodeProxy->shutdown();
+ serverProxy.reset();
nodeProxy->join();
}
--
GitLab