Skip to content
Snippets Groups Projects
Commit 7e47d045 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

tests/proxy: cleanup

parent f6d26757
Branches
No related tags found
No related merge requests found
...@@ -43,11 +43,10 @@ DhtProxyTester::setUp() { ...@@ -43,11 +43,10 @@ DhtProxyTester::setUp() {
auto serverCAIdentity = dht::crypto::generateEcIdentity("DHT Node CA"); auto serverCAIdentity = dht::crypto::generateEcIdentity("DHT Node CA");
auto serverIdentity = dht::crypto::generateIdentity("DHT Node", serverCAIdentity); auto serverIdentity = dht::crypto::generateIdentity("DHT Node", serverCAIdentity);
serverProxy = std::unique_ptr<dht::DhtProxyServer>( serverProxy = std::make_unique<dht::DhtProxyServer>(
new dht::DhtProxyServer(
//dht::crypto::Identity{}, // http //dht::crypto::Identity{}, // http
serverIdentity, // https serverIdentity, // https
nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090")); nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090");
clientConfig.server_ca = serverCAIdentity.second; clientConfig.server_ca = serverCAIdentity.second;
clientConfig.client_identity = dht::crypto::generateIdentity("DhtProxyTester"); clientConfig.client_identity = dht::crypto::generateIdentity("DhtProxyTester");
...@@ -61,7 +60,8 @@ void ...@@ -61,7 +60,8 @@ void
DhtProxyTester::tearDown() { DhtProxyTester::tearDown() {
nodePeer.join(); nodePeer.join();
nodeClient.join(); nodeClient.join();
serverProxy.reset(nullptr); nodeProxy->shutdown();
serverProxy.reset();
nodeProxy->join(); nodeProxy->join();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment