Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unit test bootstrap_processor.lazy_pruning_missing_block #4575

Merged
merged 6 commits into from
Apr 26, 2024
Merged

Fix unit test bootstrap_processor.lazy_pruning_missing_block #4575

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b5a861
Fix bootstrap_processor.lazy_pruning_missing_block
dsiganos Apr 18, 2024
5f5b268
More accurate explanation and readability improvements
dsiganos Apr 18, 2024
0c7b1b9
Introduce test function nano::test::confirm()
dsiganos Apr 18, 2024
485a104
Do the test without using elections
dsiganos Apr 18, 2024
1ac5ac0
fix comment
dsiganos Apr 22, 2024
d886a19
Improvements after review
dsiganos Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions nano/core_test/bootstrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,12 @@ TEST (bootstrap_processor, lazy_pruning_missing_block)
config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
config.enable_voting = false; // Remove after allowing pruned voting
nano::node_flags node_flags;
// It looks like force confirmed elections remain in the AEC and
// they keep publishing blocks, disabling the request loop stops this.
// A better fix would be to create a way to add and cement the blocks
// without involving an election at all or have a way to delete an
// election from the AEC.
node_flags.disable_request_loop = true;
dsiganos marked this conversation as resolved.
Show resolved Hide resolved
node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_legacy_bootstrap = true;
node_flags.disable_ascending_bootstrap = true;
Expand All @@ -1327,7 +1333,6 @@ TEST (bootstrap_processor, lazy_pruning_missing_block)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (nano::dev::genesis->hash ()))
.build ();
node1->process_active (send1);

// send from genesis to key2
auto send2 = builder
Expand All @@ -1340,7 +1345,6 @@ TEST (bootstrap_processor, lazy_pruning_missing_block)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (send1->hash ()))
.build ();
node1->process_active (send2);

// open account key1
auto open = builder
Expand All @@ -1351,7 +1355,6 @@ TEST (bootstrap_processor, lazy_pruning_missing_block)
.sign (key1.prv, key1.pub)
.work (*system.work.generate (key1.pub))
.build ();
node1->process_active (open);

// open account key2
auto state_open = builder
Expand All @@ -1365,11 +1368,9 @@ TEST (bootstrap_processor, lazy_pruning_missing_block)
.work (*system.work.generate (key2.pub))
.build ();

node1->process_active (state_open);
ASSERT_TIMELY (5s, node1->block (state_open->hash ()) != nullptr);
// Confirm last block to prune previous
ASSERT_TRUE (nano::test::process (*node1, { send1, send2, open, state_open }));
ASSERT_TRUE (nano::test::start_elections (system, *node1, { send1, send2, open, state_open }, true));
ASSERT_TIMELY (5s, nano::test::confirmed (*node1, { send2, open, state_open }));
ASSERT_TIMELY (5s, nano::test::confirmed (*node1, { send1, send2, open, state_open }));
ASSERT_EQ (5, node1->ledger.block_count ());
ASSERT_EQ (5, node1->ledger.cemented_count ());

Expand Down
Loading