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

Rename ascendboot to bootstrap

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-29 17:30:48 +01:00
commit 26f06511f8
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nano/core_test/bootstrap_ascending.cpp
View file

@ -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 ());
}));
}

2
nano/node/json_handler.cpp
View file

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

2
nano/node/message_processor.cpp
View file

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

10
nano/node/node.cpp
View file

@ -153,8 +153,8 @@ nano::node::node (std::shared_ptr<boost::asio::io_context> io_ctx_a, std::filesy
backlog{ *backlog_impl },
bootstrap_server_impl{ std::make_unique<nano::bootstrap_server> (config.bootstrap_server, store, ledger, network_params.network, stats) },
bootstrap_server{ *bootstrap_server_impl },
ascendboot_impl{ std::make_unique<nano::bootstrap_service> (config, block_processor, ledger, network, stats, logger) },
ascendboot{ *ascendboot_impl },
bootstrap_impl{ std::make_unique<nano::bootstrap_service> (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<nano::local_block_broadcaster> (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 ());

4
nano/node/node.hpp
View file

@ -210,8 +210,8 @@ public:
nano::backlog_population & backlog;
std::unique_ptr<nano::bootstrap_server> bootstrap_server_impl;
nano::bootstrap_server & bootstrap_server;
std::unique_ptr<nano::bootstrap_service> ascendboot_impl;
nano::bootstrap_service & ascendboot;
std::unique_ptr<nano::bootstrap_service> bootstrap_impl;
nano::bootstrap_service & bootstrap;
nano::websocket_server websocket;
nano::epoch_upgrader epoch_upgrader;
std::unique_ptr<nano::local_block_broadcaster> local_block_broadcaster_impl;

4
nano/slow_test/bootstrap.cpp
View file

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