Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove processing blocks from confirm_req (#1246)

Browse source
This commit is contained in:
SergiySW 2018-10-05 17:56:33 +03:00 • committed by Roy Keene
commit adbb5a2440
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rai/core_test/node.cpp
View file

@ -266,7 +266,7 @@ TEST (node, receive_gap)
ASSERT_EQ (0, node1.gap_cache.blocks.size ());
auto block (std::make_shared<rai::send_block> (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 ());

13
rai/node/node.cpp
View file

@ -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