From 38bdcbdf0e577e7dac492bea9b4f88b12f52dcb9 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Sat, 1 Apr 2017 16:17:04 -0500 Subject: [PATCH] Removing unused parameters. --- rai/core_test/network.cpp | 2 +- rai/node/node.cpp | 32 +++++++++++--------------------- rai/node/node.hpp | 3 +-- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/rai/core_test/network.cpp b/rai/core_test/network.cpp index 6ee0278c..24a1373a 100644 --- a/rai/core_test/network.cpp +++ b/rai/core_test/network.cpp @@ -242,7 +242,7 @@ TEST (network, send_insufficient_work) publish.serialize (stream); } auto node1 (system.nodes [1]->shared ()); - system.nodes [0]->network.send_buffer (bytes->data (), bytes->size (), system.nodes [1]->network.endpoint (), 0, [bytes, node1] (boost::system::error_code const & ec, size_t size) {}); + system.nodes [0]->network.send_buffer (bytes->data (), bytes->size (), system.nodes [1]->network.endpoint (), [bytes, node1] (boost::system::error_code const & ec, size_t size) {}); ASSERT_EQ (0, system.nodes [0]->network.insufficient_work_count); auto iterations (0); while (system.nodes [1]->network.insufficient_work_count == 0) diff --git a/rai/node/node.cpp b/rai/node/node.cpp index 2bb78c9e..0f350307 100755 --- a/rai/node/node.cpp +++ b/rai/node/node.cpp @@ -82,7 +82,7 @@ void rai::network::send_keepalive (rai::endpoint const & endpoint_a) BOOST_LOG (node.log) << boost::str (boost::format ("Keepalive req sent to %1%") % endpoint_a); } std::weak_ptr node_w (node.shared ()); - send_buffer (bytes->data (), bytes->size (), endpoint_a, 0, [bytes, node_w, endpoint_a] (boost::system::error_code const & ec, size_t) + send_buffer (bytes->data (), bytes->size (), endpoint_a, [bytes, node_w, endpoint_a] (boost::system::error_code const & ec, size_t) { if (auto node_l = node_w.lock ()) { @@ -128,7 +128,7 @@ void rai::network::republish (rai::block_hash const & hash_a, std::shared_ptr node_w (node.shared ()); - send_buffer (buffer_a->data (), buffer_a->size (), endpoint_a, 0, [buffer_a, node_w, endpoint_a] (boost::system::error_code const & ec, size_t size) + send_buffer (buffer_a->data (), buffer_a->size (), endpoint_a, [buffer_a, node_w, endpoint_a] (boost::system::error_code const & ec, size_t size) { if (auto node_l = node_w.lock ()) { @@ -256,7 +256,7 @@ void rai::network::send_confirm_req (rai::endpoint const & endpoint_a, rai::bloc BOOST_LOG (node.log) << boost::str (boost::format ("Sending confirm req to %1%") % endpoint_a); } std::weak_ptr node_w (node.shared ()); - send_buffer (bytes->data (), bytes->size (), endpoint_a, 0, [bytes, node_w] (boost::system::error_code const & ec, size_t size) + send_buffer (bytes->data (), bytes->size (), endpoint_a, [bytes, node_w] (boost::system::error_code const & ec, size_t size) { if (auto node_l = node_w.lock ()) { @@ -1214,7 +1214,7 @@ void rai::network::confirm_block (rai::vote & vote_a, rai::endpoint const & endp BOOST_LOG (node.log) << boost::str (boost::format ("Sending confirm_ack for block %1% to %2%") % confirm.vote.block->hash ().to_string () % endpoint_a); } std::weak_ptr node_w (node.shared ()); - node.network.send_buffer (bytes->data (), bytes->size (), endpoint_a, 0, [bytes, node_w, endpoint_a] (boost::system::error_code const & ec, size_t size_a) + node.network.send_buffer (bytes->data (), bytes->size (), endpoint_a, [bytes, node_w, endpoint_a] (boost::system::error_code const & ec, size_t size_a) { if (auto node_l = node_w.lock ()) { @@ -2355,32 +2355,22 @@ void rai::network::initiate_send () } socket.async_send_to (boost::asio::buffer (front.data, front.size), front.endpoint, [this, front] (boost::system::error_code const & ec, size_t size_a) { - if (front.rebroadcast > 0) + rai::send_info self; { - this->node.alarm.add (std::chrono::system_clock::now () + std::chrono::seconds (this->node.config.rebroadcast_delay), [this, front] - { - send_buffer (front.data, front.size, front.endpoint, front.rebroadcast - 1, front.callback); - }); - } - else - { - rai::send_info self; - { - std::unique_lock lock (socket_mutex); - assert (!sends.empty ()); - self = sends.front (); - } - self.callback (ec, size_a); + std::unique_lock lock (socket_mutex); + assert (!sends.empty ()); + self = sends.front (); } + self.callback (ec, size_a); send_complete (ec, size_a); }); } -void rai::network::send_buffer (uint8_t const * data_a, size_t size_a, rai::endpoint const & endpoint_a, size_t rebroadcast_a, std::function callback_a) +void rai::network::send_buffer (uint8_t const * data_a, size_t size_a, rai::endpoint const & endpoint_a, std::function callback_a) { std::unique_lock lock (socket_mutex); auto initiate (sends.empty ()); - sends.push ({data_a, size_a, endpoint_a, rebroadcast_a, callback_a}); + sends.push ({data_a, size_a, endpoint_a, callback_a}); if (initiate) { initiate_send (); diff --git a/rai/node/node.hpp b/rai/node/node.hpp index c311be86..8529fd73 100644 --- a/rai/node/node.hpp +++ b/rai/node/node.hpp @@ -223,7 +223,6 @@ public: uint8_t const * data; size_t size; rai::endpoint endpoint; - size_t rebroadcast; std::function callback; }; class mapping_protocol @@ -279,7 +278,7 @@ public: void broadcast_confirm_req (rai::block const &); void send_confirm_req (rai::endpoint const &, rai::block const &); void initiate_send (); - void send_buffer (uint8_t const *, size_t, rai::endpoint const &, size_t, std::function ); + void send_buffer (uint8_t const *, size_t, rai::endpoint const &, std::function ); void send_complete (boost::system::error_code const &, size_t); rai::endpoint endpoint (); rai::endpoint remote;