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

Formatting

Browse source
This commit is contained in:
Piotr Wójcik 2025-06-28 13:14:39 +02:00
commit c998ee4e5d
11 changed files with 259 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/core_test/block_store.cpp
View file

@ -313,7 +313,6 @@ TEST (block_store, pending_iterator)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
ASSERT_EQ (store->pending.end (transaction), store->pending.begin (transaction)); ASSERT_EQ (store->pending.end (transaction), store->pending.begin (transaction));
store->pending.put (transaction, nano::pending_key (1, 2), { 2, 3, nano::epoch::epoch_1 }); store->pending.put (transaction, nano::pending_key (1, 2), { 2, 3, nano::epoch::epoch_1 });
@ -381,7 +380,6 @@ TEST (block_store, genesis)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
store->initialize (transaction, nano::dev::constants); store->initialize (transaction, nano::dev::constants);
nano::account_info info; nano::account_info info;
@ -408,7 +406,6 @@ TEST (block_store, empty_accounts)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
auto transaction (store->tx_begin_read ()); auto transaction (store->tx_begin_read ());
auto begin (store->account.begin (transaction)); auto begin (store->account.begin (transaction));
auto end (store->account.end (transaction)); auto end (store->account.end (transaction));
@ -807,7 +804,6 @@ TEST (block_store, frontier)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
nano::block_hash hash (100); nano::block_hash hash (100);
nano::account account (200); nano::account account (200);
@ -849,7 +845,6 @@ TEST (block_store, block_count)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
{ {
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
ASSERT_EQ (0, store->block.count (transaction)); ASSERT_EQ (0, store->block.count (transaction));
@ -874,7 +869,6 @@ TEST (block_store, account_count)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
{ {
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
ASSERT_EQ (0, store->account.count (transaction)); ASSERT_EQ (0, store->account.count (transaction));
@ -889,7 +883,6 @@ TEST (block_store, cemented_count_cache)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ASSERT_EQ (1, ledger.cemented_count ()); ASSERT_EQ (1, ledger.cemented_count ());
@ -1223,7 +1216,6 @@ TEST (block_store, online_weight)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
{ {
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
ASSERT_EQ (0, store->online_weight.count (transaction)); ASSERT_EQ (0, store->online_weight.count (transaction));

9
nano/core_test/ledger.cpp
View file

@ -875,7 +875,6 @@ TEST (ledger, double_open)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
auto transaction = ledger.tx_begin_write (); auto transaction = ledger.tx_begin_write ();
@ -4810,7 +4809,6 @@ TEST (ledger, dependents_confirmed_pruning)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -4986,7 +4984,6 @@ TEST (ledger, pruning_action)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5071,7 +5068,6 @@ TEST (ledger, pruning_large_chain)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5126,7 +5122,6 @@ TEST (ledger, pruning_source_rollback)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5214,7 +5209,6 @@ TEST (ledger, pruning_source_rollback_legacy)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5327,7 +5321,6 @@ TEST (ledger, pruning_legacy_blocks)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5413,7 +5406,6 @@ TEST (ledger, pruning_safe_functions)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
@ -5464,7 +5456,6 @@ TEST (ledger, random_blocks)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;

2
nano/core_test/network.cpp
View file

@ -164,7 +164,6 @@ TEST (network, multi_keepalive)
auto node0 = system.nodes[0]; auto node0 = system.nodes[0];
ASSERT_EQ (0, node0->network.size ()); ASSERT_EQ (0, node0->network.size ());
auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work));
node1->start (); node1->start ();
system.nodes.push_back (node1); system.nodes.push_back (node1);
ASSERT_EQ (0, node1->network.size ()); ASSERT_EQ (0, node1->network.size ());
@ -172,7 +171,6 @@ TEST (network, multi_keepalive)
node1->network.tcp_channels.start_tcp (node0->network.endpoint ()); node1->network.tcp_channels.start_tcp (node0->network.endpoint ());
ASSERT_TIMELY (10s, node0->network.size () == 1 && node0->stats.count (nano::stat::type::message, nano::stat::detail::keepalive) >= 1); ASSERT_TIMELY (10s, node0->network.size () == 1 && node0->stats.count (nano::stat::type::message, nano::stat::detail::keepalive) >= 1);
auto node2 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work)); auto node2 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work));
node2->start (); node2->start ();
system.nodes.push_back (node2); system.nodes.push_back (node2);
node2->network.tcp_channels.start_tcp (node0->network.endpoint ()); node2->network.tcp_channels.start_tcp (node0->network.endpoint ());

