Skip to content

Commit

Permalink
Passing nano::ledger_constants in to nano::ledger rather than it bein…
Browse files Browse the repository at this point in the history 
…g statically initialized. (#3402)
  • Loading branch information
@clemahieu
clemahieu authored Jul 27, 2021
1 parent 88c87f7 commit e3563a9
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 141 deletions.
20 changes: 10 additions & 10 deletions nano/core_test/block_store.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ TEST (mdb_block_store, supported_version_upgrades)
{
nano::mdb_store store (logger, path);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
// Lower the database to the max version unsupported for upgrades
Expand All @@ -681,7 +681,7 @@ TEST (mdb_block_store, supported_version_upgrades)
{
nano::mdb_store store (logger, path1);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
// Lower the database version to the minimum version supported for upgrade.
Expand Down Expand Up @@ -1003,7 +1003,7 @@ TEST (mdb_block_store, sideband_height)
nano::mdb_store store (logger, nano::unique_path ());
ASSERT_FALSE (store.init_error ());
nano::stat stat;
nano::ledger ledger (store, stat);
nano::ledger ledger (store, stat, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
Expand Down Expand Up @@ -1271,7 +1271,7 @@ TEST (mdb_block_store, upgrade_v14_v15)
nano::logger_mt logger;
nano::mdb_store store (logger, path);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
nano::account_info account_info;
Expand Down Expand Up @@ -1378,7 +1378,7 @@ TEST (mdb_block_store, upgrade_v15_v16)
nano::logger_mt logger;
nano::mdb_store store (logger, path);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
// The representation table should get removed after, so readd it so that we can later confirm this actually happens
Expand Down Expand Up @@ -1429,7 +1429,7 @@ TEST (mdb_block_store, upgrade_v16_v17)
nano::logger_mt logger;
nano::mdb_store store (logger, path);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code);
Expand Down Expand Up @@ -1502,7 +1502,7 @@ TEST (mdb_block_store, upgrade_v17_v18)
nano::mdb_store store (logger, path);
auto transaction (store.tx_begin_write ());
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
store.initialize (transaction, ledger.cache);
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send_zero).code);
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_receive_zero).code);
Expand Down Expand Up @@ -1697,7 +1697,7 @@ TEST (mdb_block_store, upgrade_v18_v19)
nano::logger_mt logger;
nano::mdb_store store (logger, path);
nano::stat stats;
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);

Expand Down Expand Up @@ -1779,7 +1779,7 @@ TEST (mdb_block_store, upgrade_v19_v20)
nano::stat stats;
{
nano::mdb_store store (logger, path);
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
// Delete pruned table
Expand Down Expand Up @@ -1808,7 +1808,7 @@ TEST (mdb_block_store, upgrade_v20_v21)
nano::stat stats;
{
nano::mdb_store store (logger, path);
nano::ledger ledger (store, stats);
nano::ledger ledger (store, stats, nano::dev::constants);
auto transaction (store.tx_begin_write ());
store.initialize (transaction, ledger.cache);
// Delete pruned table
Expand Down
10 changes: 5 additions & 5 deletions nano/core_test/confirmation_height.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ TEST (confirmation_heightDeathTest, rollback_added_block)
auto store = nano::make_store (logger, path);
ASSERT_TRUE (!store->init_error ());
nano::stat stats;
nano::ledger ledger (*store, stats);
nano::ledger ledger (*store, stats, nano::dev::constants);
nano::write_database_queue write_database_queue (false);
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1;
Expand Down Expand Up @@ -797,7 +797,7 @@ TEST (confirmation_heightDeathTest, modified_chain)
auto store = nano::make_store (logger, path);
ASSERT_TRUE (!store->init_error ());
nano::stat stats;
nano::ledger ledger (*store, stats);
nano::ledger ledger (*store, stats, nano::dev::constants);
nano::write_database_queue write_database_queue (false);
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1;
Expand Down Expand Up @@ -867,7 +867,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed)
auto store = nano::make_store (logger, path);
ASSERT_TRUE (!store->init_error ());
nano::stat stats;
nano::ledger ledger (*store, stats);
nano::ledger ledger (*store, stats, nano::dev::constants);
nano::write_database_queue write_database_queue (false);
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1;
Expand Down Expand Up @@ -1359,7 +1359,7 @@ TEST (confirmation_height, unbounded_block_cache_iteration)
auto store = nano::make_store (logger, path);
ASSERT_TRUE (!store->init_error ());
nano::stat stats;
nano::ledger ledger (*store, stats);
nano::ledger ledger (*store, stats, nano::dev::constants);
nano::write_database_queue write_database_queue (false);
boost::latch initialized_latch{ 0 };
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
Expand Down Expand Up @@ -1409,7 +1409,7 @@ TEST (confirmation_height, pruned_source)
auto store = nano::make_store (logger, path);
ASSERT_TRUE (!store->init_error ());
nano::stat stats;
nano::ledger ledger (*store, stats);
nano::ledger ledger (*store, stats, nano::dev::constants);
ledger.pruning = true;
nano::write_database_queue write_database_queue (false);
nano::work_pool pool (std::numeric_limits<unsigned>::max ());
Expand Down
Loading

0 comments on commit e3563a9

Please sign in to comment.