diff --git a/nano/core_test/bootstrap_ascending.cpp b/nano/core_test/bootstrap_ascending.cpp index c62fe7bf1..c46004df9 100644 --- a/nano/core_test/bootstrap_ascending.cpp +++ b/nano/core_test/bootstrap_ascending.cpp @@ -361,7 +361,7 @@ TEST (bootstrap, frontier_scan) // Frontier scan should detect all the accounts with missing blocks ASSERT_TIMELY (10s, std::all_of (updates.begin (), updates.end (), [&node1] (auto const & block) { - return node1.ascendboot.prioritized (block->account ()); + return node1.bootstrap.prioritized (block->account ()); })); } @@ -443,7 +443,7 @@ TEST (bootstrap, frontier_scan_pending) // Frontier scan should detect all the accounts with missing blocks ASSERT_TIMELY (10s, std::all_of (opens.begin (), opens.end (), [&node1] (auto const & block) { - return node1.ascendboot.prioritized (block->account ()); + return node1.bootstrap.prioritized (block->account ()); })); } @@ -553,6 +553,6 @@ TEST (bootstrap, frontier_scan_cannot_prioritize) // Frontier scan should not detect the accounts ASSERT_ALWAYS (1s, std::none_of (opens2.begin (), opens2.end (), [&node1] (auto const & block) { - return node1.ascendboot.prioritized (block->account ()); + return node1.bootstrap.prioritized (block->account ()); })); } \ No newline at end of file diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index a0267731a..25d4df9e3 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -5160,7 +5160,7 @@ void nano::json_handler::debug_bootstrap_priority_info () { if (!ec) { - auto [blocking, priorities] = node.ascendboot.info (); + auto [blocking, priorities] = node.bootstrap.info (); // priorities { diff --git a/nano/node/message_processor.cpp b/nano/node/message_processor.cpp index f2695ef84..a5779d6a7 100644 --- a/nano/node/message_processor.cpp +++ b/nano/node/message_processor.cpp @@ -267,7 +267,7 @@ public: void asc_pull_ack (nano::asc_pull_ack const & message) override { - node.ascendboot.process (message, channel); + node.bootstrap.process (message, channel); } private: diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 10c91109d..b734cf415 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -153,8 +153,8 @@ nano::node::node (std::shared_ptr io_ctx_a, std::filesy backlog{ *backlog_impl }, bootstrap_server_impl{ std::make_unique (config.bootstrap_server, store, ledger, network_params.network, stats) }, bootstrap_server{ *bootstrap_server_impl }, - ascendboot_impl{ std::make_unique (config, block_processor, ledger, network, stats, logger) }, - ascendboot{ *ascendboot_impl }, + bootstrap_impl{ std::make_unique (config, block_processor, ledger, network, stats, logger) }, + bootstrap{ *bootstrap_impl }, websocket{ config.websocket_config, observers, wallets, ledger, io_ctx, logger }, epoch_upgrader{ *this, ledger, store, network_params, logger }, local_block_broadcaster_impl{ std::make_unique (config.local_block_broadcaster, *this, block_processor, network, confirming_set, stats, logger, !flags.disable_block_processor_republishing) }, @@ -626,7 +626,7 @@ void nano::node::start () bootstrap_server.start (); if (!flags.disable_ascending_bootstrap) { - ascendboot.start (); + bootstrap.start (); } websocket.start (); telemetry.start (); @@ -657,7 +657,7 @@ void nano::node::stop () // No tasks may wait for work generation in I/O threads, or termination signal capturing will be unable to call node::stop() distributed_work.stop (); backlog.stop (); - ascendboot.stop (); + bootstrap.stop (); rep_crawler.stop (); unchecked.stop (); block_processor.stop (); @@ -1212,7 +1212,7 @@ nano::container_info nano::node::container_info () const info.add ("vote_router", vote_router.container_info ()); info.add ("generator", generator.container_info ()); info.add ("final_generator", final_generator.container_info ()); - info.add ("bootstrap_ascending", ascendboot.container_info ()); + info.add ("bootstrap", bootstrap.container_info ()); info.add ("unchecked", unchecked.container_info ()); info.add ("local_block_broadcaster", local_block_broadcaster.container_info ()); info.add ("rep_tiers", rep_tiers.container_info ()); diff --git a/nano/node/node.hpp b/nano/node/node.hpp index 68827e6bc..e6e284e84 100644 --- a/nano/node/node.hpp +++ b/nano/node/node.hpp @@ -210,8 +210,8 @@ public: nano::backlog_population & backlog; std::unique_ptr bootstrap_server_impl; nano::bootstrap_server & bootstrap_server; - std::unique_ptr ascendboot_impl; - nano::bootstrap_service & ascendboot; + std::unique_ptr bootstrap_impl; + nano::bootstrap_service & bootstrap; nano::websocket_server websocket; nano::epoch_upgrader epoch_upgrader; std::unique_ptr local_block_broadcaster_impl; diff --git a/nano/slow_test/bootstrap.cpp b/nano/slow_test/bootstrap.cpp index 241ae51c3..1301cefac 100644 --- a/nano/slow_test/bootstrap.cpp +++ b/nano/slow_test/bootstrap.cpp @@ -115,8 +115,8 @@ TEST (bootstrap_ascending, profile) rate.observe ("count", [&] () { return client->ledger.block_count (); }); rate.observe ("unchecked", [&] () { return client->unchecked.count (); }); rate.observe ("block_processor", [&] () { return client->block_processor.size (); }); - rate.observe ("priority", [&] () { return client->ascendboot.priority_size (); }); - rate.observe ("blocking", [&] () { return client->ascendboot.blocked_size (); }); + rate.observe ("priority", [&] () { return client->bootstrap.priority_size (); }); + rate.observe ("blocking", [&] () { return client->bootstrap.blocked_size (); }); rate.observe (*client, nano::stat::type::bootstrap_ascending, nano::stat::detail::request, nano::stat::dir::out); rate.observe (*client, nano::stat::type::bootstrap_ascending, nano::stat::detail::reply, nano::stat::dir::in); rate.observe (*client, nano::stat::type::bootstrap_ascending, nano::stat::detail::blocks, nano::stat::dir::in);