diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index 21c893197..931598d49 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -163,7 +163,7 @@ TEST (active_transactions, keep_local) nano::node_config node_config = system.default_config (); node_config.enable_voting = false; // Bound to 2, won't drop wallet created transactions, but good to test dropping remote - node_config.active_elections_size = 2; + node_config.active_transactions.size = 2; // Disable frontier confirmation to allow the test to finish before node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; @@ -234,7 +234,7 @@ TEST (active_transactions, keep_local) node.process_active (receive3); /// bound elections, should drop after one loop - ASSERT_TIMELY_EQ (5s, node.active.size (), node_config.active_elections_size); + ASSERT_TIMELY_EQ (5s, node.active.size (), node_config.active_transactions.size); // ASSERT_EQ (1, node.scheduler.size ()); } @@ -1318,7 +1318,7 @@ TEST (active_transactions, vacancy) { nano::test::system system; nano::node_config config = system.default_config (); - config.active_elections_size = 1; + config.active_transactions.size = 1; auto & node = *system.add_node (config); nano::state_block_builder builder; auto send = builder.make_block () @@ -1354,7 +1354,7 @@ TEST (active_transactions, fifo) nano::test::system system{}; nano::node_config config = system.default_config (); - config.active_elections_size = 1; + config.active_transactions.size = 1; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (config); @@ -1441,8 +1441,8 @@ TEST (active_transactions, limit_vote_hinted_elections) const int aec_limit = 10; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; config.optimistic_scheduler.enabled = false; - config.active_elections_size = aec_limit; - config.active_elections_hinted_limit_percentage = 10; // Should give us a limit of 1 hinted election + config.active_transactions.size = aec_limit; + config.active_transactions.hinted_limit_percentage = 10; // Should give us a limit of 1 hinted election auto & node = *system.add_node (config); // Setup representatives @@ -1506,8 +1506,8 @@ TEST (active_transactions, allow_limited_overflow) nano::node_config config = system.default_config (); const int aec_limit = 20; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - config.active_elections_size = aec_limit; - config.active_elections_hinted_limit_percentage = 20; // Should give us a limit of 4 hinted elections + config.active_transactions.size = aec_limit; + config.active_transactions.hinted_limit_percentage = 20; // Should give us a limit of 4 hinted elections auto & node = *system.add_node (config); auto blocks = nano::test::setup_independent_blocks (system, node, aec_limit * 4); @@ -1555,8 +1555,8 @@ TEST (active_transactions, allow_limited_overflow_adapt) nano::node_config config = system.default_config (); const int aec_limit = 20; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - config.active_elections_size = aec_limit; - config.active_elections_hinted_limit_percentage = 20; // Should give us a limit of 4 hinted elections + config.active_transactions.size = aec_limit; + config.active_transactions.hinted_limit_percentage = 20; // Should give us a limit of 4 hinted elections auto & node = *system.add_node (config); auto blocks = nano::test::setup_independent_blocks (system, node, aec_limit * 4); diff --git a/nano/core_test/blockprocessor.cpp b/nano/core_test/blockprocessor.cpp index ad7b3fffa..3050947d3 100644 --- a/nano/core_test/blockprocessor.cpp +++ b/nano/core_test/blockprocessor.cpp @@ -16,9 +16,9 @@ TEST (block_processor, broadcast_block_on_arrival) nano::test::system system; nano::node_config config1 = system.default_config (); // Deactivates elections on both nodes. - config1.active_elections_size = 0; + config1.active_transactions.size = 0; nano::node_config config2 = system.default_config (); - config2.active_elections_size = 0; + config2.active_transactions.size = 0; nano::node_flags flags; // Disables bootstrap listener to make sure the block won't be shared by this channel. flags.disable_bootstrap_listener = true; diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp index be1ba4cfe..7abd60aa1 100644 --- a/nano/core_test/election_scheduler.cpp +++ b/nano/core_test/election_scheduler.cpp @@ -56,7 +56,7 @@ TEST (election_scheduler, activate_one_flush) /** * Tests that the election scheduler and the active transactions container (AEC) - * work in sync with regards to the node configuration value "active_elections_size". + * work in sync with regards to the node configuration value "active_transactions.size". * * The test sets up two forcefully cemented blocks -- a send on the genesis account and a receive on a second account. * It then creates two other blocks, each a successor to one of the previous two, @@ -74,7 +74,7 @@ TEST (election_scheduler, no_vacancy) nano::test::system system{}; nano::node_config config = system.default_config (); - config.active_elections_size = 1; + config.active_transactions.size = 1; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (config); diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp index 6307f07a0..dbfabf86b 100644 --- a/nano/core_test/ledger.cpp +++ b/nano/core_test/ledger.cpp @@ -128,7 +128,7 @@ TEST (ledger, process_send) ASSERT_EQ (2, send->sideband ().height); ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.block_amount (transaction, hash1)); ASSERT_EQ (nano::dev::genesis_key.pub, send->account ()); - ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ()); + ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.account_receivable (transaction, key2.pub)); auto info2 = ledger.any.account_get (transaction, nano::dev::genesis_key.pub); ASSERT_TRUE (info2); @@ -264,19 +264,19 @@ TEST (ledger, process_receive) ASSERT_EQ (key2.pub, receive->sideband ().account); ASSERT_EQ (nano::dev::constants.genesis_amount - 25, receive->sideband ().balance.number ()); ASSERT_EQ (2, receive->sideband ().height); - ASSERT_EQ (25, ledger.any.block_amount (transaction, hash4).value ().number ()); + ASSERT_EQ (25, ledger.any.block_amount (transaction, hash4)); ASSERT_EQ (nano::block_status::progress, return2); ASSERT_EQ (key2.pub, receive->account ()); ASSERT_EQ (hash4, ledger.any.account_head (transaction, key2.pub)); - ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ()); + ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_receivable (transaction, key2.pub)); - ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.any.account_balance (transaction, key2.pub).value ().number ()); + ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.any.account_balance (transaction, key2.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, hash4)); ASSERT_FALSE (ledger.any.block_successor (transaction, hash2)); - ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ()); + ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (25, ledger.account_receivable (transaction, key2.pub)); - ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.account_balance (transaction, key2.pub).value ().number ()); + ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.account_balance (transaction, key2.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub)); ASSERT_EQ (hash2, ledger.any.account_head (transaction, key2.pub)); auto pending1 = ledger.any.pending_get (transaction, nano::pending_key (key2.pub, hash3)); @@ -319,7 +319,7 @@ TEST (ledger, rollback_receiver) nano::block_hash hash2 (open->hash ()); ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, open)); ASSERT_EQ (hash2, ledger.any.account_head (transaction, key2.pub)); - ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ()); + ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.account_balance (transaction, key2.pub)); ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); @@ -527,7 +527,7 @@ TEST (ledger, representative_change) .build (); auto return1 (ledger.process (transaction, block)); ASSERT_EQ (nano::block_status::progress, return1); - ASSERT_EQ (0, ledger.any.block_amount (transaction, block->hash ()).value ().number ()); + ASSERT_EQ (0, ledger.any.block_amount (transaction, block->hash ())); ASSERT_EQ (nano::dev::genesis_key.pub, block->account ()); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount, ledger.weight (key2.pub)); @@ -2543,7 +2543,7 @@ TEST (ledger, state_rep_change) ASSERT_NE (nullptr, change2); ASSERT_EQ (*change1, *change2); ASSERT_EQ (nano::dev::constants.genesis_amount, ledger.any.block_balance (transaction, change1->hash ())); - ASSERT_EQ (0, ledger.any.block_amount (transaction, change1->hash ()).value ().number ()); + ASSERT_EQ (0, ledger.any.block_amount (transaction, change1->hash ())); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::dev::constants.genesis_amount, ledger.weight (rep.pub)); ASSERT_EQ (2, change2->sideband ().height); @@ -3563,7 +3563,7 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive2)); ASSERT_EQ (nano::epoch::epoch_1, receive2->sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_1, receive2->sideband ().source_epoch); - ASSERT_EQ (0, ledger.any.block_balance (transaction, epoch4->hash ()).value ().number ()); + ASSERT_EQ (0, ledger.any.block_balance (transaction, epoch4->hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.any.block_balance (transaction, receive2->hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.any.block_amount (transaction, receive2->hash ())); ASSERT_EQ (nano::dev::constants.genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis_key.pub)); @@ -3731,7 +3731,7 @@ TEST (ledger, epoch_blocks_v2_general) ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive2)); ASSERT_EQ (nano::epoch::epoch_2, receive2->sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_1, receive2->sideband ().source_epoch); - ASSERT_EQ (0, ledger.any.block_balance (transaction, epoch6->hash ()).value ().number ()); + ASSERT_EQ (0, ledger.any.block_balance (transaction, epoch6->hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.any.block_balance (transaction, receive2->hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.any.block_amount (transaction, receive2->hash ())); ASSERT_EQ (nano::dev::constants.genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis_key.pub)); diff --git a/nano/core_test/toml.cpp b/nano/core_test/toml.cpp index 886461df6..dc1ed2fa4 100644 --- a/nano/core_test/toml.cpp +++ b/nano/core_test/toml.cpp @@ -152,7 +152,7 @@ TEST (toml, daemon_config_deserialize_defaults) ASSERT_EQ (conf.rpc.child_process.enable, defaults.rpc.child_process.enable); ASSERT_EQ (conf.rpc.child_process.rpc_path, defaults.rpc.child_process.rpc_path); - ASSERT_EQ (conf.node.active_elections_size, defaults.node.active_elections_size); + ASSERT_EQ (conf.node.active_transactions.size, defaults.node.active_transactions.size); ASSERT_EQ (conf.node.allow_local_peers, defaults.node.allow_local_peers); ASSERT_EQ (conf.node.backup_before_upgrade, defaults.node.backup_before_upgrade); ASSERT_EQ (conf.node.bandwidth_limit, defaults.node.bandwidth_limit); @@ -167,7 +167,6 @@ TEST (toml, daemon_config_deserialize_defaults) ASSERT_EQ (conf.node.bootstrap_frontier_request_count, defaults.node.bootstrap_frontier_request_count); ASSERT_EQ (conf.node.bootstrap_fraction_numerator, defaults.node.bootstrap_fraction_numerator); ASSERT_EQ (conf.node.confirming_set_batch_time, defaults.node.confirming_set_batch_time); - ASSERT_EQ (conf.node.confirmation_history_size, defaults.node.confirmation_history_size); ASSERT_EQ (conf.node.enable_voting, defaults.node.enable_voting); ASSERT_EQ (conf.node.external_address, defaults.node.external_address); ASSERT_EQ (conf.node.external_port, defaults.node.external_port); @@ -397,7 +396,6 @@ TEST (toml, daemon_config_deserialize_no_defaults) ss << R"toml( [node] - active_elections_size = 999 allow_local_peers = false backup_before_upgrade = true bandwidth_limit = 999 @@ -412,7 +410,6 @@ TEST (toml, daemon_config_deserialize_no_defaults) bootstrap_frontier_request_count = 9999 bootstrap_fraction_numerator = 999 confirming_set_batch_time = 999 - confirmation_history_size = 999 enable_voting = false external_address = "0:0:0:0:0:ffff:7f01:101" external_port = 999 @@ -454,6 +451,13 @@ TEST (toml, daemon_config_deserialize_no_defaults) priority_bootstrap = 999 priority_local = 999 + [node.active_transactions] + size = 999 + hinted_limit_percentage = 90 + optimistic_limit_percentage = 90 + confirmation_history_size = 999 + confirmation_cache = 999 + [node.diagnostics.txn_tracking] enable = true ignore_writes_below_block_processor_max_time = false @@ -603,7 +607,7 @@ TEST (toml, daemon_config_deserialize_no_defaults) ASSERT_NE (conf.rpc.child_process.enable, defaults.rpc.child_process.enable); ASSERT_NE (conf.rpc.child_process.rpc_path, defaults.rpc.child_process.rpc_path); - ASSERT_NE (conf.node.active_elections_size, defaults.node.active_elections_size); + ASSERT_NE (conf.node.active_transactions.size, defaults.node.active_transactions.size); ASSERT_NE (conf.node.allow_local_peers, defaults.node.allow_local_peers); ASSERT_NE (conf.node.backup_before_upgrade, defaults.node.backup_before_upgrade); ASSERT_NE (conf.node.bandwidth_limit, defaults.node.bandwidth_limit); @@ -618,7 +622,6 @@ TEST (toml, daemon_config_deserialize_no_defaults) ASSERT_NE (conf.node.bootstrap_frontier_request_count, defaults.node.bootstrap_frontier_request_count); ASSERT_NE (conf.node.bootstrap_fraction_numerator, defaults.node.bootstrap_fraction_numerator); ASSERT_NE (conf.node.confirming_set_batch_time, defaults.node.confirming_set_batch_time); - ASSERT_NE (conf.node.confirmation_history_size, defaults.node.confirmation_history_size); ASSERT_NE (conf.node.enable_voting, defaults.node.enable_voting); ASSERT_NE (conf.node.external_address, defaults.node.external_address); ASSERT_NE (conf.node.external_port, defaults.node.external_port); @@ -1078,7 +1081,7 @@ TEST (toml, merge_config_files) ss << R"toml( [node] - active_elections_size = 999 + active_transactions.size = 999 # backlog_scan_batch_size = 7777 [node.bootstrap_ascending] block_wait_count = 33333 @@ -1101,8 +1104,8 @@ TEST (toml, merge_config_files) merged_toml.read (ss2); merged_config.deserialize_toml (merged_toml); - ASSERT_NE (merged_config.node.active_elections_size, default_config.node.active_elections_size); - ASSERT_EQ (merged_config.node.active_elections_size, 999); + ASSERT_NE (merged_config.node.active_transactions.size, default_config.node.active_transactions.size); + ASSERT_EQ (merged_config.node.active_transactions.size, 999); ASSERT_NE (merged_config.node.backlog_scan_batch_size, 7777); ASSERT_EQ (merged_config.node.bootstrap_ascending.block_wait_count, 33333); ASSERT_TRUE (merged_config_string.find ("old_entry") == std::string::npos); diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp index 9a1694546..c0a7d807e 100644 --- a/nano/core_test/voting.cpp +++ b/nano/core_test/voting.cpp @@ -146,7 +146,7 @@ TEST (vote_spacing, vote_generator) { nano::node_config config; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - config.active_elections_hinted_limit_percentage = 0; // Disable election hinting + config.active_transactions.hinted_limit_percentage = 0; // Disable election hinting nano::test::system system; nano::node_flags node_flags; node_flags.disable_search_pending = true; @@ -190,7 +190,7 @@ TEST (vote_spacing, rapid) { nano::node_config config; config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - config.active_elections_hinted_limit_percentage = 0; // Disable election hinting + config.active_transactions.hinted_limit_percentage = 0; // Disable election hinting nano::test::system system; nano::node_flags node_flags; node_flags.disable_search_pending = true; diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp index 09190dcfb..fec6e2d48 100644 --- a/nano/nano_node/entry.cpp +++ b/nano/nano_node/entry.cpp @@ -1238,7 +1238,7 @@ int main (int argc, char * const * argv) else { config2.frontiers_confirmation = daemon_config.node.frontiers_confirmation; - config2.active_elections_size = daemon_config.node.active_elections_size; + config2.active_transactions.size = daemon_config.node.active_transactions.size; } auto node2 (std::make_shared (io_ctx2, path2, config2, work, flags, 1)); diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index f220764c8..b2ca6e527 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -2039,7 +2039,7 @@ void nano::json_handler::election_statistics () } } - auto utilization_percentage = (static_cast (total_count * 100) / node.config.active_elections_size); + auto utilization_percentage = (static_cast (total_count * 100) / node.config.active_transactions.size); auto max_election_age = std::chrono::duration_cast (now - oldest_election_start).count (); auto average_election_age = total_count ? std::chrono::duration_cast (total_age).count () / total_count : 0; diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index a0f02abee..c6b4c872d 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -995,7 +995,7 @@ TEST (confirmation_height, many_accounts_send_receive_self) nano::node_config node_config = system.default_config (); node_config.online_weight_minimum = 100; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - node_config.active_elections_size = 400000; + node_config.active_transactions.size = 400000; nano::node_flags node_flags; auto node = system.add_node (node_config); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);