2
nano/core_test/node.cpp
View file

@ -265,7 +265,6 @@ TEST (node, auto_bootstrap)
ASSERT_NE (nullptr, send1); ASSERT_NE (nullptr, send1);
ASSERT_TIMELY_EQ (10s, node0->balance (key2.pub), node0->config.receive_minimum.number ()); ASSERT_TIMELY_EQ (10s, node0->balance (key2.pub), node0->config.receive_minimum.number ());
auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work, node_flags)); auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work, node_flags));
node1->start (); node1->start ();
system.nodes.push_back (node1); system.nodes.push_back (node1);
ASSERT_NE (nullptr, nano::test::establish_tcp (system, *node1, node0->network.endpoint ())); ASSERT_NE (nullptr, nano::test::establish_tcp (system, *node1, node0->network.endpoint ()));
@ -290,7 +289,6 @@ TEST (node, auto_bootstrap_reverse)
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
system.wallet (0)->insert_adhoc (key2.prv); system.wallet (0)->insert_adhoc (key2.prv);
auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work, node_flags)); auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work, node_flags));
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node0->config.receive_minimum.number ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node0->config.receive_minimum.number ()));
node1->start (); node1->start ();
system.nodes.push_back (node1); system.nodes.push_back (node1);

2
nano/core_test/processor_service.cpp
View file

@ -17,7 +17,6 @@ TEST (processor_service, bad_send_signature)
nano::test::system system; nano::test::system system;
auto store = nano::make_store (system.logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (system.logger, nano::unique_path (), nano::dev::constants);
nano::ledger ledger (*store, nano::dev::constants, system.stats, system.logger); nano::ledger ledger (*store, nano::dev::constants, system.stats, system.logger);
auto transaction = ledger.tx_begin_write (); auto transaction = ledger.tx_begin_write ();
nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () }; nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () };
@ -42,7 +41,6 @@ TEST (processor_service, bad_receive_signature)
nano::test::system system; nano::test::system system;
auto store = nano::make_store (system.logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (system.logger, nano::unique_path (), nano::dev::constants);
nano::ledger ledger (*store, nano::dev::constants, system.stats, system.logger); nano::ledger ledger (*store, nano::dev::constants, system.stats, system.logger);
auto transaction = ledger.tx_begin_write (); auto transaction = ledger.tx_begin_write ();
nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () }; nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () };

2
nano/node/node.cpp
View file

