From adbb5a24401884ed7b709371a801fdb251764a98 Mon Sep 17 00:00:00 2001 From: SergiySW Date: Fri, 5 Oct 2018 17:56:33 +0300 Subject: [PATCH] Remove processing blocks from confirm_req (#1246) --- rai/core_test/node.cpp | 2 +- rai/node/node.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rai/core_test/node.cpp b/rai/core_test/node.cpp index c05a7413..8209e8a9 100644 --- a/rai/core_test/node.cpp +++ b/rai/core_test/node.cpp @@ -266,7 +266,7 @@ TEST (node, receive_gap) ASSERT_EQ (0, node1.gap_cache.blocks.size ()); auto block (std::make_shared (5, 1, 2, rai::keypair ().prv, 4, 0)); node1.work_generate_blocking (*block); - rai::confirm_req message (block); + rai::publish message (block); node1.process_message (message, node1.network.endpoint ()); node1.block_processor.flush (); ASSERT_EQ (1, node1.gap_cache.blocks.size ()); diff --git a/rai/node/node.cpp b/rai/node/node.cpp index 343190f9..a14103f0 100644 --- a/rai/node/node.cpp +++ b/rai/node/node.cpp @@ -490,12 +490,15 @@ public: node.stats.inc (rai::stat::type::message, rai::stat::detail::confirm_req, rai::stat::dir::in); node.peers.contacted (sender, message_a.header.version_using); node.process_active (message_a.block); - node.active.publish (message_a.block); - auto transaction_a (node.store.tx_begin_read ()); - auto successor (node.ledger.successor (transaction_a, message_a.block->root ())); - if (successor != nullptr) + // Don't load nodes with disabled voting + if (node.config.enable_voting) { - confirm_block (transaction_a, node, sender, std::move (successor)); + auto transaction (node.store.tx_begin_read ()); + auto successor (node.ledger.successor (transaction, message_a.block->root ())); + if (successor != nullptr) + { + confirm_block (transaction, node, sender, std::move (successor)); + } } } void confirm_ack (rai::confirm_ack const & message_a) override