From 0ecdda7a891961d450d700a73852627d77cf4f6f Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Thu, 25 Jun 2020 15:59:42 -0600 Subject: [PATCH] make format --- llarp/router/router.cpp | 17 ++++++++--------- llarp/router/router.hpp | 1 - llarp/tooling/router_hive.cpp | 5 ++--- llarp/tooling/router_hive.hpp | 6 ++---- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 6589660a5..7da06ccbc 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -86,15 +86,14 @@ namespace llarp if (m_peerDb) peerStatsObj = m_peerDb->ExtractStatus(); - return util::StatusObject{ - {"running", true}, - {"numNodesKnown", _nodedb->num_loaded()}, - {"dht", _dht->impl->ExtractStatus()}, - {"services", _hiddenServiceContext.ExtractStatus()}, - {"exit", _exitContext.ExtractStatus()}, - {"links", _linkManager.ExtractStatus()}, - {"outboundMessages", _outboundMessageHandler.ExtractStatus()}, - {"peerStats", peerStatsObj}}; + return util::StatusObject{{"running", true}, + {"numNodesKnown", _nodedb->num_loaded()}, + {"dht", _dht->impl->ExtractStatus()}, + {"services", _hiddenServiceContext.ExtractStatus()}, + {"exit", _exitContext.ExtractStatus()}, + {"links", _linkManager.ExtractStatus()}, + {"outboundMessages", _outboundMessageHandler.ExtractStatus()}, + {"peerStats", peerStatsObj}}; } else { diff --git a/llarp/router/router.hpp b/llarp/router/router.hpp index 5af8c6b38..e49f0329c 100644 --- a/llarp/router/router.hpp +++ b/llarp/router/router.hpp @@ -51,7 +51,6 @@ namespace llarp { struct Router final : public AbstractRouter { - llarp_time_t _lastPump = 0s; bool ready; // transient iwp encryption key diff --git a/llarp/tooling/router_hive.cpp b/llarp/tooling/router_hive.cpp index 2e6e38418..7001c70ea 100644 --- a/llarp/tooling/router_hive.cpp +++ b/llarp/tooling/router_hive.cpp @@ -163,9 +163,8 @@ namespace tooling llarp::AbstractRouter* RouterHive::GetRelay(const llarp::RouterID& id, bool needMutexLock) { - auto guard = needMutexLock - ? std::make_optional>(routerMutex) - : std::nullopt; + auto guard = + needMutexLock ? std::make_optional>(routerMutex) : std::nullopt; auto itr = relays.find(id); if (itr == relays.end()) diff --git a/llarp/tooling/router_hive.hpp b/llarp/tooling/router_hive.hpp index 3260db0ba..fb9a35384 100644 --- a/llarp/tooling/router_hive.hpp +++ b/llarp/tooling/router_hive.hpp @@ -17,7 +17,7 @@ namespace llarp { struct Context; struct AbstractRouter; -} +} // namespace llarp namespace tooling { @@ -30,9 +30,7 @@ namespace tooling StartRouters(bool isRelay); void - AddRouter( - const std::shared_ptr& config, - bool isRelay); + AddRouter(const std::shared_ptr& config, bool isRelay); /// safely visit router void