From 82c6cf536c96791ef2e746a9da60f49605efa22b Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Tue, 21 Jan 2020 12:33:48 +0000 Subject: [PATCH] Consistency in calls to fanout() and using const ref for flood_vote* --- nano/core_test/peer_container.cpp | 4 ++-- nano/node/network.cpp | 6 +++--- nano/node/network.hpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nano/core_test/peer_container.cpp b/nano/core_test/peer_container.cpp index ed88e65767..dcf519bf55 100644 --- a/nano/core_test/peer_container.cpp +++ b/nano/core_test/peer_container.cpp @@ -131,13 +131,13 @@ TEST (peer_container, list_fanout) }; add_peer (9998); ASSERT_EQ (1, node.network.size ()); - ASSERT_EQ (1.0, node.network.size_sqrt ()); + ASSERT_EQ (1.f, node.network.size_sqrt ()); ASSERT_EQ (1, node.network.fanout ()); auto list2 (node.network.list (node.network.fanout ())); ASSERT_EQ (1, list2.size ()); add_peer (9999); ASSERT_EQ (2, node.network.size ()); - ASSERT_EQ (std::sqrt (2.F), node.network.size_sqrt ()); + ASSERT_EQ (std::sqrt (2.f), node.network.size_sqrt ()); ASSERT_EQ (2, node.network.fanout ()); auto list3 (node.network.list (node.network.fanout ())); ASSERT_EQ (2, list3.size ()); diff --git a/nano/node/network.cpp b/nano/node/network.cpp index 142a32c9f1..334c8ac39c 100644 --- a/nano/node/network.cpp +++ b/nano/node/network.cpp @@ -220,7 +220,7 @@ void nano::network::flood_message (nano::message const & message_a, bool const i } } -void nano::network::flood_vote (std::shared_ptr vote_a, float scale) +void nano::network::flood_vote (std::shared_ptr const & vote_a, float scale) { nano::confirm_ack message (vote_a); for (auto & i : list_non_pr (fanout (scale))) @@ -229,7 +229,7 @@ void nano::network::flood_vote (std::shared_ptr vote_a, float scale) } } -void nano::network::flood_vote_pr (std::shared_ptr vote_a) +void nano::network::flood_vote_pr (std::shared_ptr const & vote_a) { nano::confirm_ack message (vote_a); for (auto const & i : node.rep_crawler.principal_representatives ()) @@ -281,7 +281,7 @@ void nano::network::broadcast_confirm_req (std::shared_ptr block_a) if (list->empty () || node.rep_crawler.total_weight () < node.config.online_weight_minimum.number ()) { // broadcast request to all peers (with max limit 2 * sqrt (peers count)) - auto peers (node.network.list (std::min (100, node.network.fanout (2.F)))); + auto peers (node.network.list (std::min (100, node.network.fanout (2.0)))); list->clear (); list->insert (list->end (), peers.begin (), peers.end ()); } diff --git a/nano/node/network.hpp b/nano/node/network.hpp index 6ced14f136..e321e05b1d 100644 --- a/nano/node/network.hpp +++ b/nano/node/network.hpp @@ -105,8 +105,8 @@ class network final random_fill (message.peers); flood_message (message); } - void flood_vote (std::shared_ptr, float scale); - void flood_vote_pr (std::shared_ptr); + void flood_vote (std::shared_ptr const &, float scale); + void flood_vote_pr (std::shared_ptr const &); void flood_block (std::shared_ptr block_a, bool const is_droppable_a = true) { nano::publish publish (block_a);