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

Rename config to backlog_scan

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-11 15:08:36 +02:00
commit 83954e40ec
25 changed files with 107 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nano/core_test/active_elections.cpp
View file

@ -170,7 +170,7 @@ TEST (active_elections, DISABLED_keep_local)
// Bound to 2, won't drop wallet created transactions, but good to test dropping remote
node_config.active_elections.size = 2;
// Disable frontier confirmation to allow the test to finish before
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
auto & wallet (*system.wallet (0));
@ -330,7 +330,7 @@ TEST (inactive_votes_cache, existing_vote)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
nano::block_hash latest (node.latest (nano::dev::genesis_key.pub));
nano::keypair key;
@ -384,7 +384,7 @@ TEST (inactive_votes_cache, multiple_votes)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
nano::keypair key1;
nano::block_builder builder;
@ -437,7 +437,7 @@ TEST (inactive_votes_cache, election_start)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.priority_scheduler.enable = false;
node_config.optimistic_scheduler.enable = false;
auto & node = *system.add_node (node_config);
@ -543,7 +543,7 @@ TEST (active_elections, vote_replays)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.enable_voting = false;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
nano::keypair key;
nano::state_block_builder builder;
@ -699,7 +699,7 @@ TEST (active_elections, republish_winner)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
node_config.peering_port = system.get_available_port ();
auto & node2 = *system.add_node (node_config);
@ -765,7 +765,7 @@ TEST (active_elections, fork_filter_cleanup)
nano::test::system system{};
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
nano::keypair key{};
@ -846,7 +846,7 @@ TEST (active_elections, fork_replacement_tally)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 (*system.add_node (node_config));
size_t const reps_count = 20;
@ -1003,7 +1003,7 @@ TEST (active_elections, confirmation_consistency)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
for (unsigned i = 0; i < 10; ++i)
@ -1095,7 +1095,7 @@ TEST (active_elections, activate_account_chain)
nano::test::system system;
nano::node_flags flags;
nano::node_config config = system.default_config ();
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config, flags);
nano::keypair key;
@ -1187,7 +1187,7 @@ TEST (active_elections, activate_inactive)
nano::test::system system;
nano::node_flags flags;
nano::node_config config = system.default_config ();
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config, flags);
nano::keypair key;
@ -1337,7 +1337,7 @@ TEST (active_elections, limit_vote_hinted_elections)
nano::test::system system;
nano::node_config config = system.default_config ();
const int aec_limit = 10;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.optimistic_scheduler.enable = false;
config.active_elections.size = aec_limit;
config.active_elections.hinted_limit_percentage = 10; // Should give us a limit of 1 hinted election

6
nano/core_test/bootstrap.cpp
View file

@ -299,7 +299,7 @@ TEST (bootstrap, frontier_scan)
config.bootstrap.enable_scan = false;
config.bootstrap.enable_dependency_walker = false;
// Disable election activation
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.priority_scheduler.enable = false;
config.optimistic_scheduler.enable = false;
config.hinted_scheduler.enable = false;
@ -395,7 +395,7 @@ TEST (bootstrap, frontier_scan_pending)
config.bootstrap.enable_scan = false;
config.bootstrap.enable_dependency_walker = false;
// Disable election activation
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.priority_scheduler.enable = false;
config.optimistic_scheduler.enable = false;
config.hinted_scheduler.enable = false;
@ -477,7 +477,7 @@ TEST (bootstrap, frontier_scan_cannot_prioritize)
config.bootstrap.enable_scan = false;
config.bootstrap.enable_dependency_walker = false;
// Disable election activation
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.priority_scheduler.enable = false;
config.optimistic_scheduler.enable = false;
config.hinted_scheduler.enable = false;

6
nano/core_test/confirming_set.cpp
View file

@ -100,7 +100,7 @@ TEST (confirmation_callback, observer_callbacks)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -145,7 +145,7 @@ TEST (confirmation_callback, confirmed_history)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.bootstrap.enable = false;
auto node = system.add_node (node_config);
@ -217,7 +217,7 @@ TEST (confirmation_callback, dependent_election)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::dev::genesis_key.pub));

10
nano/core_test/election.cpp
View file

