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

Rework broadcast_block_on_arrival (#4723)

Browse source
This commit is contained in:
Piotr Wójcik 2024-09-06 09:44:41 +02:00 • committed by GitHub
commit 98d3a2c6d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

44
nano/core_test/active_elections.cpp
View file

@ -1437,4 +1437,46 @@ TEST (active_elections, bound_election_winners)
}
ASSERT_TIMELY (5s, node.active.vacancy (nano::election_behavior::priority) > 0);
}
}
/*
* Blocks should only be broadcasted when they are active in the AEC
*/
TEST (active_elections, broadcast_block_on_activation)
{
nano::test::system system;
nano::node_config config1 = system.default_config ();
// Deactivates elections on both nodes.
config1.active_elections.size = 0;
config1.bootstrap_ascending.enable = false;
nano::node_config config2 = system.default_config ();
config2.active_elections.size = 0;
config2.bootstrap_ascending.enable = false;
nano::node_flags flags;
// Disables bootstrap listener to make sure the block won't be shared by this channel.
flags.disable_bootstrap_listener = true;
auto node1 = system.add_node (config1, flags);
auto node2 = system.add_node (config2, flags);
nano::state_block_builder builder;
auto send1 = builder.make_block ()
.account (nano::dev::genesis_key.pub)
.previous (nano::dev::genesis->hash ())
.representative (nano::dev::genesis_key.pub)
.balance (nano::dev::constants.genesis_amount - nano::Gxrb_ratio)
.link (nano::dev::genesis_key.pub)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (nano::dev::genesis->hash ()))
.build ();
// Adds a block to the first node
node1->process_active (send1);
// The second node should not have the block
ASSERT_NEVER (500ms, node2->block (send1->hash ()));
// Activating the election should broadcast the block
node1->scheduler.manual.push (send1);
ASSERT_TIMELY (5s, node1->active.active (send1->qualified_root ()));
ASSERT_TIMELY (5s, node2->block_or_pruned_exists (send1->hash ()));
}

32
nano/core_test/blockprocessor.cpp
View file

@ -9,34 +9,4 @@
#include <gtest/gtest.h>
using namespace std::chrono_literals;
TEST (block_processor, broadcast_block_on_arrival)
{
nano::test::system system;
nano::node_config config1 = system.default_config ();
// Deactivates elections on both nodes.
config1.active_elections.size = 0;
nano::node_config config2 = system.default_config ();
config2.active_elections.size = 0;
nano::node_flags flags;
// Disables bootstrap listener to make sure the block won't be shared by this channel.
flags.disable_bootstrap_listener = true;
auto node1 = system.add_node (config1, flags);
auto node2 = system.add_node (config2, flags);
nano::state_block_builder builder;
auto send1 = builder.make_block ()
.account (nano::dev::genesis_key.pub)
.previous (nano::dev::genesis->hash ())
.representative (nano::dev::genesis_key.pub)
.balance (nano::dev::constants.genesis_amount - nano::Gxrb_ratio)
.link (nano::dev::genesis_key.pub)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (nano::dev::genesis->hash ()))
.build ();
// Adds a block to the first node. process_active() -> (calls) block_processor.add() -> add() ->
// awakes process_block() -> process_batch() -> process_one() -> process_live()
node1->process_active (send1);
// Checks whether the block was broadcast.
ASSERT_TIMELY (5s, node2->block_or_pruned_exists (send1->hash ()));
}
using namespace std::chrono_literals;