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.

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

Remove legacy bootstrap #4777

Merged
merged 23 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e12ce8f
Merge branch 'frontier-scan-5' into develop-28-frontier-scan
pwojcikdev Oct 30, 2024
cbadf53
Remove legacy bootstrap
pwojcikdev Sep 30, 2024
0941d7d
Multi threaded random generator
pwojcikdev Oct 29, 2024
ce0956a
Safe ascending bootstrap
pwojcikdev Oct 2, 2024
63692b2
Remove unused ascending boostrap events
pwojcikdev Oct 29, 2024
81967f7
Move `block_deserializer` to `transport` namespace
pwojcikdev Oct 29, 2024
b509b46
Move `block_deserializer` to `transport` namespace
pwojcikdev Oct 29, 2024
94e24fa
Move ascending bootstrap classes to `node/bootstrap/`
pwojcikdev Oct 29, 2024
596a559
Rename `bootstrap_ascending` namespace to simply `bootstrap`
pwojcikdev Oct 29, 2024
25fd24d
Use unique ptr to store `bootstrap_server` component
pwojcikdev Oct 29, 2024
5ffa220
Rename file to `bootstrap_service`
pwojcikdev Oct 29, 2024
26f0651
Rename `ascendboot` to `bootstrap`
pwojcikdev Oct 29, 2024
5d2c690
Rename config to `bootstrap_config`
pwojcikdev Oct 29, 2024
d099c96
Rename test file to `bootstrap.cpp`
pwojcikdev Oct 29, 2024
396548e
Rename stats
pwojcikdev Oct 29, 2024
a6832e7
Rename thread roles
pwojcikdev Oct 29, 2024
bbf0711
Remove `disable_ascending_bootstrap` flag
pwojcikdev Oct 29, 2024
2e074cb
Adjust config descriptions
pwojcikdev Oct 29, 2024
37ee220
Remove bootstrap rpc tests
pwojcikdev Oct 29, 2024
5f31cb1
Rate limit ascending bootstrap requests
pwojcikdev Oct 29, 2024
ff8b6a1
Fix bootstrap fork tests
pwojcikdev Oct 30, 2024
40d2310
Merge branch 'develop' into remove-legacy-bootstrap-2
pwojcikdev Oct 31, 2024
93385bb
Merge branch 'develop' into remove-legacy-bootstrap-2
pwojcikdev Oct 31, 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
2 changes: 1 addition & 1 deletion nano/core_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ add_executable(
block_store.cpp
blockprocessor.cpp
bootstrap.cpp
bootstrap_ascending.cpp
bootstrap_server.cpp
cli.cpp
confirmation_solicitor.cpp
Expand Down Expand Up @@ -41,6 +40,7 @@ add_executable(
optimistic_scheduler.cpp
processing_queue.cpp
processor_service.cpp
random.cpp
random_pool.cpp
rep_crawler.cpp
receivable.cpp
Expand Down
14 changes: 8 additions & 6 deletions nano/core_test/active_elections.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ TEST (active_elections, confirm_frontier)
nano::node_flags node_flags;
node_flags.disable_request_loop = true;
node_flags.disable_ongoing_bootstrap = true;
node_flags.disable_ascending_bootstrap = true;
auto & node1 = *system.add_node (node_flags);
nano::node_config node_config;
node_config.bootstrap.enable = false;
auto & node1 = *system.add_node (node_config, node_flags);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);

// we cannot use the same block instance on 2 different nodes, so make a copy
Expand All @@ -136,10 +137,11 @@ TEST (active_elections, confirm_frontier)
// The rep crawler would otherwise request confirmations in order to find representatives
nano::node_flags node_flags2;
node_flags2.disable_ongoing_bootstrap = true;
node_flags2.disable_ascending_bootstrap = true;
node_flags2.disable_rep_crawler = true;
nano::node_config node_config2;
node_config2.bootstrap.enable = false;
// start node2 later so that we do not get the gossip traffic
auto & node2 = *system.add_node (node_flags2);
auto & node2 = *system.add_node (node_config2, node_flags2);

// Add representative to disabled rep crawler
auto peers (node2.network.random_set (1));
Expand Down Expand Up @@ -1444,10 +1446,10 @@ TEST (active_elections, broadcast_block_on_activation)
nano::node_config config1 = system.default_config ();
// Deactivates elections on both nodes.
config1.active_elections.size = 0;
config1.bootstrap_ascending.enable = false;
config1.bootstrap.enable = false;
nano::node_config config2 = system.default_config ();
config2.active_elections.size = 0;
config2.bootstrap_ascending.enable = false;
config2.bootstrap.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;
Expand Down
Loading
Loading