@ -36,7 +36,7 @@ TEST (election, quorum_minimum_flip_success)
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = nano::dev::constants.genesis_amount;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
auto const latest_hash = nano::dev::genesis->hash ();
@ -86,7 +86,7 @@ TEST (election, quorum_minimum_flip_fail)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = nano::dev::constants.genesis_amount;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
nano::state_block_builder builder;
@ -137,7 +137,7 @@ TEST (election, quorum_minimum_confirm_success)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = nano::dev::constants.genesis_amount;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
nano::keypair key1;
nano::block_builder builder;
@ -167,7 +167,7 @@ TEST (election, quorum_minimum_confirm_fail)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = nano::dev::constants.genesis_amount;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
nano::block_builder builder;
@ -205,7 +205,7 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);

2
nano/core_test/election_scheduler.cpp
View file

@ -178,7 +178,7 @@ TEST (election_scheduler, no_vacancy)
nano::node_config config = system.default_config ();
config.active_elections.size = 1;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config);
nano::state_block_builder builder{};

4
nano/core_test/ledger.cpp
View file

@ -1018,7 +1018,7 @@ TEST (votes, add_existing)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = nano::dev::constants.genesis_amount;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 = *system.add_node (node_config);
nano::keypair key1;
nano::block_builder builder;
@ -4267,7 +4267,7 @@ TEST (ledger, unchecked_epoch_invalid)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 (*system.add_node (node_config));
nano::keypair destination;
nano::block_builder builder;

8
nano/core_test/ledger_confirm.cpp
View file

@ -58,7 +58,7 @@ TEST (ledger_confirm, multiple_accounts)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
nano::keypair key1;
nano::keypair key2;
@ -232,7 +232,7 @@ TEST (ledger_confirm, send_receive_between_2_accounts)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
nano::keypair key1;
nano::block_hash latest (node->latest (nano::dev::genesis_key.pub));
@ -361,7 +361,7 @@ TEST (ledger_confirm, send_receive_self)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::dev::genesis_key.pub));
@ -449,7 +449,7 @@ TEST (ledger_confirm, all_block_types)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::dev::genesis_key.pub));
nano::keypair key1;

40
nano/core_test/node.cpp
View file

