From 6e05dc693fbaa43a5681f30b2df20087fc8ef315 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Tue, 2 Mar 2021 18:27:35 -0400 Subject: [PATCH] Remove unused arguments (and ants) --- llarp/link/i_link_manager.hpp | 2 +- llarp/link/link_manager.cpp | 6 +++--- llarp/link/link_manager.hpp | 2 +- llarp/link/server.cpp | 4 ++-- llarp/link/server.hpp | 2 +- llarp/router/rc_lookup_handler.cpp | 1 - llarp/router/router.cpp | 2 +- test/iwp/test_iwp_session.cpp | 18 +++++++++--------- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/llarp/link/i_link_manager.hpp b/llarp/link/i_link_manager.hpp index 08d0f13d9..608903d26 100644 --- a/llarp/link/i_link_manager.hpp +++ b/llarp/link/i_link_manager.hpp @@ -49,7 +49,7 @@ namespace llarp AddLink(LinkLayer_ptr link, bool inbound = false) = 0; virtual bool - StartLinks(const EventLoop_ptr& loop) = 0; + StartLinks() = 0; virtual void Stop() = 0; diff --git a/llarp/link/link_manager.cpp b/llarp/link/link_manager.cpp index 478315585..0f85bfba1 100644 --- a/llarp/link/link_manager.cpp +++ b/llarp/link/link_manager.cpp @@ -121,12 +121,12 @@ namespace llarp } bool - LinkManager::StartLinks(const EventLoop_ptr& loop) + LinkManager::StartLinks() { LogInfo("starting ", outboundLinks.size(), " outbound links"); for (const auto& link : outboundLinks) { - if (!link->Start(loop)) + if (!link->Start()) { LogWarn("outbound link '", link->Name(), "' failed to start"); return false; @@ -139,7 +139,7 @@ namespace llarp LogInfo("starting ", inboundLinks.size(), " inbound links"); for (const auto& link : inboundLinks) { - if (!link->Start(loop)) + if (!link->Start()) { LogWarn("Link ", link->Name(), " failed to start"); return false; diff --git a/llarp/link/link_manager.hpp b/llarp/link/link_manager.hpp index 558b48ce2..f8371c81c 100644 --- a/llarp/link/link_manager.hpp +++ b/llarp/link/link_manager.hpp @@ -47,7 +47,7 @@ namespace llarp AddLink(LinkLayer_ptr link, bool inbound = false) override; bool - StartLinks(const EventLoop_ptr& loop) override; + StartLinks() override; void Stop() override; diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp index 9c8a1fdc1..a9f0108c0 100644 --- a/llarp/link/server.cpp +++ b/llarp/link/server.cpp @@ -339,11 +339,11 @@ namespace llarp } bool - ILinkLayer::Start(const EventLoop_ptr& loop) + ILinkLayer::Start() { // Tie the lifetime of this repeater to this arbitrary shared_ptr: m_repeater_keepalive = std::make_shared(0); - loop->call_every(LINK_LAYER_TICK_INTERVAL, m_repeater_keepalive, [this] { Tick(Now()); }); + m_Loop->call_every(LINK_LAYER_TICK_INTERVAL, m_repeater_keepalive, [this] { Tick(Now()); }); return true; } diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp index 8c60090ad..01f54504e 100644 --- a/llarp/link/server.hpp +++ b/llarp/link/server.hpp @@ -131,7 +131,7 @@ namespace llarp TryEstablishTo(RouterContact rc); bool - Start(const EventLoop_ptr& loop); + Start(); virtual void Stop(); diff --git a/llarp/router/rc_lookup_handler.cpp b/llarp/router/rc_lookup_handler.cpp index 1195f9096..f95ed5fbb 100644 --- a/llarp/router/rc_lookup_handler.cpp +++ b/llarp/router/rc_lookup_handler.cpp @@ -156,7 +156,6 @@ namespace llarp if (rc.IsPublicRouter()) { LogDebug("Adding or updating RC for ", RouterID(rc.pubkey), " to nodedb and dht."); - const RouterContact copy{rc}; _loop->call([rc, n = _nodedb] { n->PutIfNewer(rc); }); _dht->impl->PutRCNodeAsync(rc); } diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 62dfe6717..0d22cd488 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -1057,7 +1057,7 @@ namespace llarp } } _outboundSessionMaker.SetOurRouter(pubkey()); - if (!_linkManager.StartLinks(_loop)) + if (!_linkManager.StartLinks()) { LogWarn("One or more links failed to start."); return false; diff --git a/test/iwp/test_iwp_session.cpp b/test/iwp/test_iwp_session.cpp index 9d5241bd0..9cf248d07 100644 --- a/test/iwp/test_iwp_session.cpp +++ b/test/iwp/test_iwp_session.cpp @@ -117,7 +117,7 @@ struct IWPLinkContext if (inbound) { - // only add address info on the recipiant's rc + // only add address info on the recipient's rc rc.addrs.emplace_back(); REQUIRE(link->GetOurAddressInfo(rc.addrs.back())); } @@ -166,19 +166,19 @@ RunIWPTest(Func_t test, Duration_t timeout = 10s) // set up client auto initiator = std::make_shared("127.0.0.1:3001", loop); // set up server - auto recipiant = std::make_shared("127.0.0.1:3002", loop); + auto recipient = std::make_shared("127.0.0.1:3002", loop); // function for ending unit test on success - auto endIfDone = [initiator, recipiant, loop]() { - if (initiator->gucci and recipiant->gucci) + auto endIfDone = [initiator, recipient, loop]() { + if (initiator->gucci and recipient->gucci) { loop->stop(); } }; // function to start test and give loop to unit test - auto start = [initiator, recipiant, loop]() { - REQUIRE(initiator->link->Start(loop)); - REQUIRE(recipiant->link->Start(loop)); + auto start = [initiator, recipient, loop]() { + REQUIRE(initiator->link->Start()); + REQUIRE(recipient->link->Start()); return loop; }; @@ -186,7 +186,7 @@ RunIWPTest(Func_t test, Duration_t timeout = 10s) auto endTest = [loop] { loop->stop(); }; loop->call_later(timeout, [] { FAIL("test timeout"); }); - test(start, endIfDone, endTest, initiator, recipiant); + test(start, endIfDone, endTest, initiator, recipient); loop->run(); llarp::RouterContact::BlockBogons = oldBlockBogons; } @@ -205,7 +205,7 @@ TEST_CASE("IWP handshake", "[iwp]") alice->gucci = true; endIfDone(); }); - // set up recipiant + // set up recipient bob->InitLink([=](auto remote) { REQUIRE(remote->GetRemoteRC() == alice->rc); bob->gucci = true;