@ -290,6 +290,7 @@ nano::node::node (std::shared_ptr<boost::asio::io_context> io_ctx_a, std::filesy
wallets.observer = [this] (bool active) { wallets.observer = [this] (bool active) {
observers.wallet.notify (active); observers.wallet.notify (active);
}; };
network.disconnect_observer = [this] () { network.disconnect_observer = [this] () {
observers.disconnect.notify (); observers.disconnect.notify ();
}; };
@ -876,7 +877,6 @@ int nano::node::store_version ()
return store.version.get (transaction); return store.version.get (transaction);
} }
std::pair<uint64_t, std::unordered_map<nano::account, nano::uint128_t>> nano::node::get_bootstrap_weights () const std::pair<uint64_t, std::unordered_map<nano::account, nano::uint128_t>> nano::node::get_bootstrap_weights () const
{ {
std::vector<std::pair<std::string, std::string>> preconfigured_weights = network_params.network.is_live_network () ? nano::weights::preconfigured_weights_live : nano::weights::preconfigured_weights_beta; std::vector<std::pair<std::string, std::string>> preconfigured_weights = network_params.network.is_live_network () ? nano::weights::preconfigured_weights_live : nano::weights::preconfigured_weights_beta;

2
nano/qt_test/qt.cpp
View file

@ -520,7 +520,6 @@ TEST (history, short_text)
nano::logger logger; nano::logger logger;
nano::stats stats{ logger }; nano::stats stats{ logger };
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
{ {
auto transaction (ledger.tx_begin_write ()); auto transaction (ledger.tx_begin_write ());
@ -558,7 +557,6 @@ TEST (history, pruned_source)
nano::logger logger; nano::logger logger;
nano::stats stats{ logger }; nano::stats stats{ logger };
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
ledger.pruning = true; ledger.pruning = true;
nano::block_hash next_pruning; nano::block_hash next_pruning;

2
nano/slow_test/node.cpp
View file

@ -101,7 +101,6 @@ TEST (system, receive_while_synchronizing)
system.generate_mass_activity (count, *system.nodes[0]); system.generate_mass_activity (count, *system.nodes[0]);
nano::keypair key; nano::keypair key;
auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, system.get_available_port (), nano::unique_path (), system.work));
auto wallet (node1->wallets.create (1)); auto wallet (node1->wallets.create (1));
wallet->insert_adhoc (nano::dev::genesis_key.prv); // For voting wallet->insert_adhoc (nano::dev::genesis_key.prv); // For voting
ASSERT_EQ (key.pub, wallet->insert_adhoc (key.prv)); ASSERT_EQ (key.pub, wallet->insert_adhoc (key.prv));
@ -130,7 +129,6 @@ TEST (ledger, deep_account_compute)
{ {
nano::logger logger; nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants); auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::stats stats{ logger }; nano::stats stats{ logger };
nano::ledger ledger (*store, nano::dev::constants, stats, logger); nano::ledger ledger (*store, nano::dev::constants, stats, logger);
auto transaction = ledger.tx_begin_write (); auto transaction = ledger.tx_begin_write ();

11
nano/store/lmdb/lmdb.cpp
View file

@ -51,8 +51,11 @@ nano::store::lmdb::component::component (nano::logger & logger_a, std::filesyste
mdb_txn_tracker (logger_a, txn_tracking_config_a, block_processor_batch_max_time_a), mdb_txn_tracker (logger_a, txn_tracking_config_a, block_processor_batch_max_time_a),
txn_tracking_enabled (txn_tracking_config_a.enable) txn_tracking_enabled (txn_tracking_config_a.enable)
{ {
if (!error) if (error)
{ {
throw std::runtime_error ("Failed to initialize LMDB store: " + database_path.string ());
}
logger.info (nano::log::type::lmdb, "Initializing ledger store: {}", database_path.string ()); logger.info (nano::log::type::lmdb, "Initializing ledger store: {}", database_path.string ());
debug_assert (path_a.filename () == "data.ldb"); debug_assert (path_a.filename () == "data.ldb");
@ -121,11 +124,7 @@ nano::store::lmdb::component::component (nano::logger & logger_a, std::filesyste
auto transaction (tx_begin_read ()); auto transaction (tx_begin_read ());
open_databases (transaction, 0); open_databases (transaction, 0);
} }
} }
else
{
throw std::runtime_error ("Failed to initialize LMDB store: " + database_path.string ());
}
} }
bool nano::store::lmdb::component::vacuum_after_upgrade (std::filesystem::path const & path_a, nano::lmdb_config const & lmdb_config_a) bool nano::store::lmdb::component::vacuum_after_upgrade (std::filesystem::path const & path_a, nano::lmdb_config const & lmdb_config_a)