@ -263,7 +263,7 @@ TEST (node, auto_bootstrap)
{
nano::test::system system;
nano::node_config config (system.get_available_port ());
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
nano::node_flags node_flags;
node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_lazy_bootstrap = true;
@ -291,7 +291,7 @@ TEST (node, auto_bootstrap_reverse)
{
nano::test::system system;
nano::node_config config (system.get_available_port ());
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
nano::node_flags node_flags;
node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_lazy_bootstrap = true;
@ -364,7 +364,7 @@ TEST (node, search_receivable_confirmed)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -393,7 +393,7 @@ TEST (node, search_receivable_pruned)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node1 = system.add_node (node_config);
nano::node_flags node_flags;
node_flags.enable_pruning = true;
@ -699,7 +699,7 @@ TEST (node, fork_multi_flip)
nano::test::system system;
nano::node_flags node_flags;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 (*system.add_node (node_config, node_flags, type));
node_config.peering_port = system.get_available_port ();
node_config.bootstrap.account_sets.cooldown = 100ms; // Reduce cooldown to speed up fork resolution
@ -752,7 +752,7 @@ TEST (node, fork_bootstrap_flip)
{
nano::test::system system;
nano::node_config config1{ system.get_available_port () };
config1.backlog_population.enable = false;
config1.backlog_scan.enable = false;
nano::node_flags node_flags;
node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_lazy_bootstrap = true;
@ -1159,7 +1159,7 @@ TEST (node, DISABLED_broadcast_elected)
nano::node_flags node_flags;
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node0 = system.add_node (node_config, node_flags, type);
node_config.peering_port = system.get_available_port ();
auto node1 = system.add_node (node_config, node_flags, type);
@ -1286,7 +1286,7 @@ TEST (node, rep_self_vote)
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.online_weight_minimum = std::numeric_limits<nano::uint128_t>::max ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node0 = system.add_node (node_config);
nano::keypair rep_big;
nano::block_builder builder;
@ -1689,7 +1689,7 @@ TEST (node, DISABLED_local_votes_cache)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.receive_minimum = nano::dev::constants.genesis_amount;
auto & node (*system.add_node (node_config));
nano::state_block_builder builder;
@ -1773,7 +1773,7 @@ TEST (node, DISABLED_local_votes_cache_batch)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
ASSERT_GE (node.network_params.voting.max_cache, 2);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -1847,7 +1847,7 @@ TEST (node, DISABLED_local_votes_cache_generate_new_vote)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -1901,7 +1901,7 @@ TEST (node, DISABLED_local_votes_cache_fork)
node_flags.disable_legacy_bootstrap = true;
node_flags.disable_wallet_bootstrap = true;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node1 (*system.add_node (node_config, node_flags));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
auto send1 = nano::state_block_builder ()
@ -2150,7 +2150,7 @@ TEST (node, epoch_conflict_confirm)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node0 = *system.add_node (node_config);
node_config.peering_port = system.get_available_port ();
auto & node1 = *system.add_node (node_config);
@ -2661,7 +2661,7 @@ TEST (node, bidirectional_tcp)
node_flags.disable_lazy_bootstrap = true;
node_flags.disable_wallet_bootstrap = true;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node1 = system.add_node (node_config, node_flags);
node_config.peering_port = system.get_available_port ();
node_config.tcp_incoming_connections_max = 0; // Disable incoming TCP connections for node 2
@ -2854,7 +2854,7 @@ TEST (node, rollback_gap_source)
{
nano::test::system system;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
nano::state_block_builder builder;
nano::keypair key;
@ -2922,7 +2922,7 @@ TEST (node, dependency_graph)
{
nano::test::system system;
nano::node_config config (system.get_available_port ());
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config);
nano::state_block_builder builder;
@ -3120,10 +3120,10 @@ TEST (node, dependency_graph_frontier)
{
nano::test::system system;
nano::node_config config (system.get_available_port ());
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node1 = *system.add_node (config);
config.peering_port = system.get_available_port ();
config.backlog_population.enable = true;
config.backlog_scan.enable = true;
auto & node2 = *system.add_node (config);
nano::state_block_builder builder;
@ -3287,9 +3287,9 @@ TEST (node, deferred_dependent_elections)
{
nano::test::system system;
nano::node_config node_config_1{ system.get_available_port () };
node_config_1.backlog_population.enable = false;
node_config_1.backlog_scan.enable = false;
nano::node_config node_config_2{ system.get_available_port () };
node_config_2.backlog_population.enable = false;
node_config_2.backlog_scan.enable = false;
nano::node_flags flags;
flags.disable_request_loop = true;
auto & node = *system.add_node (node_config_1, flags);

2
nano/core_test/optimistic_scheduler.cpp
View file

@ -85,7 +85,7 @@ TEST (optimistic_scheduler, under_gap_threshold)
{
nano::test::system system{};
nano::node_config config = system.default_config ();
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config);
// Must be smaller than optimistic scheduler `gap_threshold`

14
nano/core_test/request_aggregator.cpp
View file

@ -21,7 +21,7 @@ TEST (request_aggregator, one)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
nano::block_builder builder;
@ -71,7 +71,7 @@ TEST (request_aggregator, one_update)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
nano::keypair key1;
@ -137,7 +137,7 @@ TEST (request_aggregator, two)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
nano::keypair key1;
@ -208,7 +208,7 @@ TEST (request_aggregator, two_endpoints)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
nano::node_flags node_flags;
node_flags.disable_rep_crawler = true;
auto & node1 (*system.add_node (node_config, node_flags));
@ -266,7 +266,7 @@ TEST (request_aggregator, split)
size_t max_vbh = nano::network::confirm_ack_hashes_max;
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
std::vector<std::pair<nano::block_hash, nano::root>> request;
@ -319,7 +319,7 @@ TEST (request_aggregator, channel_max_queue)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.request_aggregator.max_queue = 0;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -349,7 +349,7 @@ TEST (request_aggregator, DISABLED_unique)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node (*system.add_node (node_config));
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
nano::block_builder builder;

16
nano/core_test/toml.cpp
View file

@ -116,7 +116,7 @@ TEST (toml, daemon_config_deserialize_defaults)
std::stringstream ss;
ss << R"toml(
[node]
[node.backlog_population]
[node.backlog_scan]
[node.bootstrap]
[node.bootstrap_server]
[node.block_processor]
@ -197,9 +197,9 @@ TEST (toml, daemon_config_deserialize_defaults)
ASSERT_EQ (conf.node.max_queued_requests, defaults.node.max_queued_requests);
ASSERT_EQ (conf.node.request_aggregator_threads, defaults.node.request_aggregator_threads);
ASSERT_EQ (conf.node.max_unchecked_blocks, defaults.node.max_unchecked_blocks);
ASSERT_EQ (conf.node.backlog_population.enable, defaults.node.backlog_population.enable);
ASSERT_EQ (conf.node.backlog_population.batch_size, defaults.node.backlog_population.batch_size);
ASSERT_EQ (conf.node.backlog_population.frequency, defaults.node.backlog_population.frequency);
ASSERT_EQ (conf.node.backlog_scan.enable, defaults.node.backlog_scan.enable);
ASSERT_EQ (conf.node.backlog_scan.batch_size, defaults.node.backlog_scan.batch_size);
ASSERT_EQ (conf.node.backlog_scan.frequency, defaults.node.backlog_scan.frequency);
ASSERT_EQ (conf.node.enable_upnp, defaults.node.enable_upnp);
ASSERT_EQ (conf.node.websocket_config.enabled, defaults.node.websocket_config.enabled);
@ -465,7 +465,7 @@ TEST (toml, daemon_config_deserialize_no_defaults)
frontiers_confirmation = "always"
enable_upnp = false
[node.backlog_population]
[node.backlog_scan]
enable = false
batch_size = 999
frequency = 999
@ -704,9 +704,9 @@ TEST (toml, daemon_config_deserialize_no_defaults)
ASSERT_NE (conf.node.work_threads, defaults.node.work_threads);
ASSERT_NE (conf.node.max_queued_requests, defaults.node.max_queued_requests);
ASSERT_NE (conf.node.request_aggregator_threads, defaults.node.request_aggregator_threads);
ASSERT_NE (conf.node.backlog_population.enable, defaults.node.backlog_population.enable);
ASSERT_NE (conf.node.backlog_population.batch_size, defaults.node.backlog_population.batch_size);
ASSERT_NE (conf.node.backlog_population.frequency, defaults.node.backlog_population.frequency);
ASSERT_NE (conf.node.backlog_scan.enable, defaults.node.backlog_scan.enable);
ASSERT_NE (conf.node.backlog_scan.batch_size, defaults.node.backlog_scan.batch_size);
ASSERT_NE (conf.node.backlog_scan.frequency, defaults.node.backlog_scan.frequency);
ASSERT_NE (conf.node.enable_upnp, defaults.node.enable_upnp);
ASSERT_NE (conf.node.websocket_config.enabled, defaults.node.websocket_config.enabled);

14
nano/core_test/vote_processor.cpp
View file

@ -21,7 +21,7 @@ TEST (vote_processor, codes)
nano::test::system system;
auto node_config = system.default_config ();
// Disable all election schedulers
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.hinted_scheduler.enable = false;
node_config.optimistic_scheduler.enable = false;
auto & node = *system.add_node (node_config);
@ -159,10 +159,10 @@ TEST (vote_processor, no_broadcast_local)
flags.disable_request_loop = true;
nano::node_config config1, config2;
config1.representative_vote_weight_minimum = 0;
config1.backlog_population.enable = false;
config1.backlog_scan.enable = false;
auto & node (*system.add_node (config1, flags));
config2.representative_vote_weight_minimum = 0;
config2.backlog_population.enable = false;
config2.backlog_scan.enable = false;
config2.peering_port = system.get_available_port ();
system.add_node (config2, flags);
nano::block_builder builder;
@ -214,10 +214,10 @@ TEST (vote_processor, local_broadcast_without_a_representative)
flags.disable_request_loop = true;
nano::node_config config1, config2;
config1.representative_vote_weight_minimum = 0;
config1.backlog_population.enable = false;
config1.backlog_scan.enable = false;
auto & node (*system.add_node (config1, flags));
config2.representative_vote_weight_minimum = 0;
config2.backlog_population.enable = false;
config2.backlog_scan.enable = false;
config2.peering_port = system.get_available_port ();
system.add_node (config2, flags);
nano::block_builder builder;
@ -263,9 +263,9 @@ TEST (vote_processor, no_broadcast_local_with_a_principal_representative)
nano::node_flags flags;
flags.disable_request_loop = true;
nano::node_config config1, config2;
config1.backlog_population.enable = false;
config1.backlog_scan.enable = false;
auto & node (*system.add_node (config1, flags));
config2.backlog_population.enable = false;
config2.backlog_scan.enable = false;
config2.peering_port = system.get_available_port ();
system.add_node (config2, flags);
nano::block_builder builder;

4
nano/core_test/voting.cpp
View file

@ -146,7 +146,7 @@ TEST (vote_spacing, prune)
TEST (vote_spacing, vote_generator)
{
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.active_elections.hinted_limit_percentage = 0; // Disable election hinting
nano::test::system system;
nano::node_flags node_flags;
@ -190,7 +190,7 @@ TEST (vote_spacing, vote_generator)
TEST (vote_spacing, rapid)
{
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
config.active_elections.hinted_limit_percentage = 0; // Disable election hinting
nano::test::system system;
nano::node_flags node_flags;

2
nano/core_test/wallet.cpp
View file

@ -1150,7 +1150,7 @@ TEST (wallet, search_receivable)
nano::test::system system;
nano::node_config config = system.default_config ();
config.enable_voting = false;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
nano::node_flags flags;
flags.disable_search_pending = true;
auto & node (*system.add_node (config, flags));

2
nano/core_test/wallets.cpp
View file

@ -195,7 +195,7 @@ TEST (wallets, search_receivable)
nano::test::system system;
nano::node_config config = system.default_config ();
config.enable_voting = false;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
nano::node_flags flags;
flags.disable_search_pending = true;
auto & node (*system.add_node (config, flags));

4
nano/lib/thread_roles.cpp
View file

@ -94,8 +94,8 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
case nano::thread_role::name::unchecked:
thread_role_name_string = "Unchecked";
break;
case nano::thread_role::name::backlog_population:
thread_role_name_string = "Backlog";
case nano::thread_role::name::backlog_scan:
thread_role_name_string = "Backlog scan";
break;
case nano::thread_role::name::vote_generator_queue:
thread_role_name_string = "Voting que";

2
nano/lib/thread_roles.hpp
View file

@ -36,7 +36,7 @@ enum class name
epoch_upgrader,
db_parallel_traversal,
unchecked,
backlog_population,
backlog_scan,
vote_generator_queue,
telemetry,
bootstrap,

4
nano/node/backlog_scan.cpp
View file

@ -27,7 +27,7 @@ void nano::backlog_scan::start ()
debug_assert (!thread.joinable ());
thread = std::thread{ [this] () {
nano::thread_role::set (nano::thread_role::name::backlog_population);
nano::thread_role::set (nano::thread_role::name::backlog_scan);
run ();
} };
}
@ -143,7 +143,7 @@ void nano::backlog_scan::activate (secure::transaction const & transaction, nano
}
/*
* backlog_population_config
* backlog_scan_config
*/
nano::error nano::backlog_scan_config::serialize (nano::tomlconfig & toml) const

2
nano/node/node.cpp
View file

@ -154,7 +154,7 @@ nano::node::node (std::shared_ptr<boost::asio::io_context> io_ctx_a, std::filesy
aggregator_impl{ std::make_unique<nano::request_aggregator> (config.request_aggregator, *this, stats, generator, final_generator, history, ledger, wallets, vote_router) },
aggregator{ *aggregator_impl },
wallets (wallets_store.init_error (), *this),
backlog_scan_impl{ std::make_unique<nano::backlog_scan> (config.backlog_population, scheduler, ledger, stats) },
backlog_scan_impl{ std::make_unique<nano::backlog_scan> (config.backlog_scan, scheduler, ledger, stats) },
backlog_scan{ *backlog_scan_impl },
bootstrap_server_impl{ std::make_unique<nano::bootstrap_server> (config.bootstrap_server, store, ledger, network_params.network, stats) },
bootstrap_server{ *bootstrap_server_impl },

12
nano/node/nodeconfig.cpp
View file

@ -258,9 +258,9 @@ nano::error nano::node_config::serialize_toml (nano::tomlconfig & toml) const
monitor.serialize (monitor_l);
toml.put_child ("monitor", monitor_l);
nano::tomlconfig backlog_population_l;
backlog_population.serialize (backlog_population_l);
toml.put_child ("backlog_population", backlog_population_l);
nano::tomlconfig backlog_scan_l;
backlog_scan.serialize (backlog_scan_l);
toml.put_child ("backlog_scan", backlog_scan_l);
return toml.get_error ();
}
@ -395,10 +395,10 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
monitor.deserialize (config_l);
}
if (toml.has_key ("backlog_population"))
if (toml.has_key ("backlog_scan"))
{
auto config_l = toml.get_required_child ("backlog_population");
backlog_population.deserialize (config_l);
auto config_l = toml.get_required_child ("backlog_scan");
backlog_scan.deserialize (config_l);
}
/*

2
nano/node/nodeconfig.hpp
View file

@ -146,7 +146,7 @@ public:
nano::local_block_broadcaster_config local_block_broadcaster;
nano::confirming_set_config confirming_set;
nano::monitor_config monitor;
nano::backlog_scan_config backlog_population;
nano::backlog_scan_config backlog_scan;
public:
/** Entry is ignored if it cannot be parsed as a valid address:port */

4
nano/rpc_test/receivable.cpp
View file

@ -133,7 +133,7 @@ TEST (rpc, receivable_unconfirmed)
{
nano::test::system system;
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, config);
auto chain = nano::test::setup_chain (system, *node, 1, nano::dev::genesis_key, false);
auto block1 = chain[0];
@ -530,7 +530,7 @@ TEST (rpc, accounts_receivable_confirmed)
{
nano::test::system system;
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, config);
auto chain = nano::test::setup_chain (system, *node, 1, nano::dev::genesis_key, false);
auto block1 = chain[0];

8
nano/rpc_test/rpc.cpp
View file

@ -2924,7 +2924,7 @@ TEST (rpc, accounts_balances_unopened_account_with_receivables)
{
nano::test::system system;
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, config);
// send a 1 raw to the unopened account which will have receivables
@ -3228,7 +3228,7 @@ TEST (rpc, pending_exists)
{
nano::test::system system;
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, config);
nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -3287,7 +3287,7 @@ TEST (rpc, wallet_receivable)
{
nano::test::system system;
nano::node_config config;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, config);
nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -4351,7 +4351,7 @@ TEST (rpc, populate_backlog)
nano::test::system system;
nano::node_config node_config = system.default_config ();
// Disable automatic backlog population
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = add_ipc_enabled_node (system, node_config);
// Create and process a block that won't get automatically scheduled for confirmation

18
nano/slow_test/node.cpp
View file

@ -643,7 +643,7 @@ TEST (confirmation_height, many_accounts_single_confirmation)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = 100;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -726,7 +726,7 @@ TEST (confirmation_height, many_accounts_many_confirmations)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = 100;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -799,7 +799,7 @@ TEST (confirmation_height, long_chains)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -944,7 +944,7 @@ TEST (confirmation_height, dynamic_algorithm)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
nano::keypair key;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
@ -992,7 +992,7 @@ TEST (confirmation_height, many_accounts_send_receive_self)
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.online_weight_minimum = 100;
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
node_config.active_elections.size = 400000;
nano::node_flags node_flags;
auto node = system.add_node (node_config);
@ -1411,7 +1411,7 @@ TEST (telemetry, under_load)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
nano::node_flags node_flags;
auto node = system.add_node (node_config, node_flags);
node_config.peering_port = system.get_available_port ();
@ -1772,7 +1772,7 @@ TEST (node, mass_block_new)
{
nano::test::system system;
nano::node_config node_config = system.default_config ();
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto & node = *system.add_node (node_config);
node.network_params.network.aec_loop_interval_ms = 500;
@ -2035,7 +2035,7 @@ TEST (node, wallet_create_block_confirm_conflicts)
nano::test::system system;
nano::block_builder builder;
nano::node_config node_config (system.get_available_port ());
node_config.backlog_population.enable = false;
node_config.backlog_scan.enable = false;
auto node = system.add_node (node_config);
auto const num_blocks = 10000;
@ -2106,7 +2106,7 @@ TEST (system, block_sequence)
config.peering_port = system.get_available_port ();
// config.bandwidth_limit = 16 * 1024;
config.enable_voting = true;
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
nano::node_flags flags;
flags.disable_max_peers_per_ip = true;
flags.disable_ongoing_bootstrap = true;

4
nano/slow_test/vote_cache.cpp
View file

@ -134,7 +134,7 @@ TEST (vote_cache, perf_singlethreaded)
nano::test::system system;
nano::node_flags flags;
nano::node_config config = system.default_config ();
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config, flags);
const int rep_count = 50;
@ -193,7 +193,7 @@ TEST (vote_cache, perf_multithreaded)
nano::test::system system;
nano::node_flags flags;
nano::node_config config = system.default_config ();
config.backlog_population.enable = false;
config.backlog_scan.enable = false;
auto & node = *system.add_node (config, flags);
const int thread_count = 12;