From 0091262d961f7cdc40c84d326673d225c8b59fa2 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 20 Jul 2021 17:53:53 +0100 Subject: [PATCH 1/7] Moving dev constants in to their own namespace and deleting extra memorization of genesis_hash. --- nano/core_test/active_transactions.cpp | 24 +++++------ nano/core_test/block_store.cpp | 6 +-- nano/core_test/confirmation_height.cpp | 18 ++++---- nano/core_test/confirmation_solicitor.cpp | 6 +-- nano/core_test/election.cpp | 14 +++--- nano/core_test/election_scheduler.cpp | 16 +++---- nano/core_test/ledger.cpp | 18 ++++---- nano/core_test/ledger_walker.cpp | 8 ++-- nano/core_test/node.cpp | 52 +++++++++++------------ nano/core_test/request_aggregator.cpp | 4 +- nano/core_test/vote_processor.cpp | 4 +- nano/core_test/voting.cpp | 30 ++++++------- nano/core_test/wallet.cpp | 4 +- nano/core_test/wallets.cpp | 4 +- nano/rpc_test/rpc.cpp | 28 ++++++------ nano/secure/common.cpp | 3 ++ nano/secure/common.hpp | 6 +++ nano/slow_test/node.cpp | 6 +-- nano/test_common/system.cpp | 2 +- nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 21 files changed, 131 insertions(+), 124 deletions(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index 5801a08f..3154b0d8 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -1021,12 +1021,12 @@ TEST (active_transactions, activate_account_chain) nano::state_block_builder builder; auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto send2 = builder.make_block () .account (nano::dev_genesis_key.pub) @@ -1121,12 +1121,12 @@ TEST (active_transactions, activate_inactive) nano::state_block_builder builder; auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () .account (nano::dev_genesis_key.pub) @@ -1182,12 +1182,12 @@ TEST (active_transactions, pessimistic_elections) nano::state_block_builder builder; auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); @@ -1321,12 +1321,12 @@ TEST (active_transactions, list_active) nano::state_block_builder builder; auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); @@ -1376,12 +1376,12 @@ TEST (active_transactions, vacancy) nano::state_block_builder builder; auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); std::atomic updated = false; node.active.vacancy_update = [&updated] () { updated = true; }; @@ -1414,12 +1414,12 @@ TEST (active_transactions, fifo) // Construct two pending entries that can be received simultaneously auto send0 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key0.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send0).code); nano::blocks_confirm (node, { send0 }, true); diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp index 1cd1062c..995b8dad 100644 --- a/nano/core_test/block_store.cpp +++ b/nano/core_test/block_store.cpp @@ -692,7 +692,7 @@ TEST (mdb_block_store, supported_version_upgrades) store.confirmation_height.del (transaction, nano::genesis_account); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "accounts_v1", MDB_CREATE, &store.accounts_v1_handle)); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "open", MDB_CREATE, &store.open_blocks_handle)); - modify_account_info_to_v14 (store, transaction, nano::genesis_account, 1, nano::genesis_hash); + modify_account_info_to_v14 (store, transaction, nano::genesis_account, 1, nano::dev::genesis->hash ()); write_block_w_sideband_v18 (store, store.open_blocks_handle, transaction, *nano::genesis ().open); } @@ -1700,7 +1700,7 @@ TEST (mdb_block_store, upgrade_v18_v19) nano::keypair key1; nano::work_pool pool (std::numeric_limits::max ()); nano::network_params network_params; - nano::send_block send (nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash)); + nano::send_block send (nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); nano::change_block change (receive.hash (), 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive.hash ())); nano::state_block state_epoch (nano::dev_genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change.hash ())); @@ -1760,7 +1760,7 @@ TEST (mdb_block_store, upgrade_v18_v19) ASSERT_TRUE (store.block.get (transaction, send.hash ())); ASSERT_TRUE (store.block.get (transaction, receive.hash ())); ASSERT_TRUE (store.block.get (transaction, change.hash ())); - ASSERT_TRUE (store.block.get (transaction, nano::genesis_hash)); + ASSERT_TRUE (store.block.get (transaction, nano::dev::genesis->hash ())); auto state_epoch_disk (store.block.get (transaction, state_epoch.hash ())); ASSERT_NE (nullptr, state_epoch_disk); ASSERT_EQ (nano::epoch::epoch_1, state_epoch_disk->sideband ().details.epoch); diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp index 966fe7c1..f42df2da 100644 --- a/nano/core_test/confirmation_height.cpp +++ b/nano/core_test/confirmation_height.cpp @@ -48,7 +48,7 @@ TEST (confirmation_height, single) auto transaction = node->store.tx_begin_read (); ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); - ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); + ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); node->process_active (send1); node->block_processor.flush (); @@ -134,7 +134,7 @@ TEST (confirmation_height, multiple_accounts) nano::confirmation_height_info confirmation_height_info; ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); - ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); + ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); ASSERT_TRUE (node->store.confirmation_height.get (transaction, key1.pub, confirmation_height_info)); ASSERT_EQ (0, confirmation_height_info.height); ASSERT_EQ (nano::block_hash (0), confirmation_height_info.frontier); @@ -343,7 +343,7 @@ TEST (confirmation_height, gap_live) nano::confirmation_height_info confirmation_height_info; ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); - ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); + ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); } // Vote and confirm all existing blocks @@ -806,7 +806,7 @@ TEST (confirmation_heightDeathTest, modified_chain) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash)); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -832,7 +832,7 @@ TEST (confirmation_heightDeathTest, modified_chain) } ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), *send).code); - store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::genesis_hash }); + store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::dev::genesis->hash () }); nano::confirmation_height_unbounded unbounded_processor ( ledger, write_database_queue, 10ms, logging, logger, stopped, batch_write_size, [] (auto const &) {}, [] (auto const &) {}, [] () { return 0; }); @@ -877,7 +877,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash)); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open = std::make_shared (key1.pub, 0, 0, nano::Gxrb_ratio, send->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); { auto transaction (store->tx_begin_write ()); @@ -906,7 +906,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed) // Reset conditions and test with the bounded processor ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), *open).code); - store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::genesis_hash }); + store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::dev::genesis->hash () }); nano::confirmation_height_bounded bounded_processor ( ledger, write_database_queue, 10ms, logging, logger, stopped, batch_write_size, [] (auto const &) {}, [] (auto const &) {}, [] () { return 0; }); @@ -1344,7 +1344,7 @@ TEST (confirmation_height, election_winner_details_clearing_node_process_confirm nano::system system (1); auto node = system.nodes.front (); - auto send = std::make_shared (nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash)); + auto send = std::make_shared (nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ())); // Add to election_winner_details. Use an unrealistic iteration so that it should fall into the else case and do a cleanup node->active.add_election_winner_details (send->hash (), nullptr); nano::election_status election; @@ -1422,7 +1422,7 @@ TEST (confirmation_height, pruned_source) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1, key2; - auto send1 = std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 100, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash)); + auto send1 = std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 100, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open1 = std::make_shared (key1.pub, 0, key1.pub, 100, send1->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); auto send2 = std::make_shared (key1.pub, open1->hash (), key1.pub, 50, key2.pub, key1.prv, key1.pub, *pool.generate (open1->hash ())); auto send3 = std::make_shared (key1.pub, send2->hash (), key1.pub, 25, key2.pub, key1.prv, key1.pub, *pool.generate (send2->hash ())); diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp index b32ee2ea..13a297c8 100644 --- a/nano/core_test/confirmation_solicitor.cpp +++ b/nano/core_test/confirmation_solicitor.cpp @@ -28,7 +28,7 @@ TEST (confirmation_solicitor, batches) ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); { nano::lock_guard guard (node2.active.mutex); @@ -72,7 +72,7 @@ TEST (confirmation_solicitor, different_hash) ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner @@ -108,7 +108,7 @@ TEST (confirmation_solicitor, bypass_max_requests_cap) ASSERT_EQ (max_representatives + 1, representatives.size ()); solicitor.prepare (representatives); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp index 941fc618..4afcfb0e 100644 --- a/nano/core_test/election.cpp +++ b/nano/core_test/election.cpp @@ -29,7 +29,7 @@ TEST (election, quorum_minimum_flip_success) nano::block_builder builder; auto send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key1.pub) @@ -40,7 +40,7 @@ TEST (election, quorum_minimum_flip_success) nano::keypair key2; auto send2 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key2.pub) @@ -75,7 +75,7 @@ TEST (election, quorum_minimum_flip_fail) nano::block_builder builder; auto send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key1.pub) @@ -86,7 +86,7 @@ TEST (election, quorum_minimum_flip_fail) nano::keypair key2; auto send2 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key2.pub) @@ -121,7 +121,7 @@ TEST (election, quorum_minimum_confirm_success) nano::block_builder builder; auto send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key1.pub) @@ -154,7 +154,7 @@ TEST (election, quorum_minimum_confirm_fail) nano::block_builder builder; auto send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key1.pub) @@ -190,7 +190,7 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks) nano::block_builder builder; auto send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (amount) .link (key1.pub) diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp index 12cb23de..368ee24f 100644 --- a/nano/core_test/election_scheduler.cpp +++ b/nano/core_test/election_scheduler.cpp @@ -19,12 +19,12 @@ TEST (election_scheduler, activate_one_timely) nano::state_block_builder builder; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); system.nodes[0]->ledger.process (system.nodes[0]->store.tx_begin_write (), *send1); system.nodes[0]->scheduler.activate (nano::dev_genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); @@ -37,12 +37,12 @@ TEST (election_scheduler, activate_one_flush) nano::state_block_builder builder; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); system.nodes[0]->ledger.process (system.nodes[0]->store.tx_begin_write (), *send1); system.nodes[0]->scheduler.activate (nano::dev_genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); @@ -62,12 +62,12 @@ TEST (election_scheduler, no_vacancy) // Activating accounts depends on confirmed dependencies. First, prepare 2 accounts auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto receive = builder.make_block () .account (key.pub) @@ -135,12 +135,12 @@ TEST (election_scheduler, flush_vacancy) auto send = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp index 8f0aae15..bec09a76 100644 --- a/nano/core_test/ledger.cpp +++ b/nano/core_test/ledger.cpp @@ -742,7 +742,7 @@ TEST (votes, add_existing) nano::block_builder builder; std::shared_ptr send1 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) // No representative, blocks can't confirm .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) .link (key1.pub) @@ -762,7 +762,7 @@ TEST (votes, add_existing) nano::keypair key2; std::shared_ptr send2 = builder.state () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) // No representative, blocks can't confirm .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) .link (key2.pub) @@ -2563,12 +2563,12 @@ TEST (ledger, epoch_open_pending) // New block to process epoch open auto send1 = builder.state () .account (nano::genesis_account) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::genesis_account) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*pool.generate (nano::genesis_hash)) + .work (*pool.generate (nano::dev::genesis->hash ())) .build_shared (); node1.block_processor.add (send1); node1.block_processor.flush (); @@ -3000,7 +3000,7 @@ TEST (ledger, work_validation) std::error_code ec; auto send = *builder.send () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (gen.pub) .balance (nano::genesis_amount - 1) .sign (gen.prv, gen.pub) @@ -3735,12 +3735,12 @@ TEST (ledger, migrate_lmdb_to_rocksdb) auto send = nano::state_block_builder () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (0) .link (nano::account (10)) .balance (nano::genesis_amount - 100) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*pool.generate (nano::genesis_hash)) + .work (*pool.generate (nano::dev::genesis->hash ())) .build_shared (); nano::endpoint_key endpoint_key (address.to_bytes (), port); @@ -3760,7 +3760,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) store.pending.put (transaction, nano::pending_key (nano::genesis_account, send->hash ()), nano::pending_info (nano::genesis_account, 100, nano::epoch::epoch_0)); store.pruned.put (transaction, send->hash ()); - store.unchecked.put (transaction, nano::genesis_hash, send); + store.unchecked.put (transaction, nano::dev::genesis->hash (), send); store.version.put (transaction, version); send->sideband_set ({}); store.block.put (transaction, send->hash (), *send); @@ -3797,7 +3797,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) ASSERT_TRUE (rocksdb_store.final_vote.get (rocksdb_transaction, nano::root (send->previous ())).size () == 1); ASSERT_EQ (rocksdb_store.final_vote.get (rocksdb_transaction, nano::root (send->previous ()))[0], nano::block_hash (2)); - auto unchecked_infos = rocksdb_store.unchecked.get (rocksdb_transaction, nano::genesis_hash); + auto unchecked_infos = rocksdb_store.unchecked.get (rocksdb_transaction, nano::dev::genesis->hash ()); ASSERT_EQ (unchecked_infos.size (), 1); ASSERT_EQ (unchecked_infos.front ().account, nano::genesis_account); ASSERT_EQ (*unchecked_infos.front ().block, *send); diff --git a/nano/core_test/ledger_walker.cpp b/nano/core_test/ledger_walker.cpp index 20fb7778..d76e8b67 100644 --- a/nano/core_test/ledger_walker.cpp +++ b/nano/core_test/ledger_walker.cpp @@ -19,19 +19,19 @@ TEST (ledger_walker, genesis_block) nano::ledger_walker ledger_walker{ node->ledger }; std::size_t walked_blocks_count = 0; - ledger_walker.walk_backward (nano::genesis_hash, + ledger_walker.walk_backward (nano::dev::genesis->hash (), [&] (const auto & block) { ++walked_blocks_count; - EXPECT_EQ (block->hash (), nano::genesis_hash); + EXPECT_EQ (block->hash (), nano::dev::genesis->hash ()); }); EXPECT_EQ (walked_blocks_count, 1); walked_blocks_count = 0; - ledger_walker.walk (nano::genesis_hash, + ledger_walker.walk (nano::dev::genesis->hash (), [&] (const auto & block) { ++walked_blocks_count; - EXPECT_EQ (block->hash (), nano::genesis_hash); + EXPECT_EQ (block->hash (), nano::dev::genesis->hash ()); }); EXPECT_EQ (walked_blocks_count, 1); diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp index e6516e50..615634a5 100644 --- a/nano/core_test/node.cpp +++ b/nano/core_test/node.cpp @@ -1718,11 +1718,11 @@ TEST (node, broadcast_elected) auto transaction1 (node1->store.tx_begin_write ()); auto transaction2 (node2->store.tx_begin_write ()); auto fund_big = *builder.send () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (rep_big.pub) .balance (nano::Gxrb_ratio * 5) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open_big = *builder.open () .source (fund_big.hash ()) @@ -1836,11 +1836,11 @@ TEST (node, rep_self_vote) nano::keypair rep_big; nano::block_builder builder; auto fund_big = *builder.send () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (rep_big.pub) .balance (nano::uint128_t{ "0xb0000000000000000000000000000000" }) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open_big = *builder.open () .source (fund_big.hash ()) @@ -1924,11 +1924,11 @@ TEST (node, bootstrap_bulk_push) nano::keypair key0; // node0 knows about send0 but node1 doesn't. auto send0 = nano::send_block_builder () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (500) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*node0->work_generate_blocking (nano::genesis_hash)) + .work (*node0->work_generate_blocking (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node0->process (*send0).code); @@ -1962,11 +1962,11 @@ TEST (node, bootstrap_fork_open) nano::keypair key0; nano::block_builder builder; auto send0 = *builder.send () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (nano::genesis_amount - 500) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open0 = *builder.open () .source (send0.hash ()) @@ -2018,11 +2018,11 @@ TEST (node, bootstrap_confirm_frontiers) nano::keypair key0; // node0 knows about send0 but node1 doesn't. auto send0 = nano::send_block_builder () - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (nano::genesis_amount - 500) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*node0->work_generate_blocking (nano::genesis_hash)) + .work (*node0->work_generate_blocking (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node0->process (*send0).code); @@ -2496,7 +2496,7 @@ TEST (node, online_reps_rep_crawler) nano::node_flags flags; flags.disable_rep_crawler = true; auto & node1 = *system.add_node (flags); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ nano::genesis_hash }); + auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ nano::dev::genesis->hash () }); ASSERT_EQ (0, node1.online_reps.online ()); // Without rep crawler node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); @@ -2504,7 +2504,7 @@ TEST (node, online_reps_rep_crawler) // After inserting to rep crawler { nano::lock_guard guard (node1.rep_crawler.probable_reps_mutex); - node1.rep_crawler.active.insert (nano::genesis_hash); + node1.rep_crawler.active.insert (nano::dev::genesis->hash ()); } node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); ASSERT_EQ (nano::genesis_amount, node1.online_reps.online ()); @@ -2957,12 +2957,12 @@ TEST (node, vote_by_hash_bundle) std::vector> blocks; auto block = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); blocks.push_back (block); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *blocks.back ()).code); @@ -3974,12 +3974,12 @@ TEST (node, rollback_vote_self) auto weight = node.online_reps.delta (); auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - weight) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto open = builder.make_block () .account (key.pub) @@ -4063,12 +4063,12 @@ TEST (node, rollback_gap_source) nano::keypair key; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto fork = builder.make_block () .account (key.pub) @@ -4160,12 +4160,12 @@ TEST (node, dependency_graph) // Send to key1 auto gen_send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key1.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); // Receive from genesis auto key1_open = builder.make_block () @@ -4362,12 +4362,12 @@ TEST (node, dependency_graph_frontier) // Send to key1 auto gen_send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key1.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); // Receive from genesis auto key1_open = builder.make_block () @@ -4525,12 +4525,12 @@ TEST (node, deferred_dependent_elections) nano::keypair key; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto open = builder.make_block () .account (key.pub) @@ -4678,10 +4678,10 @@ TEST (rep_crawler, local) flags.disable_rep_crawler = true; auto & node = *system.add_node (flags); auto loopback = std::make_shared (node); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector{ nano::genesis_hash }); + auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector{ nano::dev::genesis->hash () }); { nano::lock_guard guard (node.rep_crawler.probable_reps_mutex); - node.rep_crawler.active.insert (nano::genesis_hash); + node.rep_crawler.active.insert (nano::dev::genesis->hash ()); node.rep_crawler.responses.emplace_back (loopback, vote); } node.rep_crawler.validate (); diff --git a/nano/core_test/request_aggregator.cpp b/nano/core_test/request_aggregator.cpp index f60dd14c..375003f4 100644 --- a/nano/core_test/request_aggregator.cpp +++ b/nano/core_test/request_aggregator.cpp @@ -375,12 +375,12 @@ TEST (request_aggregator, cannot_vote) nano::state_block_builder builder; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () .from (*send1) diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp index 4b40c740..4f573769 100644 --- a/nano/core_test/vote_processor.cpp +++ b/nano/core_test/vote_processor.cpp @@ -195,11 +195,11 @@ TEST (vote_processor, no_broadcast_local) std::shared_ptr send = builder.state () .account (nano::dev_genesis_key.pub) .representative (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .balance (2 * node.config.vote_minimum.number ()) .link (key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (ec); ASSERT_FALSE (ec); ASSERT_EQ (nano::process_result::progress, node.process_local (send).code); diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp index 32bb33c7..c7e7eb03 100644 --- a/nano/core_test/voting.cpp +++ b/nano/core_test/voting.cpp @@ -112,7 +112,7 @@ TEST (vote_generator, session) nano::vote_generator_session generator_session (node->active.generator); boost::thread thread ([node, &generator_session] () { nano::thread_role::set (nano::thread_role::name::request_loop); - generator_session.add (nano::genesis_account, nano::genesis_hash); + generator_session.add (nano::genesis_account, nano::dev::genesis->hash ()); ASSERT_EQ (0, node->stats.count (nano::stat::type::vote, nano::stat::detail::vote_indeterminate)); generator_session.flush (); }); @@ -166,33 +166,33 @@ TEST (vote_spacing, vote_generator) nano::state_block_builder builder; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); ASSERT_EQ (0, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts)); - node.active.generator.add (nano::genesis_hash, send1->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send1->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts) == 1); ASSERT_FALSE (node.ledger.rollback (node.store.tx_begin_write (), send1->hash ())); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send2).code); - node.active.generator.add (nano::genesis_hash, send2->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send2->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_spacing) == 1); ASSERT_EQ (1, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts)); std::this_thread::sleep_for (config.network_params.voting.delay); - node.active.generator.add (nano::genesis_hash, send2->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send2->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts) == 2); } @@ -209,31 +209,31 @@ TEST (vote_spacing, rapid) nano::state_block_builder builder; auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); - node.active.generator.add (nano::genesis_hash, send1->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send1->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts) == 1); ASSERT_FALSE (node.ledger.rollback (node.store.tx_begin_write (), send1->hash ())); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send2).code); - node.active.generator.add (nano::genesis_hash, send2->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send2->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_spacing) == 1); ASSERT_TIMELY (3s, 1 == node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts)); std::this_thread::sleep_for (config.network_params.voting.delay); - node.active.generator.add (nano::genesis_hash, send2->hash ()); + node.active.generator.add (nano::dev::genesis->hash (), send2->hash ()); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::vote_generator, nano::stat::detail::generator_broadcasts) == 2); } diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp index 2d01916e..fc295738 100644 --- a/nano/core_test/wallet.cpp +++ b/nano/core_test/wallet.cpp @@ -1164,12 +1164,12 @@ TEST (wallet, search_pending) nano::block_builder builder; auto send = builder.state () .account (nano::genesis_account) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::genesis_account) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) .link (nano::genesis_account) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp index ff6e5b15..862d35fa 100644 --- a/nano/core_test/wallets.cpp +++ b/nano/core_test/wallets.cpp @@ -167,12 +167,12 @@ TEST (wallets, search_pending) nano::block_builder builder; auto send = builder.state () .account (nano::genesis_account) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::genesis_account) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) .link (nano::genesis_account) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index e2f34910..9cabbd06 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -234,12 +234,12 @@ TEST (rpc, account_balance) auto send1 = builder.make_block () .account (nano::dev_genesis_key.pub) - .previous (nano::genesis_hash) + .previous (nano::dev::genesis->hash ()) .representative (nano::dev_genesis_key.pub) .balance (nano::genesis_amount - 1) .link (nano::dev_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*system.work.generate (nano::genesis_hash)) + .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); @@ -531,7 +531,7 @@ TEST (rpc, send_epoch_2) request.put ("amount", "1"); // Test that the correct error is given if there is insufficient work - auto insufficient = system.work_generate_limited (nano::genesis_hash, min_difficulty, target_difficulty); + auto insufficient = system.work_generate_limited (nano::dev::genesis->hash (), min_difficulty, target_difficulty); request.put ("work", nano::to_string_hex (insufficient)); { auto response (wait_response (system, rpc, request)); @@ -2552,7 +2552,7 @@ TEST (rpc, account_representative_set_epoch_2) request.put ("representative", nano::keypair ().pub.to_account ()); // Test that the correct error is given if there is insufficient work - auto insufficient = system.work_generate_limited (nano::genesis_hash, min_difficulty, target_difficulty); + auto insufficient = system.work_generate_limited (nano::dev::genesis->hash (), min_difficulty, target_difficulty); request.put ("work", nano::to_string_hex (insufficient)); { auto response (wait_response (system, rpc, request)); @@ -3729,7 +3729,7 @@ TEST (rpc, account_info) ASSERT_EQ (confirmed_representative, nano::dev_genesis_key.pub.to_account ()); auto confirmed_frontier (response.get ("confirmed_frontier")); - ASSERT_EQ (nano::genesis_hash.to_string (), confirmed_frontier); + ASSERT_EQ (nano::dev::genesis->hash ().to_string (), confirmed_frontier); auto confirmed_height (response.get ("confirmed_height")); ASSERT_EQ (1, confirmed_height); @@ -4941,7 +4941,7 @@ TEST (rpc, block_confirm_confirmed) // Check confirmation history auto confirmed (node->active.list_recently_cemented ()); ASSERT_EQ (1, confirmed.size ()); - ASSERT_EQ (nano::genesis_hash, confirmed.begin ()->winner->hash ()); + ASSERT_EQ (nano::dev::genesis->hash (), confirmed.begin ()->winner->hash ()); // Check callback ASSERT_TIMELY (10s, node->stats.count (nano::stat::type::error, nano::stat::detail::http_callback, nano::stat::dir::out) != 0); // Callback result is error because callback target port isn't listening @@ -5213,7 +5213,7 @@ TEST (rpc, wallet_history) ASSERT_EQ ("receive", std::get<0> (history_l[3])); ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[3])); ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[3])); - ASSERT_EQ (nano::genesis_hash.to_string (), std::get<3> (history_l[3])); + ASSERT_EQ (nano::dev::genesis->hash ().to_string (), std::get<3> (history_l[3])); ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<4> (history_l[3])); } @@ -5623,7 +5623,7 @@ TEST (rpc, deprecated_account_format) request.put ("account", account_text); auto response2 (wait_response (system, rpc, request)); std::string frontier (response2.get ("frontier")); - ASSERT_EQ (nano::genesis_hash.to_string (), frontier); + ASSERT_EQ (nano::dev::genesis->hash ().to_string (), frontier); boost::optional deprecated_account_format2 (response2.get_optional ("deprecated_account_format")); ASSERT_TRUE (deprecated_account_format2.is_initialized ()); } @@ -5634,7 +5634,7 @@ TEST (rpc, epoch_upgrade) auto node = add_ipc_enabled_node (system); nano::keypair key1, key2, key3; nano::keypair epoch_signer (nano::dev_genesis_key); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); // to opened account + auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); auto send2 (std::make_shared (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); @@ -5728,7 +5728,7 @@ TEST (rpc, epoch_upgrade_multithreaded) auto node = add_ipc_enabled_node (system, node_config); nano::keypair key1, key2, key3; nano::keypair epoch_signer (nano::dev_genesis_key); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); // to opened account + auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); auto send2 (std::make_shared (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); @@ -5821,7 +5821,7 @@ TEST (rpc, account_lazy_start) auto node1 = system.add_node (node_flags); nano::keypair key; // Generating test chain - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash))); + auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto open (std::make_shared (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); @@ -5857,7 +5857,7 @@ TEST (rpc, receive) wallet->insert_adhoc (nano::dev_genesis_key.prv); nano::keypair key1; wallet->insert_adhoc (key1.prv); - auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number (), *node->work_generate_blocking (nano::genesis_hash))); + auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number (), *node->work_generate_blocking (nano::dev::genesis->hash ()))); ASSERT_TIMELY (5s, node->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); ASSERT_TIMELY (10s, !node->store.account.exists (node->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount @@ -5898,7 +5898,7 @@ TEST (rpc, receive_unopened) wallet->insert_adhoc (nano::dev_genesis_key.prv); // Test receiving for unopened account nano::keypair key1; - auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (nano::genesis_hash))); + auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (nano::dev::genesis->hash ()))); ASSERT_TIMELY (5s, !node->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); @@ -5993,7 +5993,7 @@ TEST (rpc, receive_pruned) wallet1->insert_adhoc (nano::dev_genesis_key.prv); nano::keypair key1; wallet2->insert_adhoc (key1.prv); - auto send1 (wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (nano::genesis_hash))); + auto send1 (wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (nano::dev::genesis->hash ()))); ASSERT_TIMELY (5s, node2->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); ASSERT_TIMELY (10s, !node2->store.account.exists (node2->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp index c9faaec3..4ebd64f4 100644 --- a/nano/secure/common.cpp +++ b/nano/secure/common.cpp @@ -79,6 +79,9 @@ char const * live_canary_public_key_data = "7CBAF192A3763DAEC9F9BAC1B2CDF665D836 std::string const test_canary_public_key_data = nano::get_env_or_default ("NANO_TEST_CANARY_PUB", "3BAD2C554ACE05F5E528FBBCE79D51E552C55FA765CCFD89B289C4835DE5F04A"); // nano_1gxf7jcnomi7yqkkjyxwwygo5sckrohtgsgezp6u74g6ifgydw4cajwbk8bf } +nano::ledger_constants nano::dev::constants{ nano::networks::nano_dev_network }; +std::shared_ptr & nano::dev::genesis = nano::dev::constants.genesis; + nano::network_params::network_params () : network_params (network_constants::active_network) { diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp index 383f7ae9..3648b898 100644 --- a/nano/secure/common.hpp +++ b/nano/secure/common.hpp @@ -396,6 +396,12 @@ public: nano::epochs epochs; }; +namespace dev +{ + extern nano::ledger_constants constants; + extern std::shared_ptr & genesis; +} + /** Constants which depend on random values (this class should never be used globally due to CryptoPP globals potentially not being initialized) */ class random_constants { diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index 94f97e8f..4780ab28 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -483,7 +483,7 @@ TEST (node, mass_vote_by_hash) { nano::system system (1); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash previous (nano::genesis_hash); + nano::block_hash previous (nano::dev::genesis->hash ()); nano::keypair key; std::vector> blocks; for (auto i (0); i < 10000; ++i) @@ -979,7 +979,7 @@ TEST (confirmation_height, many_accounts_send_receive_self_no_elections) auto const num_accounts = 100000; - auto latest_genesis = nano::genesis_hash; + auto latest_genesis = nano::dev::genesis->hash (); std::vector keys; std::vector> open_blocks; @@ -1828,7 +1828,7 @@ TEST (node, wallet_create_block_confirm_conflicts) auto const num_blocks = 10000; // First open the other account - auto latest = nano::genesis_hash; + auto latest = nano::dev::genesis->hash (); nano::keypair key1; { auto transaction = node->store.tx_begin_write (); diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp index 6a986d4b..a5888292 100644 --- a/nano/test_common/system.cpp +++ b/nano/test_common/system.cpp @@ -151,7 +151,7 @@ nano::system::~system () void nano::system::ledger_initialization_set (std::vector const & reps, nano::amount const & reserve) { - nano::block_hash previous = nano::genesis_hash; + nano::block_hash previous = nano::dev::genesis->hash (); auto amount = (nano::genesis_amount - reserve.number ()) / reps.size (); auto balance = nano::genesis_amount; for (auto const & i : reps) diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index 3e972817..1f593991 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -19,7 +19,6 @@ nano::keypair const & nano::zero_key (dev_constants.zero_key); nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); nano::account const & nano::genesis_account (dev_constants.genesis_account ()); -nano::block_hash const & nano::genesis_hash (dev_constants.genesis_hash ()); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); nano::account const & nano::burn_account (dev_constants.burn_account); diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index 74cf8bc9..bf890b28 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -55,7 +55,6 @@ class system; extern nano::keypair const & zero_key; extern nano::keypair const & dev_genesis_key; -extern nano::block_hash const & genesis_hash; extern nano::public_key const & nano_dev_account; extern nano::public_key const & genesis_account; extern nano::public_key const & burn_account; From 32c94550fade5b6d5375df73dc7a85f6dc2070f3 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 20 Jul 2021 18:50:47 +0100 Subject: [PATCH 2/7] Removing nano::genesis_account variable and replacing usages with nano::dev::genesis->account () --- nano/core_test/active_transactions.cpp | 10 +- nano/core_test/block_store.cpp | 50 +-- nano/core_test/bootstrap.cpp | 10 +- nano/core_test/confirmation_height.cpp | 46 +-- nano/core_test/election.cpp | 2 +- nano/core_test/frontiers_confirmation.cpp | 24 +- nano/core_test/gap_cache.cpp | 10 +- nano/core_test/ledger.cpp | 472 +++++++++++----------- nano/core_test/node.cpp | 12 +- nano/core_test/system.cpp | 14 +- nano/core_test/vote_processor.cpp | 4 +- nano/core_test/voting.cpp | 2 +- nano/core_test/wallet.cpp | 66 +-- nano/core_test/wallets.cpp | 12 +- nano/load_test/entry.cpp | 2 +- nano/qt_test/qt.cpp | 6 +- nano/rpc_test/rpc.cpp | 80 ++-- nano/slow_test/node.cpp | 6 +- nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 20 files changed, 414 insertions(+), 416 deletions(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index 3154b0d8..d7cdd33a 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -584,7 +584,7 @@ TEST (active_transactions, dropped_cleanup) nano::genesis genesis; auto block = genesis.open; - block->sideband_set (nano::block_sideband (nano::genesis_account, 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + block->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); // Add to network filter to ensure proper cleanup after the election is dropped std::vector block_bytes; @@ -1232,7 +1232,7 @@ TEST (active_transactions, pessimistic_elections) ASSERT_EQ (2, node.active.expired_optimistic_election_infos.size ()); ASSERT_EQ (2, node.active.expired_optimistic_election_infos.size ()); auto election_started_it = node.active.expired_optimistic_election_infos.get ().begin (); - ASSERT_EQ (election_started_it->account, nano::genesis_account); + ASSERT_EQ (election_started_it->account, nano::dev::genesis->account ()); ASSERT_EQ (election_started_it->election_started, true); ASSERT_EQ ((++election_started_it)->election_started, false); @@ -1253,7 +1253,7 @@ TEST (active_transactions, pessimistic_elections) nano::confirmation_height_info key1_confirmation_height_info; { auto transaction = node.store.tx_begin_read (); - node.store.confirmation_height.get (transaction, nano::genesis_account, genesis_confirmation_height_info); + node.store.confirmation_height.get (transaction, nano::dev::genesis->account (), genesis_confirmation_height_info); ASSERT_EQ (2, genesis_confirmation_height_info.height); node.store.confirmation_height.get (transaction, key.pub, key1_confirmation_height_info); ASSERT_EQ (0, key1_confirmation_height_info.height); @@ -1275,7 +1275,7 @@ TEST (active_transactions, pessimistic_elections) { auto transaction = node.store.tx_begin_read (); - node.store.confirmation_height.get (transaction, nano::genesis_account, genesis_confirmation_height_info); + node.store.confirmation_height.get (transaction, nano::dev::genesis->account (), genesis_confirmation_height_info); ASSERT_EQ (3, genesis_confirmation_height_info.height); node.store.confirmation_height.get (transaction, key.pub, key1_confirmation_height_info); ASSERT_EQ (0, key1_confirmation_height_info.height); @@ -1299,7 +1299,7 @@ TEST (active_transactions, pessimistic_elections) { auto transaction = node.store.tx_begin_read (); - node.store.confirmation_height.get (transaction, nano::genesis_account, genesis_confirmation_height_info); + node.store.confirmation_height.get (transaction, nano::dev::genesis->account (), genesis_confirmation_height_info); ASSERT_EQ (3, genesis_confirmation_height_info.height); node.store.confirmation_height.get (transaction, key.pub, key1_confirmation_height_info); ASSERT_EQ (1, key1_confirmation_height_info.height); diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp index 995b8dad..0897a255 100644 --- a/nano/core_test/block_store.cpp +++ b/nano/core_test/block_store.cpp @@ -330,7 +330,7 @@ TEST (block_store, genesis) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger_cache); nano::account_info info; - ASSERT_FALSE (store->account.get (transaction, nano::genesis_account, info)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis->account (), info)); ASSERT_EQ (hash, info.head); auto block1 (store->block.get (transaction, info.head)); ASSERT_NE (nullptr, block1); @@ -340,13 +340,13 @@ TEST (block_store, genesis) ASSERT_EQ (info.block_count, 1); // Genesis block should be confirmed by default nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store->confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.frontier, hash); auto dev_pub_text (nano::dev_genesis_key.pub.to_string ()); auto dev_pub_account (nano::dev_genesis_key.pub.to_account ()); auto dev_prv_text (nano::dev_genesis_key.prv.to_string ()); - ASSERT_EQ (nano::genesis_account, nano::dev_genesis_key.pub); + ASSERT_EQ (nano::dev::genesis->account (), nano::dev_genesis_key.pub); } TEST (bootstrap, simple) @@ -689,10 +689,10 @@ TEST (mdb_block_store, supported_version_upgrades) store.initialize (transaction, ledger.cache); // Lower the database version to the minimum version supported for upgrade. store.version.put (transaction, store.minimum_version); - store.confirmation_height.del (transaction, nano::genesis_account); + store.confirmation_height.del (transaction, nano::dev::genesis->account ()); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "accounts_v1", MDB_CREATE, &store.accounts_v1_handle)); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "open", MDB_CREATE, &store.open_blocks_handle)); - modify_account_info_to_v14 (store, transaction, nano::genesis_account, 1, nano::dev::genesis->hash ()); + modify_account_info_to_v14 (store, transaction, nano::dev::genesis->account (), 1, nano::dev::genesis->hash ()); write_block_w_sideband_v18 (store, store.open_blocks_handle, transaction, *nano::genesis ().open); } @@ -1285,9 +1285,9 @@ TEST (mdb_block_store, upgrade_v14_v15) auto transaction (store.tx_begin_write ()); store.initialize (transaction, ledger.cache); nano::account_info account_info; - ASSERT_FALSE (store.account.get (transaction, nano::genesis_account, account_info)); + ASSERT_FALSE (store.account.get (transaction, nano::dev::genesis->account (), account_info)); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store.confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store.confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.frontier, genesis.hash ()); // These databases get removed after an upgrade, so readd them @@ -1302,10 +1302,10 @@ TEST (mdb_block_store, upgrade_v14_v15) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send).code); // Lower the database to the previous version store.version.put (transaction, 14); - store.confirmation_height.del (transaction, nano::genesis_account); - modify_account_info_to_v14 (store, transaction, nano::genesis_account, confirmation_height_info.height, state_send.hash ()); + store.confirmation_height.del (transaction, nano::dev::genesis->account ()); + modify_account_info_to_v14 (store, transaction, nano::dev::genesis->account (), confirmation_height_info.height, state_send.hash ()); - store.pending.del (transaction, nano::pending_key (nano::genesis_account, state_send.hash ())); + store.pending.del (transaction, nano::pending_key (nano::dev::genesis->account (), state_send.hash ())); write_sideband_v14 (store, transaction, state_send, store.state_blocks_v1_handle); write_sideband_v14 (store, transaction, epoch, store.state_blocks_v1_handle); @@ -1317,18 +1317,18 @@ TEST (mdb_block_store, upgrade_v14_v15) store.block.del (transaction, epoch.hash ()); // Turn pending into v14 - ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_0)), 0)); - ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_1)), 0)); + ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_0)), 0)); + ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_1)), 0)); // This should fail as sizes are no longer correct for account_info nano::mdb_val value; - ASSERT_FALSE (mdb_get (store.env.tx (transaction), store.accounts_v1_handle, nano::mdb_val (nano::genesis_account), value)); + ASSERT_FALSE (mdb_get (store.env.tx (transaction), store.accounts_v1_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); nano::account_info info; ASSERT_NE (value.size (), info.db_size ()); - store.account.del (transaction, nano::genesis_account); + store.account.del (transaction, nano::dev::genesis->account ()); // Confirmation height for the account should be deleted - ASSERT_TRUE (mdb_get (store.env.tx (transaction), store.confirmation_height_handle, nano::mdb_val (nano::genesis_account), value)); + ASSERT_TRUE (mdb_get (store.env.tx (transaction), store.confirmation_height_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); } // Now do the upgrade @@ -1339,18 +1339,18 @@ TEST (mdb_block_store, upgrade_v14_v15) // Size of account_info should now equal that set in db nano::mdb_val value; - ASSERT_FALSE (mdb_get (store.env.tx (transaction), store.accounts_handle, nano::mdb_val (nano::genesis_account), value)); + ASSERT_FALSE (mdb_get (store.env.tx (transaction), store.accounts_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); nano::account_info info (value); ASSERT_EQ (value.size (), info.db_size ()); // Confirmation height should exist nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store.confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store.confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.frontier, genesis.hash ()); // accounts_v1, state_blocks_v1 & pending_v1 tables should be deleted - auto error_get_accounts_v1 (mdb_get (store.env.tx (transaction), store.accounts_v1_handle, nano::mdb_val (nano::genesis_account), value)); + auto error_get_accounts_v1 (mdb_get (store.env.tx (transaction), store.accounts_v1_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); ASSERT_NE (error_get_accounts_v1, MDB_SUCCESS); auto error_get_pending_v1 (mdb_get (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), value)); ASSERT_NE (error_get_pending_v1, MDB_SUCCESS); @@ -1395,15 +1395,15 @@ TEST (mdb_block_store, upgrade_v15_v16) // The representation table should get removed after, so readd it so that we can later confirm this actually happens auto txn = store.env.tx (transaction); ASSERT_FALSE (mdb_dbi_open (txn, "representation", MDB_CREATE, &store.representation_handle)); - auto weight = ledger.cache.rep_weights.representation_get (nano::genesis_account); - ASSERT_EQ (MDB_SUCCESS, mdb_put (txn, store.representation_handle, nano::mdb_val (nano::genesis_account), nano::mdb_val (nano::uint128_union (weight)), 0)); + auto weight = ledger.cache.rep_weights.representation_get (nano::dev::genesis->account ()); + ASSERT_EQ (MDB_SUCCESS, mdb_put (txn, store.representation_handle, nano::mdb_val (nano::dev::genesis->account ()), nano::mdb_val (nano::uint128_union (weight)), 0)); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "open", MDB_CREATE, &store.open_blocks_handle)); write_block_w_sideband_v18 (store, store.open_blocks_handle, transaction, *genesis.open); // Lower the database to the previous version store.version.put (transaction, 15); // Confirm the rep weight exists in the database - ASSERT_EQ (MDB_SUCCESS, mdb_get (store.env.tx (transaction), store.representation_handle, nano::mdb_val (nano::genesis_account), value)); - store.confirmation_height.del (transaction, nano::genesis_account); + ASSERT_EQ (MDB_SUCCESS, mdb_get (store.env.tx (transaction), store.representation_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); + store.confirmation_height.del (transaction, nano::dev::genesis->account ()); } // Now do the upgrade @@ -1413,7 +1413,7 @@ TEST (mdb_block_store, upgrade_v15_v16) auto transaction (store.tx_begin_read ()); // The representation table should now be deleted - auto error_get_representation (mdb_get (store.env.tx (transaction), store.representation_handle, nano::mdb_val (nano::genesis_account), value)); + auto error_get_representation (mdb_get (store.env.tx (transaction), store.representation_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); ASSERT_NE (MDB_SUCCESS, error_get_representation); ASSERT_EQ (store.representation_handle, 0); @@ -1448,7 +1448,7 @@ TEST (mdb_block_store, upgrade_v16_v17) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); - modify_confirmation_height_to_v15 (store, transaction, nano::genesis_account, confirmation_height); + modify_confirmation_height_to_v15 (store, transaction, nano::dev::genesis->account (), confirmation_height); ASSERT_FALSE (mdb_dbi_open (store.env.tx (transaction), "open", MDB_CREATE, &store.open_blocks_handle)); write_block_w_sideband_v18 (store, store.open_blocks_handle, transaction, *genesis.open); @@ -1468,7 +1468,7 @@ TEST (mdb_block_store, upgrade_v16_v17) auto transaction (store.tx_begin_read ()); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store.confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store.confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, confirmation_height); // Check confirmation height frontier is correct diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp index a3a14b45..ef13cba3 100644 --- a/nano/core_test/bootstrap.cpp +++ b/nano/core_test/bootstrap.cpp @@ -1867,9 +1867,9 @@ TEST (bulk_pull_account, basics) nano::keypair key1; system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); system.wallet (0)->insert_adhoc (key1.prv); - auto send1 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 25)); - auto send2 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 10)); - auto send3 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 2)); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis->account (), key1.pub, 25)); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis->account (), key1.pub, 10)); + auto send3 (system.wallet (0)->send_action (nano::dev::genesis->account (), key1.pub, 2)); ASSERT_TIMELY (5s, system.nodes[0]->balance (key1.pub) == 25); auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); @@ -1888,7 +1888,7 @@ TEST (bulk_pull_account, basics) auto block_data (request->get_next ()); ASSERT_EQ (send2->hash (), block_data.first.get ()->hash); ASSERT_EQ (nano::uint128_union (10), block_data.second.get ()->amount); - ASSERT_EQ (nano::genesis_account, block_data.second.get ()->source); + ASSERT_EQ (nano::dev::genesis->account (), block_data.second.get ()->source); ASSERT_EQ (nullptr, request->get_next ().first.get ()); } @@ -1902,7 +1902,7 @@ TEST (bulk_pull_account, basics) auto block_data (request->get_next ()); ASSERT_NE (nullptr, block_data.first.get ()); ASSERT_NE (nullptr, block_data.second.get ()); - ASSERT_EQ (nano::genesis_account, block_data.second.get ()->source); + ASSERT_EQ (nano::dev::genesis->account (), block_data.second.get ()->source); block_data = request->get_next (); ASSERT_EQ (nullptr, block_data.first.get ()); ASSERT_EQ (nullptr, block_data.second.get ()); diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp index f42df2da..6dba764a 100644 --- a/nano/core_test/confirmation_height.cpp +++ b/nano/core_test/confirmation_height.cpp @@ -98,9 +98,9 @@ TEST (confirmation_height, multiple_accounts) nano::send_block send3 (send2.hash (), key3.pub, node->online_reps.delta () + 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ())); // Open all accounts - nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); - nano::open_block open2 (send2.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); - nano::open_block open3 (send3.hash (), nano::genesis_account, key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open2 (send2.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); + nano::open_block open3 (send3.hash (), nano::dev::genesis->account (), key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); // Send and receive various blocks to these accounts nano::send_block send4 (open1.hash (), key2.pub, 50, key1.prv, key1.pub, *system.work.generate (open1.hash ())); @@ -225,11 +225,11 @@ TEST (confirmation_height, gap_bootstrap) auto & node1 = *system.add_node (node_flags); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -311,11 +311,11 @@ TEST (confirmation_height, gap_live) system.wallet (1)->insert_adhoc (destination.prv); nano::genesis genesis; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - 1, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node->work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node->work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node->work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); @@ -396,10 +396,10 @@ TEST (confirmation_height, send_receive_between_2_accounts) nano::send_block send1 (latest, key1.pub, node->online_reps.delta () + 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); - nano::send_block send2 (open1.hash (), nano::genesis_account, 1000, key1.prv, key1.pub, *system.work.generate (open1.hash ())); - nano::send_block send3 (send2.hash (), nano::genesis_account, 900, key1.prv, key1.pub, *system.work.generate (send2.hash ())); - nano::send_block send4 (send3.hash (), nano::genesis_account, 500, key1.prv, key1.pub, *system.work.generate (send3.hash ())); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::send_block send2 (open1.hash (), nano::dev::genesis->account (), 1000, key1.prv, key1.pub, *system.work.generate (open1.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), 900, key1.prv, key1.pub, *system.work.generate (send2.hash ())); + nano::send_block send4 (send3.hash (), nano::dev::genesis->account (), 500, key1.prv, key1.pub, *system.work.generate (send3.hash ())); nano::receive_block receive1 (send1.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); nano::receive_block receive2 (receive1.hash (), send3.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1.hash ())); @@ -569,7 +569,7 @@ TEST (confirmation_height, all_block_types) nano::state_block state_send3 (key2.pub, state_send2->hash (), 0, nano::Gxrb_ratio - 1, key1.pub, key2.prv, key2.pub, *system.work.generate (state_send2->hash ())); nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::dev_genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ())); - nano::state_block state_receive3 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::state_block state_receive3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); { auto transaction (store.tx_begin_write ()); @@ -683,12 +683,12 @@ TEST (confirmation_height, conflict_rollback_cemented) { auto transaction (node1->store.tx_begin_write ()); ASSERT_TRUE (node1->store.block.exists (transaction, publish1.block->hash ())); - node1->store.confirmation_height.put (transaction, nano::genesis_account, nano::confirmation_height_info{ 2, send2->hash () }); + node1->store.confirmation_height.put (transaction, nano::dev::genesis->account (), nano::confirmation_height_info{ 2, send2->hash () }); } { auto transaction (node2->store.tx_begin_write ()); ASSERT_TRUE (node2->store.block.exists (transaction, publish2.block->hash ())); - node2->store.confirmation_height.put (transaction, nano::genesis_account, nano::confirmation_height_info{ 2, send2->hash () }); + node2->store.confirmation_height.put (transaction, nano::dev::genesis->account (), nano::confirmation_height_info{ 2, send2->hash () }); } auto rollback_log_entry = boost::str (boost::format ("Failed to roll back %1%") % send2->hash ().to_string ()); @@ -832,7 +832,7 @@ TEST (confirmation_heightDeathTest, modified_chain) } ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), *send).code); - store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::dev::genesis->hash () }); + store->confirmation_height.put (store->tx_begin_write (), nano::dev::genesis->account (), { 1, nano::dev::genesis->hash () }); nano::confirmation_height_unbounded unbounded_processor ( ledger, write_database_queue, 10ms, logging, logger, stopped, batch_write_size, [] (auto const &) {}, [] (auto const &) {}, [] () { return 0; }); @@ -906,7 +906,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed) // Reset conditions and test with the bounded processor ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), *open).code); - store->confirmation_height.put (store->tx_begin_write (), nano::genesis_account, { 1, nano::dev::genesis->hash () }); + store->confirmation_height.put (store->tx_begin_write (), nano::dev::genesis->account (), { 1, nano::dev::genesis->hash () }); nano::confirmation_height_bounded bounded_processor ( ledger, write_database_queue, 10ms, logging, logger, stopped, batch_write_size, [] (auto const &) {}, [] (auto const &) {}, [] () { return 0; }); @@ -1120,7 +1120,7 @@ TEST (confirmation_height, cemented_gap_below_receive) nano::keypair dummy_key; nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); @@ -1132,7 +1132,7 @@ TEST (confirmation_height, cemented_gap_below_receive) nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); - auto open1 = std::make_shared (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); + auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); { auto transaction = node->store.tx_begin_write (); @@ -1205,7 +1205,7 @@ TEST (confirmation_height, cemented_gap_below_no_cache) nano::keypair dummy_key; nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); @@ -1217,7 +1217,7 @@ TEST (confirmation_height, cemented_gap_below_no_cache) nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); - auto open1 = std::make_shared (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); + auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); { auto transaction = node->store.tx_begin_write (); @@ -1241,7 +1241,7 @@ TEST (confirmation_height, cemented_gap_below_no_cache) // Force some blocks to be cemented so that the cached confirmed info variable is empty { auto transaction (node->store.tx_begin_write ()); - node->store.confirmation_height.put (transaction, nano::genesis_account, nano::confirmation_height_info{ 3, send1.hash () }); + node->store.confirmation_height.put (transaction, nano::dev::genesis->account (), nano::confirmation_height_info{ 3, send1.hash () }); node->store.confirmation_height.put (transaction, key1.pub, nano::confirmation_height_info{ 2, receive1.hash () }); } diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp index 4afcfb0e..3c0d77e3 100644 --- a/nano/core_test/election.cpp +++ b/nano/core_test/election.cpp @@ -11,7 +11,7 @@ TEST (election, construction) nano::system system (1); nano::genesis genesis; auto & node = *system.nodes[0]; - genesis.open->sideband_set (nano::block_sideband (nano::genesis_account, 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); node.scheduler.flush (); auto election = node.active.election (genesis.open->qualified_root ()); diff --git a/nano/core_test/frontiers_confirmation.cpp b/nano/core_test/frontiers_confirmation.cpp index faa6edea..ea4674df 100644 --- a/nano/core_test/frontiers_confirmation.cpp +++ b/nano/core_test/frontiers_confirmation.cpp @@ -31,16 +31,16 @@ TEST (frontiers_confirmation, prioritize_frontiers) nano::send_block send6 (send5.hash (), key4.pub, node->config.online_weight_minimum.number () + 6000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5.hash ())); // Open all accounts and add other sends to get different uncemented counts (as well as some which are the same) - nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::send_block send7 (open1.hash (), nano::dev_genesis_key.pub, 500, key1.prv, key1.pub, *system.work.generate (open1.hash ())); - nano::open_block open2 (send4.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); + nano::open_block open2 (send4.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); - nano::open_block open3 (send5.hash (), nano::genesis_account, key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); + nano::open_block open3 (send5.hash (), nano::dev::genesis->account (), key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); nano::send_block send8 (open3.hash (), nano::dev_genesis_key.pub, 500, key3.prv, key3.pub, *system.work.generate (open3.hash ())); nano::send_block send9 (send8.hash (), nano::dev_genesis_key.pub, 200, key3.prv, key3.pub, *system.work.generate (send8.hash ())); - nano::open_block open4 (send6.hash (), nano::genesis_account, key4.pub, key4.prv, key4.pub, *system.work.generate (key4.pub)); + nano::open_block open4 (send6.hash (), nano::dev::genesis->account (), key4.pub, key4.prv, key4.pub, *system.work.generate (key4.pub)); nano::send_block send10 (open4.hash (), nano::dev_genesis_key.pub, 500, key4.prv, key4.pub, *system.work.generate (open4.hash ())); nano::send_block send11 (send10.hash (), nano::dev_genesis_key.pub, 200, key4.prv, key4.pub, *system.work.generate (send10.hash ())); @@ -78,8 +78,8 @@ TEST (frontiers_confirmation, prioritize_frontiers) node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); ASSERT_EQ (node->active.priority_cementable_frontiers_size (), num_accounts); // Check the order of accounts is as expected (greatest number of uncemented blocks at the front). key3 and key4 have the same value, the order is unspecified so check both - std::array desired_order_1{ nano::genesis_account, key3.pub, key4.pub, key1.pub, key2.pub }; - std::array desired_order_2{ nano::genesis_account, key4.pub, key3.pub, key1.pub, key2.pub }; + std::array desired_order_1{ nano::dev::genesis->account (), key3.pub, key4.pub, key1.pub, key2.pub }; + std::array desired_order_2{ nano::dev::genesis->account (), key4.pub, key3.pub, key1.pub, key2.pub }; ASSERT_TRUE (priority_orders_match (node->active.priority_cementable_frontiers, desired_order_1) || priority_orders_match (node->active.priority_cementable_frontiers, desired_order_2)); } @@ -91,7 +91,7 @@ TEST (frontiers_confirmation, prioritize_frontiers) node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); ASSERT_EQ (node->active.priority_cementable_frontiers_size (), num_accounts - 3); ASSERT_EQ (node->active.priority_wallet_cementable_frontiers_size (), num_accounts - 2); - std::array local_desired_order{ nano::genesis_account, key1.pub, key2.pub }; + std::array local_desired_order{ nano::dev::genesis->account (), key1.pub, key2.pub }; ASSERT_TRUE (priority_orders_match (node->active.priority_wallet_cementable_frontiers, local_desired_order)); std::array desired_order_1{ key3.pub, key4.pub }; std::array desired_order_2{ key4.pub, key3.pub }; @@ -105,8 +105,8 @@ TEST (frontiers_confirmation, prioritize_frontiers) node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); ASSERT_EQ (node->active.priority_cementable_frontiers_size (), 0); ASSERT_EQ (node->active.priority_wallet_cementable_frontiers_size (), num_accounts); - std::array desired_order_1{ nano::genesis_account, key3.pub, key4.pub, key1.pub, key2.pub }; - std::array desired_order_2{ nano::genesis_account, key4.pub, key3.pub, key1.pub, key2.pub }; + std::array desired_order_1{ nano::dev::genesis->account (), key3.pub, key4.pub, key1.pub, key2.pub }; + std::array desired_order_2{ nano::dev::genesis->account (), key4.pub, key3.pub, key1.pub, key2.pub }; ASSERT_TRUE (priority_orders_match (node->active.priority_wallet_cementable_frontiers, desired_order_1) || priority_orders_match (node->active.priority_wallet_cementable_frontiers, desired_order_2)); } @@ -128,7 +128,7 @@ TEST (frontiers_confirmation, prioritize_frontiers) } transaction.refresh (); node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); - ASSERT_TRUE (priority_orders_match (node->active.priority_wallet_cementable_frontiers, std::array{ key3.pub, nano::genesis_account, key4.pub, key1.pub, key2.pub })); + ASSERT_TRUE (priority_orders_match (node->active.priority_wallet_cementable_frontiers, std::array{ key3.pub, nano::dev::genesis->account (), key4.pub, key1.pub, key2.pub })); uint64_t election_count = 0; node->active.confirm_prioritized_frontiers (transaction, 100, election_count); @@ -159,11 +159,11 @@ TEST (frontiers_confirmation, prioritize_frontiers_max_optimistic_elections) for (auto i = 0; i < max_optimistic_election_count * 2; ++i) { auto transaction = node->store.tx_begin_write (); - auto latest = node->latest (nano::genesis_account); + auto latest = node->latest (nano::dev::genesis->account ()); nano::keypair key; nano::send_block send (latest, key.pub, node->config.online_weight_minimum.number () + 10000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); - nano::open_block open (send.hash (), nano::genesis_account, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis->account (), key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, open).code); } diff --git a/nano/core_test/gap_cache.cpp b/nano/core_test/gap_cache.cpp index e4679c8a..c12624c1 100644 --- a/nano/core_test/gap_cache.cpp +++ b/nano/core_test/gap_cache.cpp @@ -69,8 +69,8 @@ TEST (gap_cache, gap_bootstrap) nano::keypair key; auto send (std::make_shared (latest, key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest))); node1.process (*send); - ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); // Confirm send block, allowing voting on the upcoming block node1.block_confirm (send); auto election = node1.active.election (send->qualified_root ()); @@ -81,9 +81,9 @@ TEST (gap_cache, gap_bootstrap) system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); auto latest_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100)); ASSERT_NE (nullptr, latest_block); - ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account)); - ASSERT_TIMELY (10s, node2.balance (nano::genesis_account) == nano::genesis_amount - 200); + ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); + ASSERT_TIMELY (10s, node2.balance (nano::dev::genesis->account ()) == nano::genesis_amount - 200); } TEST (gap_cache, two_dependencies) diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp index bec09a76..01f322b0 100644 --- a/nano/core_test/ledger.cpp +++ b/nano/core_test/ledger.cpp @@ -49,19 +49,19 @@ TEST (ledger, genesis_balance) nano::genesis genesis; auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - auto balance (ledger.account_balance (transaction, nano::genesis_account)); + auto balance (ledger.account_balance (transaction, nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, balance); - auto amount (ledger.amount (transaction, nano::genesis_account)); + auto amount (ledger.amount (transaction, nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, amount); nano::account_info info; - ASSERT_FALSE (store->account.get (transaction, nano::genesis_account, info)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis->account (), info)); ASSERT_EQ (1, ledger.cache.account_count); // Frontier time should have been updated when genesis balance was added ASSERT_GE (nano::seconds_since_epoch (), info.modified); ASSERT_LT (nano::seconds_since_epoch () - info.modified, 10); // Genesis block should be confirmed by default nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store->confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.frontier, genesis.hash ()); } @@ -76,7 +76,7 @@ TEST (ledger, process_modifies_sideband) nano::genesis genesis; store->initialize (store->tx_begin_write (), ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), send1).code); ASSERT_EQ (send1.sideband ().timestamp, store->block.get (store->tx_begin_read (), send1.hash ())->sideband ().timestamp); } @@ -406,7 +406,7 @@ TEST (ledger, weight) nano::genesis genesis; auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, representative_change) @@ -1557,15 +1557,15 @@ TEST (ledger, block_destination_source) balance -= nano::Gxrb_ratio; nano::send_block block1 (genesis.hash (), dest.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); balance -= nano::Gxrb_ratio; - nano::send_block block2 (block1.hash (), nano::genesis_account, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), nano::dev::genesis->account (), balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); balance += nano::Gxrb_ratio; nano::receive_block block3 (block2.hash (), block2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block2.hash ())); balance -= nano::Gxrb_ratio; - nano::state_block block4 (nano::genesis_account, block3.hash (), nano::genesis_account, balance, dest.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block3.hash ())); + nano::state_block block4 (nano::dev::genesis->account (), block3.hash (), nano::dev::genesis->account (), balance, dest.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block3.hash ())); balance -= nano::Gxrb_ratio; - nano::state_block block5 (nano::genesis_account, block4.hash (), nano::genesis_account, balance, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block4.hash ())); + nano::state_block block5 (nano::dev::genesis->account (), block4.hash (), nano::dev::genesis->account (), balance, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block4.hash ())); balance += nano::Gxrb_ratio; - nano::state_block block6 (nano::genesis_account, block5.hash (), nano::genesis_account, balance, block5.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block5.hash ())); + nano::state_block block6 (nano::dev::genesis->account (), block5.hash (), nano::dev::genesis->account (), balance, block5.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); @@ -1575,13 +1575,13 @@ TEST (ledger, block_destination_source) ASSERT_EQ (balance, ledger.balance (transaction, block6.hash ())); ASSERT_EQ (dest.pub, ledger.block_destination (transaction, block1)); ASSERT_TRUE (ledger.block_source (transaction, block1).is_zero ()); - ASSERT_EQ (nano::genesis_account, ledger.block_destination (transaction, block2)); + ASSERT_EQ (nano::dev::genesis->account (), ledger.block_destination (transaction, block2)); ASSERT_TRUE (ledger.block_source (transaction, block2).is_zero ()); ASSERT_TRUE (ledger.block_destination (transaction, block3).is_zero ()); ASSERT_EQ (block2.hash (), ledger.block_source (transaction, block3)); ASSERT_EQ (dest.pub, ledger.block_destination (transaction, block4)); ASSERT_TRUE (ledger.block_source (transaction, block4).is_zero ()); - ASSERT_EQ (nano::genesis_account, ledger.block_destination (transaction, block5)); + ASSERT_EQ (nano::dev::genesis->account (), ledger.block_destination (transaction, block5)); ASSERT_TRUE (ledger.block_source (transaction, block5).is_zero ()); ASSERT_TRUE (ledger.block_destination (transaction, block6).is_zero ()); ASSERT_EQ (block5.hash (), ledger.block_source (transaction, block6)); @@ -1598,9 +1598,9 @@ TEST (ledger, state_account) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - ASSERT_EQ (nano::genesis_account, ledger.account (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis->account (), ledger.account (transaction, send1.hash ())); } TEST (ledger, state_send_receive) @@ -1614,7 +1614,7 @@ TEST (ledger, state_send_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1622,13 +1622,13 @@ TEST (ledger, state_send_receive) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, send2->sideband ().height); ASSERT_TRUE (send2->sideband ().details.is_send); ASSERT_FALSE (send2->sideband ().details.is_receive); ASSERT_FALSE (send2->sideband ().details.is_epoch); - nano::state_block receive1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -1636,8 +1636,8 @@ TEST (ledger, state_send_receive) ASSERT_EQ (receive1, *receive2); ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); ASSERT_EQ (3, receive2->sideband ().height); ASSERT_FALSE (receive2->sideband ().details.is_send); @@ -1656,7 +1656,7 @@ TEST (ledger, state_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1664,8 +1664,8 @@ TEST (ledger, state_receive) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); - nano::state_block receive1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -1673,7 +1673,7 @@ TEST (ledger, state_receive) ASSERT_EQ (receive1, *receive2); ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (3, receive2->sideband ().height); ASSERT_FALSE (receive2->sideband ().details.is_send); ASSERT_TRUE (receive2->sideband ().details.is_receive); @@ -1692,7 +1692,7 @@ TEST (ledger, state_rep_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::genesis_account, genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_TRUE (store->block.exists (transaction, change1.hash ())); auto change2 (store->block.get (transaction, change1.hash ())); @@ -1700,7 +1700,7 @@ TEST (ledger, state_rep_change) ASSERT_EQ (change1, *change2); ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, change1.hash ())); ASSERT_EQ (0, ledger.amount (transaction, change1.hash ())); - ASSERT_EQ (0, ledger.weight (nano::genesis_account)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, ledger.weight (rep.pub)); ASSERT_EQ (2, change2->sideband ().height); ASSERT_FALSE (change2->sideband ().details.is_send); @@ -1720,7 +1720,7 @@ TEST (ledger, state_open) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1728,9 +1728,9 @@ TEST (ledger, state_open) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (destination.pub, send1.hash ()))); - nano::state_block open1 (destination.pub, 0, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (destination.pub, send1.hash ()))); ASSERT_TRUE (store->block.exists (transaction, open1.hash ())); @@ -1739,7 +1739,7 @@ TEST (ledger, state_open) ASSERT_EQ (open1, *open2); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, open1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, open1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (ledger.cache.account_count, store->account.count (transaction)); ASSERT_EQ (1, open2->sideband ().height); ASSERT_FALSE (open2->sideband ().details.is_send); @@ -1759,9 +1759,9 @@ TEST (ledger, send_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::send_block send2 (send1.hash (), nano::genesis_account, nano::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, send2).code); } @@ -1777,7 +1777,7 @@ TEST (ledger, receive_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, receive1).code); @@ -1795,7 +1795,7 @@ TEST (ledger, change_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; nano::change_block change1 (send1.hash (), rep.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); @@ -1813,7 +1813,7 @@ TEST (ledger, state_unreceivable_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1821,8 +1821,8 @@ TEST (ledger, state_unreceivable_fail) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); - nano::state_block receive1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, receive1).code); } @@ -1837,7 +1837,7 @@ TEST (ledger, state_receive_bad_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1845,8 +1845,8 @@ TEST (ledger, state_receive_bad_amount_fail) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); - nano::state_block receive1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, receive1).code); } @@ -1861,10 +1861,10 @@ TEST (ledger, state_no_link_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block change1 (nano::genesis_account, send1.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, change1).code); } @@ -1879,7 +1879,7 @@ TEST (ledger, state_receive_wrong_account_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1887,9 +1887,9 @@ TEST (ledger, state_receive_wrong_account_fail) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::keypair key; - nano::state_block receive1 (key.pub, 0, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); + nano::state_block receive1 (key.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, receive1).code); } @@ -1905,11 +1905,11 @@ TEST (ledger, state_open_state_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block open1 (destination.pub, 0, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); - nano::open_block open2 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open2 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, open2).code); ASSERT_EQ (open1.root (), open2.root ()); } @@ -1926,11 +1926,11 @@ TEST (ledger, state_state_open_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::open_block open1 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); - nano::state_block open2 (destination.pub, 0, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::state_block open2 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, open2).code); ASSERT_EQ (open1.root (), open2.root ()); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); @@ -1948,9 +1948,9 @@ TEST (ledger, state_open_previous_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block open1 (destination.pub, 1, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (1)); + nano::state_block open1 (destination.pub, 1, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (1)); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, open1).code); } @@ -1966,9 +1966,9 @@ TEST (ledger, state_open_source_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block open1 (destination.pub, 0, nano::genesis_account, 0, 0, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), 0, 0, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, open1).code); } @@ -1984,7 +1984,7 @@ TEST (ledger, state_send_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::genesis_account, genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1992,7 +1992,7 @@ TEST (ledger, state_send_change) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (0, ledger.weight (nano::genesis_account)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (rep.pub)); ASSERT_EQ (2, send2->sideband ().height); ASSERT_TRUE (send2->sideband ().details.is_send); @@ -2011,7 +2011,7 @@ TEST (ledger, state_receive_change) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -2019,9 +2019,9 @@ TEST (ledger, state_receive_change) ASSERT_EQ (send1, *send2); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::keypair rep; - nano::state_block receive1 (nano::genesis_account, send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -2029,7 +2029,7 @@ TEST (ledger, state_receive_change) ASSERT_EQ (receive1, *receive2); ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (0, ledger.weight (nano::genesis_account)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, ledger.weight (rep.pub)); ASSERT_EQ (3, receive2->sideband ().height); ASSERT_FALSE (receive2->sideband ().details.is_send); @@ -2049,13 +2049,13 @@ TEST (ledger, state_open_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::open_block open1 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, open1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, open1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, state_receive_old) @@ -2070,17 +2070,17 @@ TEST (ledger, state_receive_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); - nano::open_block open1 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); nano::receive_block receive1 (open1.hash (), send2.hash (), destination.prv, destination.pub, *pool.generate (open1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_EQ (2 * nano::Gxrb_ratio, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, state_rollback_send) @@ -2094,23 +2094,23 @@ TEST (ledger, state_rollback_send) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::pending_info info; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info)); - ASSERT_EQ (nano::genesis_account, info.source); + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info)); + ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_TRUE (store->block.successor (transaction, genesis.hash ()).is_zero ()); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2126,19 +2126,19 @@ TEST (ledger, state_rollback_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block receive1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, receive1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), receive1.hash ()))); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); nano::pending_info info; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info)); - ASSERT_EQ (nano::genesis_account, info.source); + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info)); + ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2154,17 +2154,17 @@ TEST (ledger, state_rollback_received_send) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block receive1 (key.pub, 0, key.pub, nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, receive1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), receive1.hash ()))); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.account_balance (transaction, key.pub)); ASSERT_EQ (0, ledger.weight (key.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); @@ -2182,12 +2182,12 @@ TEST (ledger, state_rep_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::genesis_account, genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_FALSE (ledger.rollback (transaction, change1.hash ())); ASSERT_FALSE (store->block.exists (transaction, change1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); } @@ -2203,17 +2203,17 @@ TEST (ledger, state_open_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block open1 (destination.pub, 0, nano::genesis_account, nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_FALSE (ledger.rollback (transaction, open1.hash ())); ASSERT_FALSE (store->block.exists (transaction, open1.hash ())); ASSERT_EQ (0, ledger.account_balance (transaction, destination.pub)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::pending_info info; ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (destination.pub, send1.hash ()), info)); - ASSERT_EQ (nano::genesis_account, info.source); + ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2230,12 +2230,12 @@ TEST (ledger, state_send_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::genesis_account, genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2251,15 +2251,15 @@ TEST (ledger, state_receive_change_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block receive1 (nano::genesis_account, send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::genesis_account)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2276,41 +2276,41 @@ TEST (ledger, epoch_blocks_v1_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_FALSE (epoch1.sideband ().details.is_send); ASSERT_FALSE (epoch1.sideband ().details.is_receive); ASSERT_TRUE (epoch1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch2).code); nano::account_info genesis_info; - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_1); ASSERT_FALSE (ledger.rollback (transaction, epoch1.hash ())); - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_0); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_1); ASSERT_FALSE (epoch1.sideband ().details.is_send); ASSERT_FALSE (epoch1.sideband ().details.is_receive); ASSERT_TRUE (epoch1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::change_block change1 (epoch1.hash (), nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (send1.sideband ().details.is_send); ASSERT_FALSE (send1.sideband ().details.is_receive); ASSERT_FALSE (send1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, send1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send1.sideband ().source_epoch); // Not used for send blocks - nano::open_block open1 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open1).code); - nano::state_block epoch3 (destination.pub, 0, nano::genesis_account, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); + nano::state_block epoch3 (destination.pub, 0, nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::representative_mismatch, ledger.process (transaction, epoch3).code); nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); @@ -2328,7 +2328,7 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_EQ (0, ledger.balance (transaction, epoch4.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, receive2.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive2.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.weight (destination.pub)); ASSERT_FALSE (receive2.sideband ().details.is_send); ASSERT_TRUE (receive2.sideband ().details.is_receive); @@ -2347,42 +2347,42 @@ TEST (ledger, epoch_blocks_v2_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); // Trying to upgrade from epoch 0 to epoch 2. It is a requirement epoch upgrades are sequential unless the account is unopened ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch1).code); // Set it to the first epoch and it should now succeed - epoch1 = nano::state_block (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, epoch1.work); + epoch1 = nano::state_block (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, epoch1.work); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); ASSERT_EQ (nano::epoch::epoch_2, epoch2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch2.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch3 (nano::genesis_account, epoch2.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch3).code); nano::account_info genesis_info; - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_2); ASSERT_FALSE (ledger.rollback (transaction, epoch1.hash ())); - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_0); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - ASSERT_FALSE (ledger.store.account.get (transaction, nano::genesis_account, genesis_info)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_1); - nano::change_block change1 (epoch1.hash (), nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (nano::epoch::epoch_1, send1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send1.sideband ().source_epoch); // Not used for send blocks - nano::open_block open1 (send1.hash (), nano::genesis_account, destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open1).code); nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); ASSERT_EQ (nano::epoch::epoch_1, epoch4.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch4.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch5 (destination.pub, epoch4.hash (), nano::genesis_account, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch4.hash ())); + nano::state_block epoch5 (destination.pub, epoch4.hash (), nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch4.hash ())); ASSERT_EQ (nano::process_result::representative_mismatch, ledger.process (transaction, epoch5).code); nano::state_block epoch6 (destination.pub, epoch4.hash (), 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch6).code); @@ -2397,7 +2397,7 @@ TEST (ledger, epoch_blocks_v2_general) ASSERT_EQ (0, ledger.balance (transaction, epoch6.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, receive2.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive2.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.weight (destination.pub)); } @@ -2413,11 +2413,11 @@ TEST (ledger, epoch_blocks_receive_upgrade) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send2 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_EQ (nano::epoch::epoch_1, send2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send2.sideband ().source_epoch); // Not used for send blocks @@ -2454,14 +2454,14 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open2).code); // Upgrade to epoch 2 and send to destination. Try to create an open block from an epoch 2 source block. nano::keypair destination3; - nano::state_block epoch2 (nano::genesis_account, send2.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); - nano::state_block send4 (nano::genesis_account, epoch2.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block send4 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send4).code); nano::open_block open3 (send4.hash (), destination3.pub, destination3.pub, destination3.prv, destination3.pub, *pool.generate (destination3.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open3).code); // Send it to an epoch 1 account - nano::state_block send5 (nano::genesis_account, send4.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send4.hash ())); + nano::state_block send5 (nano::dev::genesis->account (), send4.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send5).code); ASSERT_FALSE (ledger.store.account.get (transaction, destination.pub, destination_info)); ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_1); @@ -2473,7 +2473,7 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_2); // Upgrade an unopened account straight to epoch 2 nano::keypair destination4; - nano::state_block send6 (nano::genesis_account, send5.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send5.hash ())); + nano::state_block send6 (nano::dev::genesis->account (), send5.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send6).code); nano::state_block epoch4 (destination4.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination4.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); @@ -2496,15 +2496,15 @@ TEST (ledger, epoch_blocks_fork) nano::keypair destination; nano::send_block send1 (genesis.hash (), nano::account (0), nano::genesis_amount, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch1).code); - nano::state_block epoch2 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); - nano::state_block epoch3 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch3).code); ASSERT_EQ (nano::epoch::epoch_1, epoch3.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch3.sideband ().source_epoch); // Not used for epoch state blocks - nano::state_block epoch4 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch4 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); } @@ -2562,9 +2562,9 @@ TEST (ledger, epoch_open_pending) ASSERT_EQ (blocks[0].verified, nano::signature_verification::valid_epoch); // New block to process epoch open auto send1 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -2590,9 +2590,9 @@ TEST (ledger, block_hash_account_conflict) * in the ledger and not an account */ auto send1 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -2602,7 +2602,7 @@ TEST (ledger, block_hash_account_conflict) auto receive1 = builder.state () .account (key1.pub) .previous (0) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (100) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -2618,7 +2618,7 @@ TEST (ledger, block_hash_account_conflict) auto send2 = builder.state () .account (key1.pub) .previous (receive1->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (90) .link (receive1->hash ()) .sign (key1.prv, key1.pub) @@ -2679,14 +2679,14 @@ TEST (ledger, could_fit) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; // Test legacy and state change blocks could_fit - nano::change_block change1 (genesis.hash (), nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block change2 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block change1 (genesis.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_TRUE (ledger.could_fit (transaction, change1)); ASSERT_TRUE (ledger.could_fit (transaction, change2)); // Test legacy and state send nano::keypair key1; nano::send_block send1 (change1.hash (), key1.pub, nano::genesis_amount - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); - nano::state_block send2 (nano::genesis_account, change1.hash (), nano::genesis_account, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), change1.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, send1)); ASSERT_FALSE (ledger.could_fit (transaction, send2)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); @@ -2695,8 +2695,8 @@ TEST (ledger, could_fit) ASSERT_TRUE (ledger.could_fit (transaction, send1)); ASSERT_TRUE (ledger.could_fit (transaction, send2)); // Test legacy and state open - nano::open_block open1 (send2.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); - nano::state_block open2 (key1.pub, 0, nano::genesis_account, 1, send2.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); + nano::open_block open1 (send2.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); + nano::state_block open2 (key1.pub, 0, nano::dev::genesis->account (), 1, send2.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_FALSE (ledger.could_fit (transaction, open1)); ASSERT_FALSE (ledger.could_fit (transaction, open2)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); @@ -2708,17 +2708,17 @@ TEST (ledger, could_fit) ASSERT_TRUE (ledger.could_fit (transaction, open1)); ASSERT_TRUE (ledger.could_fit (transaction, open2)); // Create another send to receive - nano::state_block send3 (nano::genesis_account, send2.hash (), nano::genesis_account, nano::genesis_amount - 2, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block send3 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); // Test legacy and state receive nano::receive_block receive1 (open1.hash (), send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); - nano::state_block receive2 (key1.pub, open1.hash (), nano::genesis_account, 2, send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); + nano::state_block receive2 (key1.pub, open1.hash (), nano::dev::genesis->account (), 2, send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, receive1)); ASSERT_FALSE (ledger.could_fit (transaction, receive2)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send3).code); ASSERT_TRUE (ledger.could_fit (transaction, receive1)); ASSERT_TRUE (ledger.could_fit (transaction, receive2)); // Test epoch (state) - nano::state_block epoch1 (key1.pub, receive1.hash (), nano::genesis_account, 2, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive1.hash ())); + nano::state_block epoch1 (key1.pub, receive1.hash (), nano::dev::genesis->account (), 2, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, epoch1)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (ledger.could_fit (transaction, receive1)); @@ -2734,7 +2734,7 @@ TEST (ledger, unchecked_epoch) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2774,7 +2774,7 @@ TEST (ledger, unchecked_epoch_invalid) auto & node1 (*system.add_node (node_config)); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2826,7 +2826,7 @@ TEST (ledger, unchecked_open) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2863,9 +2863,9 @@ TEST (ledger, unchecked_receive) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); node1.work_generate_blocking (*send2); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2923,14 +2923,14 @@ TEST (ledger, confirmation_height_not_updated) nano::keypair key; nano::send_block send1 (account_info.head, key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (account_info.head)); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (store->confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - ASSERT_FALSE (store->confirmation_height.get (transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); - nano::open_block open1 (send1.hash (), nano::genesis_account, key.pub, key.prv, key.pub, *pool.generate (key.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key.pub, key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_TRUE (store->confirmation_height.get (transaction, key.pub, confirmation_height_info)); ASSERT_EQ (0, confirmation_height_info.height); @@ -3078,9 +3078,9 @@ TEST (ledger, dependents_confirmed) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; auto send1 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3089,9 +3089,9 @@ TEST (ledger, dependents_confirmed) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send1).code); ASSERT_TRUE (ledger.dependents_confirmed (transaction, *send1)); auto send2 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (send1->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 200) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3102,7 +3102,7 @@ TEST (ledger, dependents_confirmed) auto receive1 = builder.state () .account (key1.pub) .previous (0) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (100) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -3111,14 +3111,14 @@ TEST (ledger, dependents_confirmed) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *receive1).code); ASSERT_FALSE (ledger.dependents_confirmed (transaction, *receive1)); nano::confirmation_height_info height; - ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::genesis_account, height)); + ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::dev::genesis->account (), height)); height.height += 1; - ledger.store.confirmation_height.put (transaction, nano::genesis_account, height); + ledger.store.confirmation_height.put (transaction, nano::dev::genesis->account (), height); ASSERT_TRUE (ledger.dependents_confirmed (transaction, *receive1)); auto receive2 = builder.state () .account (key1.pub) .previous (receive1->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (200) .link (send2->hash ()) .sign (key1.prv, key1.pub) @@ -3130,9 +3130,9 @@ TEST (ledger, dependents_confirmed) height.height += 1; ledger.store.confirmation_height.put (transaction, key1.pub, height); ASSERT_FALSE (ledger.dependents_confirmed (transaction, *receive2)); - ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::genesis_account, height)); + ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::dev::genesis->account (), height)); height.height += 1; - ledger.store.confirmation_height.put (transaction, nano::genesis_account, height); + ledger.store.confirmation_height.put (transaction, nano::dev::genesis->account (), height); ASSERT_TRUE (ledger.dependents_confirmed (transaction, *receive2)); } @@ -3151,9 +3151,9 @@ TEST (ledger, dependents_confirmed_pruning) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; auto send1 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3161,9 +3161,9 @@ TEST (ledger, dependents_confirmed_pruning) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send1).code); auto send2 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (send1->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 200) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3171,15 +3171,15 @@ TEST (ledger, dependents_confirmed_pruning) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send2).code); nano::confirmation_height_info height; - ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::genesis_account, height)); + ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::dev::genesis->account (), height)); height.height = 3; - ledger.store.confirmation_height.put (transaction, nano::genesis_account, height); + ledger.store.confirmation_height.put (transaction, nano::dev::genesis->account (), height); ASSERT_TRUE (ledger.block_confirmed (transaction, send1->hash ())); ASSERT_EQ (2, ledger.pruning_action (transaction, send2->hash (), 1)); auto receive1 = builder.state () .account (key1.pub) .previous (0) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (100) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -3203,9 +3203,9 @@ TEST (ledger, block_confirmed) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; auto send1 = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3216,9 +3216,9 @@ TEST (ledger, block_confirmed) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send1).code); ASSERT_FALSE (ledger.block_confirmed (transaction, send1->hash ())); nano::confirmation_height_info height; - ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::genesis_account, height)); + ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::dev::genesis->account (), height)); ++height.height; - ledger.store.confirmation_height.put (transaction, nano::genesis_account, height); + ledger.store.confirmation_height.put (transaction, nano::dev::genesis->account (), height); ASSERT_TRUE (ledger.block_confirmed (transaction, send1->hash ())); } @@ -3249,16 +3249,16 @@ TEST (ledger, cache) ASSERT_EQ (account_count, cache_a.account_count); ASSERT_EQ (block_count, cache_a.block_count); ASSERT_EQ (cemented_count, cache_a.cemented_count); - ASSERT_EQ (genesis_weight, cache_a.rep_weights.representation_get (nano::genesis_account)); + ASSERT_EQ (genesis_weight, cache_a.rep_weights.representation_get (nano::dev::genesis->account ())); ASSERT_EQ (pruned_count, cache_a.pruned_count); }; nano::keypair key; - auto const latest = ledger.latest (store->tx_begin_read (), nano::genesis_account); + auto const latest = ledger.latest (store->tx_begin_read (), nano::dev::genesis->account ()); auto send = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (latest) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - (i + 1)) .link (key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3296,10 +3296,10 @@ TEST (ledger, cache) { auto transaction (store->tx_begin_write ()); nano::confirmation_height_info height; - ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::genesis_account, height)); + ASSERT_FALSE (ledger.store.confirmation_height.get (transaction, nano::dev::genesis->account (), height)); ++height.height; height.frontier = send->hash (); - ledger.store.confirmation_height.put (transaction, nano::genesis_account, height); + ledger.store.confirmation_height.put (transaction, nano::dev::genesis->account (), height); ASSERT_TRUE (ledger.block_confirmed (transaction, send->hash ())); ++ledger.cache.cemented_count; } @@ -3346,20 +3346,20 @@ TEST (ledger, pruning_action) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send1_stored (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send1_stored); ASSERT_EQ (send1, *send1_stored); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action ASSERT_EQ (1, ledger.pruning_action (transaction, send1.hash (), 1)); ASSERT_EQ (0, ledger.pruning_action (transaction, genesis.hash (), 1)); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); ASSERT_TRUE (ledger.block_or_pruned_exists (transaction, send1.hash ())); // Pruned ledger start without proper flags emulation @@ -3370,13 +3370,13 @@ TEST (ledger, pruning_action) ASSERT_TRUE (store->block.exists (transaction, genesis.hash ())); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Receiving pruned block - nano::state_block receive1 (nano::genesis_account, send2.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive1_stored (store->block.get (transaction, receive1.hash ())); ASSERT_NE (nullptr, receive1_stored); ASSERT_EQ (receive1, *receive1_stored); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (4, receive1_stored->sideband ().height); ASSERT_FALSE (receive1_stored->sideband ().details.is_send); ASSERT_TRUE (receive1_stored->sideband ().details.is_receive); @@ -3407,10 +3407,10 @@ TEST (ledger, pruning_large_chain) auto last_hash (genesis.hash ()); for (auto i (0); i < send_receive_pairs; i++) { - nano::state_block send (nano::genesis_account, last_hash, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (last_hash)); + nano::state_block send (nano::dev::genesis->account (), last_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (last_hash)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_TRUE (store->block.exists (transaction, send.hash ())); - nano::state_block receive (nano::genesis_account, send.hash (), nano::genesis_account, nano::genesis_amount, send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); + nano::state_block receive (nano::dev::genesis->account (), send.hash (), nano::dev::genesis->account (), nano::genesis_amount, send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_TRUE (store->block.exists (transaction, receive.hash ())); last_hash = receive.hash (); @@ -3440,12 +3440,12 @@ TEST (ledger, pruning_source_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block epoch1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send1 (nano::genesis_account, epoch1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3456,26 +3456,26 @@ TEST (ledger, pruning_source_rollback) ASSERT_TRUE (store->pruned.exists (transaction, epoch1.hash ())); ASSERT_TRUE (store->block.exists (transaction, genesis.hash ())); nano::pending_info info; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info)); - ASSERT_EQ (nano::genesis_account, info.source); + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info)); + ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_EQ (nano::epoch::epoch_1, info.epoch); // Receiving pruned block - nano::state_block receive1 (nano::genesis_account, send2.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); ASSERT_EQ (5, ledger.cache.block_count); // Rollback receive block ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); nano::pending_info info2; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info2)); - ASSERT_NE (nano::genesis_account, info2.source); // Tradeoff to not store pruned blocks accounts + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info2)); + ASSERT_NE (nano::dev::genesis->account (), info2.source); // Tradeoff to not store pruned blocks accounts ASSERT_EQ (nano::Gxrb_ratio, info2.amount.number ()); ASSERT_EQ (nano::epoch::epoch_1, info2.epoch); // Process receive block again ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); ASSERT_EQ (5, ledger.cache.block_count); } @@ -3492,18 +3492,18 @@ TEST (ledger, pruning_source_rollback_legacy) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); nano::keypair key1; nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (key1.pub, send2.hash ()))); - nano::send_block send3 (send2.hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send3).code); ASSERT_TRUE (store->block.exists (transaction, send3.hash ())); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send3.hash ()))); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send3.hash ()))); // Pruning action ASSERT_EQ (2, ledger.pruning_action (transaction, send2.hash (), 1)); ASSERT_FALSE (store->block.exists (transaction, send2.hash ())); @@ -3512,35 +3512,35 @@ TEST (ledger, pruning_source_rollback_legacy) ASSERT_TRUE (store->pruned.exists (transaction, send1.hash ())); ASSERT_TRUE (store->block.exists (transaction, genesis.hash ())); nano::pending_info info1; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info1)); - ASSERT_EQ (nano::genesis_account, info1.source); + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info1)); + ASSERT_EQ (nano::dev::genesis->account (), info1.source); ASSERT_EQ (nano::Gxrb_ratio, info1.amount.number ()); ASSERT_EQ (nano::epoch::epoch_0, info1.epoch); nano::pending_info info2; ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (key1.pub, send2.hash ()), info2)); - ASSERT_EQ (nano::genesis_account, info2.source); + ASSERT_EQ (nano::dev::genesis->account (), info2.source); ASSERT_EQ (nano::Gxrb_ratio, info2.amount.number ()); ASSERT_EQ (nano::epoch::epoch_0, info2.epoch); // Receiving pruned block nano::receive_block receive1 (send3.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send3.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); ASSERT_EQ (5, ledger.cache.block_count); // Rollback receive block ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); nano::pending_info info3; - ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::genesis_account, send1.hash ()), info3)); - ASSERT_NE (nano::genesis_account, info3.source); // Tradeoff to not store pruned blocks accounts + ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info3)); + ASSERT_NE (nano::dev::genesis->account (), info3.source); // Tradeoff to not store pruned blocks accounts ASSERT_EQ (nano::Gxrb_ratio, info3.amount.number ()); ASSERT_EQ (nano::epoch::epoch_0, info3.epoch); // Process receive block again ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); ASSERT_EQ (5, ledger.cache.block_count); // Receiving pruned block (open) - nano::open_block open1 (send2.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); + nano::open_block open1 (send2.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (key1.pub, send2.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); @@ -3549,7 +3549,7 @@ TEST (ledger, pruning_source_rollback_legacy) ASSERT_FALSE (ledger.rollback (transaction, open1.hash ())); nano::pending_info info4; ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (key1.pub, send2.hash ()), info4)); - ASSERT_NE (nano::genesis_account, info4.source); // Tradeoff to not store pruned blocks accounts + ASSERT_NE (nano::dev::genesis->account (), info4.source); // Tradeoff to not store pruned blocks accounts ASSERT_EQ (nano::Gxrb_ratio, info4.amount.number ()); ASSERT_EQ (nano::epoch::epoch_0, info4.epoch); // Process open block again @@ -3571,7 +3571,7 @@ TEST (ledger, pruning_process_error) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (0, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3582,7 +3582,7 @@ TEST (ledger, pruning_process_error) // Attempt to process pruned block again ASSERT_EQ (nano::process_result::old, ledger.process (transaction, send1).code); // Attept to process new block after pruned - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, send2).code); ASSERT_EQ (1, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3601,18 +3601,18 @@ TEST (ledger, pruning_legacy_blocks) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::genesis_account, send1.hash ()))); + ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); nano::change_block change1 (receive1.hash (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); nano::send_block send2 (change1.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); - nano::open_block open1 (send2.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); + nano::open_block open1 (send2.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); - nano::send_block send3 (open1.hash (), nano::genesis_account, 0, key1.prv, key1.pub, *pool.generate (open1.hash ())); + nano::send_block send3 (open1.hash (), nano::dev::genesis->account (), 0, key1.prv, key1.pub, *pool.generate (open1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send3).code); // Pruning action ASSERT_EQ (3, ledger.pruning_action (transaction, change1.hash (), 2)); @@ -3646,10 +3646,10 @@ TEST (ledger, pruning_safe_functions) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3673,7 +3673,7 @@ TEST (ledger, pruning_safe_functions) ASSERT_TRUE (ledger.account_safe (transaction, send1.hash (), error).is_zero ()); ASSERT_TRUE (error); error = false; - ASSERT_EQ (nano::genesis_account, ledger.account_safe (transaction, send2.hash (), error)); + ASSERT_EQ (nano::dev::genesis->account (), ledger.account_safe (transaction, send2.hash (), error)); ASSERT_FALSE (error); } @@ -3689,10 +3689,10 @@ TEST (ledger, hash_root_random) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3752,13 +3752,13 @@ TEST (ledger, migrate_lmdb_to_rocksdb) ASSERT_FALSE (store.init_error ()); // Lower the database to the max version unsupported for upgrades - store.confirmation_height.put (transaction, nano::genesis_account, { 2, send->hash () }); + store.confirmation_height.put (transaction, nano::dev::genesis->account (), { 2, send->hash () }); store.online_weight.put (transaction, 100, nano::amount (2)); store.frontier.put (transaction, nano::block_hash (2), nano::account (5)); store.peer.put (transaction, endpoint_key); - store.pending.put (transaction, nano::pending_key (nano::genesis_account, send->hash ()), nano::pending_info (nano::genesis_account, 100, nano::epoch::epoch_0)); + store.pending.put (transaction, nano::pending_key (nano::dev::genesis->account (), send->hash ()), nano::pending_info (nano::dev::genesis->account (), 100, nano::epoch::epoch_0)); store.pruned.put (transaction, send->hash ()); store.unchecked.put (transaction, nano::dev::genesis->hash (), send); store.version.put (transaction, version); @@ -3774,7 +3774,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) auto rocksdb_transaction (rocksdb_store.tx_begin_read ()); nano::pending_info pending_info; - ASSERT_FALSE (rocksdb_store.pending.get (rocksdb_transaction, nano::pending_key (nano::genesis_account, send->hash ()), pending_info)); + ASSERT_FALSE (rocksdb_store.pending.get (rocksdb_transaction, nano::pending_key (nano::dev::genesis->account (), send->hash ()), pending_info)); for (auto i = rocksdb_store.online_weight.begin (rocksdb_transaction); i != rocksdb_store.online_weight.end (); ++i) { @@ -3791,7 +3791,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) ASSERT_EQ (rocksdb_store.version.get (rocksdb_transaction), version); ASSERT_EQ (rocksdb_store.frontier.get (rocksdb_transaction, 2), 5); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (rocksdb_store.confirmation_height.get (rocksdb_transaction, nano::genesis_account, confirmation_height_info)); + ASSERT_FALSE (rocksdb_store.confirmation_height.get (rocksdb_transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 2); ASSERT_EQ (confirmation_height_info.frontier, send->hash ()); ASSERT_TRUE (rocksdb_store.final_vote.get (rocksdb_transaction, nano::root (send->previous ())).size () == 1); @@ -3799,7 +3799,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) auto unchecked_infos = rocksdb_store.unchecked.get (rocksdb_transaction, nano::dev::genesis->hash ()); ASSERT_EQ (unchecked_infos.size (), 1); - ASSERT_EQ (unchecked_infos.front ().account, nano::genesis_account); + ASSERT_EQ (unchecked_infos.front ().account, nano::dev::genesis->account ()); ASSERT_EQ (*unchecked_infos.front ().block, *send); } @@ -3819,11 +3819,11 @@ TEST (ledger, unconfirmed_frontiers) nano::state_block_builder builder; nano::keypair key; - auto const latest = ledger.latest (store->tx_begin_read (), nano::genesis_account); + auto const latest = ledger.latest (store->tx_begin_read (), nano::dev::genesis->account ()); auto send = builder.make_block () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (latest) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) @@ -3835,7 +3835,7 @@ TEST (ledger, unconfirmed_frontiers) unconfirmed_frontiers = ledger.unconfirmed_frontiers (); ASSERT_EQ (unconfirmed_frontiers.size (), 1); ASSERT_EQ (unconfirmed_frontiers.begin ()->first, 1); - nano::uncemented_info uncemented_info1{ latest, send->hash (), nano::genesis_account }; + nano::uncemented_info uncemented_info1{ latest, send->hash (), nano::dev::genesis->account () }; auto uncemented_info2 = unconfirmed_frontiers.begin ()->second; ASSERT_EQ (uncemented_info1.account, uncemented_info2.account); ASSERT_EQ (uncemented_info1.cemented_frontier, uncemented_info2.cemented_frontier); diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp index 615634a5..88be824a 100644 --- a/nano/core_test/node.cpp +++ b/nano/core_test/node.cpp @@ -2073,16 +2073,16 @@ TEST (node, DISABLED_unconfirmed_send) nano::keypair key0; wallet1->insert_adhoc (key0.prv); wallet0->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (wallet0->send_action (nano::genesis_account, key0.pub, 2 * nano::Mxrb_ratio)); + auto send1 (wallet0->send_action (nano::dev::genesis->account (), key0.pub, 2 * nano::Mxrb_ratio)); ASSERT_TIMELY (10s, node1.balance (key0.pub) == 2 * nano::Mxrb_ratio && !node1.bootstrap_initiator.in_progress ()); auto latest (node1.latest (key0.pub)); - nano::state_block send2 (key0.pub, latest, nano::genesis_account, nano::Mxrb_ratio, nano::genesis_account, key0.prv, key0.pub, *node0.work_generate_blocking (latest)); + nano::state_block send2 (key0.pub, latest, nano::dev::genesis->account (), nano::Mxrb_ratio, nano::dev::genesis->account (), key0.prv, key0.pub, *node0.work_generate_blocking (latest)); { auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, send2).code); } - auto send3 (wallet1->send_action (key0.pub, nano::genesis_account, nano::Mxrb_ratio)); - ASSERT_TIMELY (10s, node0.balance (nano::genesis_account) == nano::genesis_amount); + auto send3 (wallet1->send_action (key0.pub, nano::dev::genesis->account (), nano::Mxrb_ratio)); + ASSERT_TIMELY (10s, node0.balance (nano::dev::genesis->account ()) == nano::genesis_amount); } // Test that nodes can track nodes that have rep weight for priority broadcasting @@ -3059,9 +3059,9 @@ TEST (node, vote_by_hash_epoch_block_republish) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto epoch1 = nano::state_block_builder () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp index caf83c68..370efa83 100644 --- a/nano/core_test/system.cpp +++ b/nano/core_test/system.cpp @@ -29,7 +29,7 @@ TEST (system, system_genesis) for (auto & i : system.nodes) { auto transaction (i->store.tx_begin_read ()); - ASSERT_EQ (nano::genesis_amount, i->ledger.account_balance (transaction, nano::genesis_account)); + ASSERT_EQ (nano::genesis_amount, i->ledger.account_balance (transaction, nano::dev::genesis->account ())); } } @@ -40,7 +40,7 @@ TEST (system, DISABLED_generate_send_existing) nano::thread_runner runner (system.io_ctx, node1.config.io_threads); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); nano::keypair stake_preserver; - auto send_block (system.wallet (0)->send_action (nano::genesis_account, stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); nano::account_info info1; { auto transaction (node1.store.tx_begin_read ()); @@ -52,11 +52,11 @@ TEST (system, DISABLED_generate_send_existing) // Have stake_preserver receive funds after generate_send_existing so it isn't chosen as the destination { auto transaction (node1.store.tx_begin_write ()); - auto open_block (std::make_shared (send_block->hash (), nano::genesis_account, stake_preserver.pub, stake_preserver.prv, stake_preserver.pub, 0)); + auto open_block (std::make_shared (send_block->hash (), nano::dev::genesis->account (), stake_preserver.pub, stake_preserver.prv, stake_preserver.pub, 0)); node1.work_generate_blocking (*open_block); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *open_block).code); } - ASSERT_GT (node1.balance (stake_preserver.pub), node1.balance (nano::genesis_account)); + ASSERT_GT (node1.balance (stake_preserver.pub), node1.balance (nano::dev::genesis->account ())); nano::account_info info2; { auto transaction (node1.store.tx_begin_read ()); @@ -94,14 +94,14 @@ TEST (system, DISABLED_generate_send_new) ASSERT_EQ (node1.store.account.end (), iterator1); } nano::keypair stake_preserver; - auto send_block (system.wallet (0)->send_action (nano::genesis_account, stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); { auto transaction (node1.store.tx_begin_write ()); - auto open_block (std::make_shared (send_block->hash (), nano::genesis_account, stake_preserver.pub, stake_preserver.prv, stake_preserver.pub, 0)); + auto open_block (std::make_shared (send_block->hash (), nano::dev::genesis->account (), stake_preserver.pub, stake_preserver.prv, stake_preserver.pub, 0)); node1.work_generate_blocking (*open_block); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *open_block).code); } - ASSERT_GT (node1.balance (stake_preserver.pub), node1.balance (nano::genesis_account)); + ASSERT_GT (node1.balance (stake_preserver.pub), node1.balance (nano::dev::genesis->account ())); std::vector accounts; accounts.push_back (nano::dev_genesis_key.pub); // This indirectly waits for online weight to stabilize, required to prevent intermittent failures diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp index 4f573769..c8ca56b6 100644 --- a/nano/core_test/vote_processor.cpp +++ b/nano/core_test/vote_processor.cpp @@ -28,7 +28,7 @@ TEST (vote_processor, codes) ASSERT_EQ (nano::vote_code::indeterminate, node.vote_processor.vote_blocking (vote, channel)); // First vote from an account for an ongoing election - genesis.open->sideband_set (nano::block_sideband (nano::genesis_account, 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); ASSERT_NE (nullptr, node.active.election (genesis.open->qualified_root ())); ASSERT_EQ (nano::vote_code::vote, node.vote_processor.vote_blocking (vote, channel)); @@ -78,7 +78,7 @@ TEST (vote_processor, invalid_signature) vote_invalid->signature.bytes[0] ^= 1; auto channel = std::make_shared (node); - genesis.open->sideband_set (nano::block_sideband (nano::genesis_account, 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); auto election = node.active.election (genesis.open->qualified_root ()); ASSERT_TRUE (election); diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp index c7e7eb03..08bd5267 100644 --- a/nano/core_test/voting.cpp +++ b/nano/core_test/voting.cpp @@ -112,7 +112,7 @@ TEST (vote_generator, session) nano::vote_generator_session generator_session (node->active.generator); boost::thread thread ([node, &generator_session] () { nano::thread_role::set (nano::thread_role::name::request_loop); - generator_session.add (nano::genesis_account, nano::dev::genesis->hash ()); + generator_session.add (nano::dev::genesis->account (), nano::dev::genesis->hash ()); ASSERT_EQ (0, node->stats.count (nano::stat::type::vote, nano::stat::detail::vote_indeterminate)); generator_session.flush (); }); diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp index fc295738..e6d86cad 100644 --- a/nano/core_test/wallet.cpp +++ b/nano/core_test/wallet.cpp @@ -18,7 +18,7 @@ TEST (wallet, no_special_keys_accounts) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::keypair key1; ASSERT_FALSE (wallet.exists (transaction, key1.pub)); @@ -39,7 +39,7 @@ TEST (wallet, no_key) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::keypair key1; nano::raw_key prv1; @@ -54,7 +54,7 @@ TEST (wallet, fetch_locked) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_TRUE (wallet.valid_password (transaction)); nano::keypair key1; ASSERT_EQ (key1.pub, wallet.insert_adhoc (transaction, key1.prv)); @@ -76,7 +76,7 @@ TEST (wallet, retrieval) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::keypair key1; ASSERT_TRUE (wallet.valid_password (transaction)); @@ -98,7 +98,7 @@ TEST (wallet, empty_iteration) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); auto i (wallet.begin (transaction)); auto j (wallet.end ()); @@ -112,7 +112,7 @@ TEST (wallet, one_item_iteration) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::keypair key1; wallet.insert_adhoc (transaction, key1.prv); @@ -140,7 +140,7 @@ TEST (wallet, two_item_iteration) nano::kdf kdf; { auto transaction (env.tx_begin_write ()); - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); wallet.insert_adhoc (transaction, key1.prv); wallet.insert_adhoc (transaction, key2.prv); @@ -278,7 +278,7 @@ TEST (wallet, find_none) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::account account (1000); ASSERT_EQ (wallet.end (), wallet.find (transaction, account)); @@ -291,7 +291,7 @@ TEST (wallet, find_existing) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::keypair key1; ASSERT_FALSE (wallet.exists (transaction, key1.pub)); @@ -310,7 +310,7 @@ TEST (wallet, rekey) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::raw_key password; wallet.password.value (password); @@ -382,7 +382,7 @@ TEST (wallet, hash_password) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); nano::raw_key hash1; wallet.derive_key (hash1, transaction, ""); @@ -432,25 +432,25 @@ TEST (wallet, reopen_default_password) ASSERT_FALSE (init); nano::kdf kdf; { - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); ASSERT_TRUE (wallet.valid_password (transaction)); } { bool init; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); ASSERT_TRUE (wallet.valid_password (transaction)); } { - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); wallet.rekey (transaction, ""); ASSERT_TRUE (wallet.valid_password (transaction)); } { bool init; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (init); ASSERT_FALSE (wallet.valid_password (transaction)); wallet.attempt_password (transaction, " "); @@ -467,10 +467,10 @@ TEST (wallet, representative) ASSERT_FALSE (error); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (error, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (error, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (error); ASSERT_FALSE (wallet.is_representative (transaction)); - ASSERT_EQ (nano::genesis_account, wallet.representative (transaction)); + ASSERT_EQ (nano::dev::genesis->account (), wallet.representative (transaction)); ASSERT_FALSE (wallet.is_representative (transaction)); nano::keypair key; wallet.representative_set (transaction, key.pub); @@ -488,11 +488,11 @@ TEST (wallet, serialize_json_empty) ASSERT_FALSE (error); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet1 (error, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet1 (error, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (error); std::string serialized; wallet1.serialize_json (transaction, serialized); - nano::wallet_store wallet2 (error, kdf, transaction, nano::genesis_account, 1, "1", serialized); + nano::wallet_store wallet2 (error, kdf, transaction, nano::dev::genesis->account (), 1, "1", serialized); ASSERT_FALSE (error); nano::raw_key password1; nano::raw_key password2; @@ -513,13 +513,13 @@ TEST (wallet, serialize_json_one) ASSERT_FALSE (error); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet1 (error, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet1 (error, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (error); nano::keypair key; wallet1.insert_adhoc (transaction, key.prv); std::string serialized; wallet1.serialize_json (transaction, serialized); - nano::wallet_store wallet2 (error, kdf, transaction, nano::genesis_account, 1, "1", serialized); + nano::wallet_store wallet2 (error, kdf, transaction, nano::dev::genesis->account (), 1, "1", serialized); ASSERT_FALSE (error); nano::raw_key password1; nano::raw_key password2; @@ -542,14 +542,14 @@ TEST (wallet, serialize_json_password) ASSERT_FALSE (error); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet1 (error, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet1 (error, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (error); nano::keypair key; wallet1.rekey (transaction, "password"); wallet1.insert_adhoc (transaction, key.prv); std::string serialized; wallet1.serialize_json (transaction, serialized); - nano::wallet_store wallet2 (error, kdf, transaction, nano::genesis_account, 1, "1", serialized); + nano::wallet_store wallet2 (error, kdf, transaction, nano::dev::genesis->account (), 1, "1", serialized); ASSERT_FALSE (error); ASSERT_FALSE (wallet2.valid_password (transaction)); ASSERT_FALSE (wallet2.attempt_password (transaction, "password")); @@ -575,11 +575,11 @@ TEST (wallet_store, move) ASSERT_FALSE (error); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet1 (error, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet1 (error, kdf, transaction, nano::dev::genesis->account (), 1, "0"); ASSERT_FALSE (error); nano::keypair key1; wallet1.insert_adhoc (transaction, key1.prv); - nano::wallet_store wallet2 (error, kdf, transaction, nano::genesis_account, 1, "1"); + nano::wallet_store wallet2 (error, kdf, transaction, nano::dev::genesis->account (), 1, "1"); ASSERT_FALSE (error); nano::keypair key2; wallet2.insert_adhoc (transaction, key2.prv); @@ -733,7 +733,7 @@ TEST (wallet, deterministic_keys) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); auto key1 = wallet.deterministic_key (transaction, 0); auto key2 = wallet.deterministic_key (transaction, 0); ASSERT_EQ (key1, key2); @@ -776,7 +776,7 @@ TEST (wallet, reseed) ASSERT_FALSE (init); auto transaction (env.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store wallet (init, kdf, transaction, nano::genesis_account, 1, "0"); + nano::wallet_store wallet (init, kdf, transaction, nano::dev::genesis->account (), 1, "0"); nano::raw_key seed1; seed1 = 1; nano::raw_key seed2; @@ -1163,11 +1163,11 @@ TEST (wallet, search_pending) wallet.insert_adhoc (nano::dev_genesis_key.prv); nano::block_builder builder; auto send = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) - .link (nano::genesis_account) + .link (nano::dev::genesis->account ()) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); @@ -1180,7 +1180,7 @@ TEST (wallet, search_pending) ASSERT_NE (nullptr, election); // Erase the key so the confirmation does not trigger an automatic receive - wallet.store.erase (node.wallets.tx_begin_write (), nano::genesis_account); + wallet.store.erase (node.wallets.tx_begin_write (), nano::dev::genesis->account ()); // Now confirm the election election->force_confirm (); @@ -1193,8 +1193,8 @@ TEST (wallet, search_pending) // Pending search should create the receive block ASSERT_EQ (2, node.ledger.cache.block_count); ASSERT_FALSE (wallet.search_pending (wallet.wallets.tx_begin_read ())); - ASSERT_TIMELY (3s, node.balance (nano::genesis_account) == nano::genesis_amount); - auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::genesis_account); + ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::genesis_amount); + auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::dev::genesis->account ()); auto receive = node.block (receive_hash); ASSERT_NE (nullptr, receive); ASSERT_EQ (receive->sideband ().height, 3); diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp index 862d35fa..e0a9e477 100644 --- a/nano/core_test/wallets.cpp +++ b/nano/core_test/wallets.cpp @@ -166,11 +166,11 @@ TEST (wallets, search_pending) wallet->insert_adhoc (nano::dev_genesis_key.prv); nano::block_builder builder; auto send = builder.state () - .account (nano::genesis_account) + .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) - .representative (nano::genesis_account) + .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) - .link (nano::genesis_account) + .link (nano::dev::genesis->account ()) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); @@ -190,7 +190,7 @@ TEST (wallets, search_pending) ASSERT_NE (nullptr, election); // Erase the key so the confirmation does not trigger an automatic receive - wallet->store.erase (node.wallets.tx_begin_write (), nano::genesis_account); + wallet->store.erase (node.wallets.tx_begin_write (), nano::dev::genesis->account ()); // Now confirm the election election->force_confirm (); @@ -210,8 +210,8 @@ TEST (wallets, search_pending) { node.wallets.search_pending (wallet_id); } - ASSERT_TIMELY (3s, node.balance (nano::genesis_account) == nano::genesis_amount); - auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::genesis_account); + ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::genesis_amount); + auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::dev::genesis->account ()); auto receive = node.block (receive_hash); ASSERT_NE (nullptr, receive); ASSERT_EQ (receive->sideband ().height, 3); diff --git a/nano/load_test/entry.cpp b/nano/load_test/entry.cpp index e64b096c..454b2379 100644 --- a/nano/load_test/entry.cpp +++ b/nano/load_test/entry.cpp @@ -437,7 +437,7 @@ int main (int argc, char * const * argv) // Send from genesis account to different accounts and receive the funds boost::asio::spawn (ioc, [&ioc, &primary_node_results, &wallet, destination_account, &send_calls_remaining] (boost::asio::yield_context yield) { - send_receive (ioc, wallet, nano::genesis_account.to_account (), destination_account->as_string, send_calls_remaining, primary_node_results, yield); + send_receive (ioc, wallet, nano::dev::genesis->account ().to_account (), destination_account->as_string, send_calls_remaining, primary_node_results, yield); }); } diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp index 33d12da7..74dd5d9f 100644 --- a/nano/qt_test/qt.cpp +++ b/nano/qt_test/qt.cpp @@ -350,7 +350,7 @@ TEST (wallet, process_block) nano_qt::eventloop_processor processor; nano::system system (1); nano::account account; - nano::block_hash latest (system.nodes[0]->latest (nano::genesis_account)); + nano::block_hash latest (system.nodes[0]->latest (nano::dev::genesis->account ())); system.wallet (0)->insert_adhoc (nano::keypair ().prv); { auto transaction (system.nodes[0]->wallets.tx_begin_read ()); @@ -655,7 +655,7 @@ TEST (wallet, block_viewer) ASSERT_NE (-1, wallet->advanced.layout->indexOf (wallet->advanced.block_viewer)); QTest::mouseClick (wallet->advanced.block_viewer, Qt::LeftButton); ASSERT_EQ (wallet->block_viewer.window, wallet->main_stack->currentWidget ()); - nano::block_hash latest (system.nodes[0]->latest (nano::genesis_account)); + nano::block_hash latest (system.nodes[0]->latest (nano::dev::genesis->account ())); QTest::keyClicks (wallet->block_viewer.hash, latest.to_string ().c_str ()); QTest::mouseClick (wallet->block_viewer.retrieve, Qt::LeftButton); ASSERT_FALSE (wallet->block_viewer.block->toPlainText ().toStdString ().empty ()); @@ -906,7 +906,7 @@ TEST (wallet, DISABLED_synchronizing) wallet->start (); { auto transaction (system1.nodes[0]->store.tx_begin_write ()); - auto latest (system1.nodes[0]->ledger.latest (transaction, nano::genesis_account)); + auto latest (system1.nodes[0]->ledger.latest (transaction, nano::dev::genesis->account ())); nano::send_block send (latest, key1, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.work.generate (latest)); system1.nodes[0]->ledger.process (transaction, send); } diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 9cabbd06..2a81df54 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -663,7 +663,7 @@ TEST (rpc, wallet_representative) request.put ("action", "wallet_representative"); auto response (wait_response (system, rpc, request)); std::string account_text1 (response.get ("representative")); - ASSERT_EQ (account_text1, nano::genesis_account.to_account ()); + ASSERT_EQ (account_text1, nano::dev::genesis->account ().to_account ()); } TEST (rpc, wallet_representative_set) @@ -822,7 +822,7 @@ TEST (rpc, wallet_export) rpc_ctx->io_scope->reset (); auto transaction (node->wallets.tx_begin_write ()); nano::kdf kdf; - nano::wallet_store store (error, kdf, transaction, nano::genesis_account, 1, "0", wallet_json); + nano::wallet_store store (error, kdf, transaction, nano::dev::genesis->account (), 1, "0", wallet_json); ASSERT_FALSE (error); ASSERT_TRUE (store.exists (transaction, nano::dev_genesis_key.pub)); } @@ -877,7 +877,7 @@ TEST (rpc, block) auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "block"); - request.put ("hash", node->latest (nano::genesis_account).to_string ()); + request.put ("hash", node->latest (nano::dev::genesis->account ()).to_string ()); auto response (wait_response (system, rpc, request)); auto contents (response.get ("contents")); ASSERT_FALSE (contents.empty ()); @@ -1086,9 +1086,9 @@ TEST (rpc, history) auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::genesis_account, node0->latest (nano::genesis_account), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::genesis_account))); - nano::state_block ureceive (nano::genesis_account, usend.hash (), nano::genesis_account, nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::genesis_account, ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1143,9 +1143,9 @@ TEST (rpc, account_history) auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::genesis_account, node0->latest (nano::genesis_account), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::genesis_account))); - nano::state_block ureceive (nano::genesis_account, usend.hash (), nano::genesis_account, nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::genesis_account, ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1156,7 +1156,7 @@ TEST (rpc, account_history) { boost::property_tree::ptree request; request.put ("action", "account_history"); - request.put ("account", nano::genesis_account.to_account ()); + request.put ("account", nano::dev::genesis->account ().to_account ()); request.put ("count", 100); auto response (wait_response (system, rpc, request, 10s)); std::vector> history_l; @@ -1197,7 +1197,7 @@ TEST (rpc, account_history) { boost::property_tree::ptree request; request.put ("action", "account_history"); - request.put ("account", nano::genesis_account.to_account ()); + request.put ("account", nano::dev::genesis->account ().to_account ()); request.put ("reverse", true); request.put ("count", 1); auto response (wait_response (system, rpc, request, 10s)); @@ -1283,9 +1283,9 @@ TEST (rpc, history_pruning) node0->process_active (send); auto receive (std::make_shared (send->hash (), send->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work.generate (send->hash ()))); node0->process_active (receive); - auto usend (std::make_shared (nano::genesis_account, receive->hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::genesis_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); - auto ureceive (std::make_shared (nano::genesis_account, usend->hash (), nano::genesis_account, nano::genesis_amount, usend->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); - auto uchange (std::make_shared (nano::genesis_account, ureceive->hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); + auto usend (std::make_shared (nano::dev::genesis->account (), receive->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); + auto ureceive (std::make_shared (nano::dev::genesis->account (), usend->hash (), nano::dev::genesis->account (), nano::genesis_amount, usend->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); + auto uchange (std::make_shared (nano::dev::genesis->account (), ureceive->hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); node0->process_active (usend); node0->process_active (ureceive); node0->process_active (uchange); @@ -1546,7 +1546,7 @@ TEST (rpc, process_subtype_send) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::state_block send (nano::genesis_account, latest, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1572,7 +1572,7 @@ TEST (rpc, process_subtype_open) auto & node2 = *system.add_node (); nano::keypair key; auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send = std::make_shared (nano::genesis_account, latest, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -1602,7 +1602,7 @@ TEST (rpc, process_subtype_receive) auto node1 = add_ipc_enabled_node (system); auto & node2 = *system.add_node (); auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send = std::make_shared (nano::genesis_account, latest, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -1636,7 +1636,7 @@ TEST (rpc, process_ledger_insufficient_work) auto latest (node->latest (nano::dev_genesis_key.pub)); auto min_difficulty = node->network_params.network.publish_thresholds.entry; auto max_difficulty = node->network_params.network.publish_thresholds.epoch_1; - nano::state_block send (nano::genesis_account, latest, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); ASSERT_LT (send.difficulty (), max_difficulty); ASSERT_GE (send.difficulty (), min_difficulty); boost::property_tree::ptree request; @@ -2478,11 +2478,11 @@ TEST (rpc, account_representative) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; - request.put ("account", nano::genesis_account.to_account ()); + request.put ("account", nano::dev::genesis->account ().to_account ()); request.put ("action", "account_representative"); auto response (wait_response (system, rpc, request)); std::string account_text1 (response.get ("representative")); - ASSERT_EQ (account_text1, nano::genesis_account.to_account ()); + ASSERT_EQ (account_text1, nano::dev::genesis->account ().to_account ()); } TEST (rpc, account_representative_set) @@ -2493,7 +2493,7 @@ TEST (rpc, account_representative_set) auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; nano::keypair rep; - request.put ("account", nano::genesis_account.to_account ()); + request.put ("account", nano::dev::genesis->account ().to_account ()); request.put ("representative", rep.pub.to_account ()); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); request.put ("action", "account_representative_set"); @@ -2517,7 +2517,7 @@ TEST (rpc, account_representative_set_work_disabled) auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; nano::keypair rep; - request.put ("account", nano::genesis_account.to_account ()); + request.put ("account", nano::dev::genesis->account ().to_account ()); request.put ("representative", rep.pub.to_account ()); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); request.put ("action", "account_representative_set"); @@ -2569,7 +2569,7 @@ TEST (rpc, bootstrap) nano::system system1 (1); auto node1 = system1.nodes[0]; auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, nano::genesis_account, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); { auto transaction (node1->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1->ledger.process (transaction, send).code); @@ -2585,7 +2585,7 @@ TEST (rpc, bootstrap) system0.poll (); } system1.deadline_set (10s); - while (node->latest (nano::genesis_account) != node1->latest (nano::genesis_account)) + while (node->latest (nano::dev::genesis->account ()) != node1->latest (nano::dev::genesis->account ())) { ASSERT_NO_ERROR (system0.poll ()); ASSERT_NO_ERROR (system1.poll ()); @@ -2624,7 +2624,7 @@ TEST (rpc, representatives) representatives.push_back (account); } ASSERT_EQ (1, representatives.size ()); - ASSERT_EQ (nano::genesis_account, representatives[0]); + ASSERT_EQ (nano::dev::genesis->account (), representatives[0]); } // wallet_seed is only available over IPC's unsafe encoding, and when running on test network @@ -2700,7 +2700,7 @@ TEST (rpc, wallet_frontiers) frontiers.push_back (nano::account (i->second.get (""))); } ASSERT_EQ (1, frontiers.size ()); - ASSERT_EQ (node->latest (nano::genesis_account), frontiers[0]); + ASSERT_EQ (node->latest (nano::dev::genesis->account ()), frontiers[0]); } TEST (rpc, work_validate) @@ -2848,7 +2848,7 @@ TEST (rpc, bootstrap_any) auto node = add_ipc_enabled_node (system0); nano::system system1 (1); auto latest (system1.nodes[0]->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, nano::genesis_account, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.nodes[0]->work_generate_blocking (latest)); + nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.nodes[0]->work_generate_blocking (latest)); { auto transaction (system1.nodes[0]->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, system1.nodes[0]->ledger.process (transaction, send).code); @@ -2985,7 +2985,7 @@ TEST (rpc, accounts_frontiers) std::string account_text (frontiers.first); ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); std::string frontier_text (frontiers.second.get ("")); - ASSERT_EQ (node->latest (nano::genesis_account), nano::block_hash{ frontier_text }); + ASSERT_EQ (node->latest (nano::dev::genesis->account ()), nano::block_hash{ frontier_text }); } } @@ -3093,14 +3093,14 @@ TEST (rpc, blocks) request.put ("action", "blocks"); boost::property_tree::ptree entry; boost::property_tree::ptree peers_l; - entry.put ("", node->latest (nano::genesis_account).to_string ()); + entry.put ("", node->latest (nano::dev::genesis->account ()).to_string ()); peers_l.push_back (std::make_pair ("", entry)); request.add_child ("hashes", peers_l); auto response (wait_response (system, rpc, request)); for (auto & blocks : response.get_child ("blocks")) { std::string hash_text (blocks.first); - ASSERT_EQ (node->latest (nano::genesis_account).to_string (), hash_text); + ASSERT_EQ (node->latest (nano::dev::genesis->account ()).to_string (), hash_text); std::string blocks_text (blocks.second.get ("")); ASSERT_FALSE (blocks_text.empty ()); } @@ -3203,7 +3203,7 @@ TEST (rpc, pending_exists) auto node = add_ipc_enabled_node (system); nano::keypair key1; system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto hash0 (node->latest (nano::genesis_account)); + auto hash0 (node->latest (nano::dev::genesis->account ())); auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); node->scheduler.flush (); ASSERT_TIMELY (5s, !node->active.active (*block1)); @@ -3368,7 +3368,7 @@ TEST (rpc, work_get) std::string work_text (response.get ("work")); uint64_t work (1); auto transaction (node->wallets.tx_begin_read ()); - node->wallets.items.begin ()->second->store.work_get (transaction, nano::genesis_account, work); + node->wallets.items.begin ()->second->store.work_get (transaction, nano::dev::genesis->account (), work); ASSERT_EQ (nano::to_string_hex (work), work_text); } @@ -3390,7 +3390,7 @@ TEST (rpc, wallet_work_get) ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); std::string work_text (works.second.get ("")); uint64_t work (1); - node->wallets.items.begin ()->second->store.work_get (transaction, nano::genesis_account, work); + node->wallets.items.begin ()->second->store.work_get (transaction, nano::dev::genesis->account (), work); ASSERT_EQ (nano::to_string_hex (work), work_text); } } @@ -3412,7 +3412,7 @@ TEST (rpc, work_set) ASSERT_TRUE (success.empty ()); uint64_t work1 (1); auto transaction (node->wallets.tx_begin_read ()); - node->wallets.items.begin ()->second->store.work_get (transaction, nano::genesis_account, work1); + node->wallets.items.begin ()->second->store.work_get (transaction, nano::dev::genesis->account (), work1); ASSERT_EQ (work1, work0); } @@ -3775,7 +3775,7 @@ TEST (rpc, json_block_input) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::genesis_account, node1->latest (nano::dev_genesis_key.pub), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -3829,7 +3829,7 @@ TEST (rpc, blocks_info) for (auto & blocks : response.get_child ("blocks")) { std::string hash_text (blocks.first); - ASSERT_EQ (node->latest (nano::genesis_account).to_string (), hash_text); + ASSERT_EQ (node->latest (nano::dev::genesis->account ()).to_string (), hash_text); std::string account_text (blocks.second.get ("block_account")); ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); std::string amount_text (blocks.second.get ("amount")); @@ -3851,7 +3851,7 @@ TEST (rpc, blocks_info) request.put ("action", "blocks_info"); boost::property_tree::ptree entry; boost::property_tree::ptree hashes; - entry.put ("", node->latest (nano::genesis_account).to_string ()); + entry.put ("", node->latest (nano::dev::genesis->account ()).to_string ()); hashes.push_back (std::make_pair ("", entry)); request.add_child ("hashes", hashes); { @@ -5222,7 +5222,7 @@ TEST (rpc, sign_hash) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - nano::state_block send (nano::genesis_account, node1->latest (nano::dev_genesis_key.pub), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5245,7 +5245,7 @@ TEST (rpc, sign_block) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::genesis_account, node1->latest (nano::dev_genesis_key.pub), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5321,7 +5321,7 @@ TEST (rpc, block_confirmed) nano::send_block send1 (latest, key.pub, 300, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); - nano::open_block open1 (send1.hash (), nano::genesis_account, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); + nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, open1).code); } rpc_ctx->io_scope->renew (); diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index 4780ab28..e9492dfb 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -648,7 +648,7 @@ TEST (confirmation_height, long_chains) // First open the other account nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -674,11 +674,11 @@ TEST (confirmation_height, long_chains) // Send one from destination to genesis and pocket it nano::send_block send1 (previous_destination_chain_hash, nano::dev_genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); - auto receive1 (std::make_shared (nano::dev_genesis_key.pub, previous_genesis_chain_hash, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); + auto receive1 (std::make_shared (nano::dev_genesis_key.pub, previous_genesis_chain_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); // Unpocketed. Send to a non-existing account to prevent auto receives from the wallet adjusting expected confirmation height nano::keypair key2; - nano::state_block send2 (nano::genesis_account, receive1->hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1->hash ())); + nano::state_block send2 (nano::dev::genesis->account (), receive1->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1->hash ())); { auto transaction = node->store.tx_begin_write (); diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index 1f593991..acc71493 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -18,7 +18,6 @@ nano::ledger_constants dev_constants (nano::networks::nano_dev_network); nano::keypair const & nano::zero_key (dev_constants.zero_key); nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); -nano::account const & nano::genesis_account (dev_constants.genesis_account ()); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); nano::account const & nano::burn_account (dev_constants.burn_account); diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index bf890b28..b7876ef3 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -56,7 +56,6 @@ class system; extern nano::keypair const & zero_key; extern nano::keypair const & dev_genesis_key; extern nano::public_key const & nano_dev_account; -extern nano::public_key const & genesis_account; extern nano::public_key const & burn_account; extern nano::uint128_t const & genesis_amount; From dea9382b0779ac61d329b7fa3fd66a78092b7d88 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 20 Jul 2021 18:59:54 +0100 Subject: [PATCH 3/7] Removing unused variable. --- nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 2 files changed, 2 deletions(-) diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index acc71493..512763dc 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -15,7 +15,6 @@ namespace nano::ledger_constants dev_constants (nano::networks::nano_dev_network); } -nano::keypair const & nano::zero_key (dev_constants.zero_key); nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index b7876ef3..0f5f4228 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -53,7 +53,6 @@ class telemetry_data; class network_params; class system; -extern nano::keypair const & zero_key; extern nano::keypair const & dev_genesis_key; extern nano::public_key const & nano_dev_account; extern nano::public_key const & burn_account; From 8ff11c6c9ae5cda9582add4db8058b43d565f8e0 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 20 Jul 2021 19:03:39 +0100 Subject: [PATCH 4/7] Using burn_account constant in nano::dev namespace. --- nano/rpc_test/rpc.cpp | 2 +- nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 2a81df54..15ec7358 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -5127,7 +5127,7 @@ TEST (rpc, unopened_burn) system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); auto genesis (node->latest (nano::dev_genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::burn_account, 1)); + auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev::constants.burn_account, 1)); ASSERT_NE (nullptr, send); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index 512763dc..36838a99 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -18,7 +18,6 @@ nano::ledger_constants dev_constants (nano::networks::nano_dev_network); nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); -nano::account const & nano::burn_account (dev_constants.burn_account); void nano::wait_peer_connections (nano::system & system_a) { diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index 0f5f4228..9dc3b07b 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -55,7 +55,6 @@ class system; extern nano::keypair const & dev_genesis_key; extern nano::public_key const & nano_dev_account; -extern nano::public_key const & burn_account; extern nano::uint128_t const & genesis_amount; class stringstream_mt_sink : public boost::iostreams::sink From 12ce2bedc166441e10447d28faf4bfd1604d6d71 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 20 Jul 2021 19:43:41 +0100 Subject: [PATCH 5/7] Moving nano::dev_genesis_key to nano::dev::genesis_key to consolidate unit test related variables in a single place. --- nano/core_test/active_transactions.cpp | 268 ++++---- nano/core_test/block_store.cpp | 80 +-- nano/core_test/bootstrap.cpp | 336 +++++----- nano/core_test/confirmation_height.cpp | 200 +++--- nano/core_test/confirmation_solicitor.cpp | 14 +- nano/core_test/conflicts.cpp | 18 +- nano/core_test/election.cpp | 60 +- nano/core_test/election_scheduler.cpp | 44 +- nano/core_test/frontiers_confirmation.cpp | 48 +- nano/core_test/gap_cache.cpp | 12 +- nano/core_test/ledger.cpp | 630 +++++++++--------- nano/core_test/ledger_walker.cpp | 14 +- nano/core_test/network.cpp | 84 +-- nano/core_test/network_filter.cpp | 12 +- nano/core_test/node.cpp | 754 +++++++++++----------- nano/core_test/processor_service.cpp | 12 +- nano/core_test/request_aggregator.cpp | 84 +-- nano/core_test/system.cpp | 20 +- nano/core_test/telemetry.cpp | 12 +- nano/core_test/uint256_union.cpp | 4 +- nano/core_test/vote_processor.cpp | 60 +- nano/core_test/voting.cpp | 52 +- nano/core_test/wallet.cpp | 134 ++-- nano/core_test/wallets.cpp | 12 +- nano/core_test/websocket.cpp | 102 +-- nano/load_test/entry.cpp | 2 +- nano/nano_node/entry.cpp | 32 +- nano/qt_test/qt.cpp | 88 +-- nano/rpc_test/rpc.cpp | 754 +++++++++++----------- nano/secure/common.cpp | 2 +- nano/secure/common.hpp | 2 +- nano/slow_test/node.cpp | 140 ++-- nano/test_common/system.cpp | 10 +- nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 35 files changed, 2048 insertions(+), 2050 deletions(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index d7cdd33a..c2d7acf0 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -22,7 +22,7 @@ TEST (active_transactions, confirm_active) .previous (genesis.hash ()) .destination (nano::public_key ()) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1.process (*send).code); @@ -43,13 +43,13 @@ TEST (active_transactions, confirm_active) auto election = node2.active.election (send->qualified_root ()); ASSERT_NE (nullptr, election); // Add key to node1 - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Add representative to disabled rep crawler auto peers (node2.network.random_set (1)); ASSERT_FALSE (peers.empty ()); { nano::lock_guard guard (node2.rep_crawler.probable_reps_mutex); - node2.rep_crawler.probable_reps.emplace (nano::dev_genesis_key.pub, nano::genesis_amount, *peers.begin ()); + node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::genesis_amount, *peers.begin ()); } ASSERT_TIMELY (5s, election->votes ().size () != 1); // Votes were inserted (except for not_an_account) auto confirm_req_count (election->confirmation_request_count.load ()); @@ -83,24 +83,24 @@ TEST (active_transactions, confirm_frontier) auto & node2 = *system.add_node (node_flags2); // Add key to node1 - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Add representative to disabled rep crawler auto peers (node2.network.random_set (1)); ASSERT_FALSE (peers.empty ()); { nano::lock_guard guard (node2.rep_crawler.probable_reps_mutex); - node2.rep_crawler.probable_reps.emplace (nano::dev_genesis_key.pub, nano::genesis_amount, *peers.begin ()); + node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::genesis_amount, *peers.begin ()); } nano::genesis genesis; nano::state_block_builder builder; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 100) .link (nano::public_key ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send_copy = builder.make_block ().from (*send).build_shared (); @@ -130,13 +130,13 @@ TEST (active_transactions, keep_local) nano::genesis genesis; //key 1/2 will be managed by the wallet nano::keypair key1, key2, key3, key4, key5, key6; - wallet.insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (wallet.send_action (nano::dev_genesis_key.pub, key1.pub, node.config.receive_minimum.number ())); - auto send2 (wallet.send_action (nano::dev_genesis_key.pub, key2.pub, node.config.receive_minimum.number ())); - auto send3 (wallet.send_action (nano::dev_genesis_key.pub, key3.pub, node.config.receive_minimum.number ())); - auto send4 (wallet.send_action (nano::dev_genesis_key.pub, key4.pub, node.config.receive_minimum.number ())); - auto send5 (wallet.send_action (nano::dev_genesis_key.pub, key5.pub, node.config.receive_minimum.number ())); - auto send6 (wallet.send_action (nano::dev_genesis_key.pub, key6.pub, node.config.receive_minimum.number ())); + wallet.insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (wallet.send_action (nano::dev::genesis_key.pub, key1.pub, node.config.receive_minimum.number ())); + auto send2 (wallet.send_action (nano::dev::genesis_key.pub, key2.pub, node.config.receive_minimum.number ())); + auto send3 (wallet.send_action (nano::dev::genesis_key.pub, key3.pub, node.config.receive_minimum.number ())); + auto send4 (wallet.send_action (nano::dev::genesis_key.pub, key4.pub, node.config.receive_minimum.number ())); + auto send5 (wallet.send_action (nano::dev::genesis_key.pub, key5.pub, node.config.receive_minimum.number ())); + auto send6 (wallet.send_action (nano::dev::genesis_key.pub, key6.pub, node.config.receive_minimum.number ())); // should not drop wallet created transactions ASSERT_TIMELY (5s, node.active.size () == 1); for (auto const & block : { send1, send2, send3, send4, send5, send6 }) @@ -188,16 +188,16 @@ TEST (active_transactions, inactive_votes_cache) { nano::system system (1); auto & node = *system.nodes[0]; - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key; auto send = nano::send_block_builder () .previous (latest) .destination (key.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector (1, send->hash ()))); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector (1, send->hash ()))); node.vote_processor.vote (vote, std::make_shared (node)); ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1); node.process_active (send); @@ -210,16 +210,16 @@ TEST (active_transactions, inactive_votes_cache_non_final) { nano::system system (1); auto & node = *system.nodes[0]; - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key; auto send = nano::send_block_builder () .previous (latest) .destination (key.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector (1, send->hash ()))); // Non-final vote + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector (1, send->hash ()))); // Non-final vote node.vote_processor.vote (vote, std::make_shared (node)); ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1); node.process_active (send); @@ -235,24 +235,24 @@ TEST (active_transactions, inactive_votes_cache_fork) { nano::system system (1); auto & node = *system.nodes[0]; - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key; nano::send_block_builder builder; auto send1 = builder.make_block () .previous (latest) .destination (key.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto send2 = builder.make_block () .previous (latest) .destination (key.pub) .balance (nano::genesis_amount - 200) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector (1, send1->hash ()))); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector (1, send1->hash ()))); node.vote_processor.vote (vote, std::make_shared (node)); auto channel1 (node.network.udp_channels.create (node.network.endpoint ())); ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1); @@ -279,14 +279,14 @@ TEST (active_transactions, inactive_votes_cache_existing_vote) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (node_config); - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key; nano::block_builder builder; auto send = builder.send () .previous (latest) .destination (key.pub) .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto open = builder.state () @@ -336,21 +336,21 @@ TEST (active_transactions, inactive_votes_cache_multiple_votes) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (node_config); - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key1; nano::block_builder builder; auto send1 = builder.send () .previous (latest) .destination (key1.pub) .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto send2 = builder.send () .previous (send1->hash ()) .destination (key1.pub) .balance (100 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto open = builder.state () @@ -369,11 +369,11 @@ TEST (active_transactions, inactive_votes_cache_multiple_votes) // Process votes auto vote1 (std::make_shared (key1.pub, key1.prv, 0, std::vector (1, send1->hash ()))); node.vote_processor.vote (vote1, std::make_shared (node)); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector (1, send1->hash ()))); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector (1, send1->hash ()))); node.vote_processor.vote (vote2, std::make_shared (node)); ASSERT_TIMELY (5s, node.active.find_inactive_votes_cache (send1->hash ()).voters.size () == 2); ASSERT_EQ (1, node.active.inactive_votes_cache_size ()); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); node.scheduler.flush (); auto election = node.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); @@ -387,7 +387,7 @@ TEST (active_transactions, inactive_votes_cache_election_start) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (node_config); - nano::block_hash latest (node.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node.latest (nano::dev::genesis_key.pub)); nano::keypair key1, key2; nano::send_block_builder send_block_builder; nano::state_block_builder state_block_builder; @@ -395,14 +395,14 @@ TEST (active_transactions, inactive_votes_cache_election_start) .previous (latest) .destination (key1.pub) .balance (nano::genesis_amount - 5000 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto send2 = send_block_builder.make_block () .previous (send1->hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 10000 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto open1 = state_block_builder.make_block () @@ -436,14 +436,14 @@ TEST (active_transactions, inactive_votes_cache_election_start) .previous (send2->hash ()) .destination (nano::keypair ().pub) .balance (send2->balance ().number () - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send2->hash ())) .build_shared (); auto send4 = send_block_builder.make_block () .previous (send3->hash ()) .destination (nano::keypair ().pub) .balance (send3->balance ().number () - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send3->hash ())) .build_shared (); // Inactive votes @@ -459,7 +459,7 @@ TEST (active_transactions, inactive_votes_cache_election_start) // Only open1 & open2 blocks elections should start (send4 is missing previous block in ledger) ASSERT_TIMELY (5s, 2 == node.active.size ()); // Confirm elections with weight quorum - auto vote0 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), hashes)); // Final vote for confirmation + auto vote0 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), hashes)); // Final vote for confirmation node.vote_processor.vote (vote0, std::make_shared (node)); ASSERT_TIMELY (5s, node.active.empty ()); ASSERT_TIMELY (5s, 5 == node.ledger.cache.cemented_count); @@ -496,12 +496,12 @@ TEST (active_transactions, vote_replays) nano::keypair key; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); ASSERT_NE (nullptr, send1); @@ -520,7 +520,7 @@ TEST (active_transactions, vote_replays) nano::blocks_confirm (node, { send1, open1 }); ASSERT_EQ (2, node.active.size ()); // First vote is not a replay and confirms the election, second vote should be a replay since the election has confirmed but not yet removed - auto vote_send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send1)); + auto vote_send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send1)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_send1)); ASSERT_EQ (2, node.active.size ()); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1)); @@ -528,7 +528,7 @@ TEST (active_transactions, vote_replays) ASSERT_TIMELY (3s, node.active.size () == 1); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1)); // Open new account - auto vote_open1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), open1)); + auto vote_open1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), open1)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_open1)); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_open1)); ASSERT_TIMELY (3s, node.active.empty ()); @@ -548,7 +548,7 @@ TEST (active_transactions, vote_replays) node.process_active (send2); nano::blocks_confirm (node, { send2 }); ASSERT_EQ (1, node.active.size ()); - auto vote1_send2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send2)); + auto vote1_send2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send2)); auto vote2_send2 (std::make_shared (key.pub, key.prv, 0, send2)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2_send2)); ASSERT_EQ (1, node.active.size ()); @@ -650,12 +650,12 @@ TEST (active_transactions, republish_winner) nano::keypair key; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -667,12 +667,12 @@ TEST (active_transactions, republish_winner) for (auto i (0); i < 5; i++) { auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1 - i) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (fork); @@ -683,12 +683,12 @@ TEST (active_transactions, republish_winner) // Process new fork with vote to change winner auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -696,7 +696,7 @@ TEST (active_transactions, republish_winner) node1.block_processor.flush (); auto election = node1.active.election (fork->qualified_root ()); ASSERT_NE (nullptr, election); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector{ fork->hash () }); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector{ fork->hash () }); node1.vote_processor.vote (vote, std::make_shared (node1)); node1.vote_processor.flush (); node1.block_processor.flush (); @@ -716,12 +716,12 @@ TEST (active_transactions, fork_filter_cleanup) nano::keypair key; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); std::vector block_bytes; @@ -734,12 +734,12 @@ TEST (active_transactions, fork_filter_cleanup) for (auto i (0); i < 10; i++) { auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1 - i) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (fork); @@ -785,12 +785,12 @@ TEST (active_transactions, fork_replacement_tally) { balance -= amount + i; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (keys[i].pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); node1.process_active (send); @@ -806,7 +806,7 @@ TEST (active_transactions, fork_replacement_tally) .build_shared (); node1.process_active (open); // Confirmation - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector{ send->hash (), open->hash () })); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector{ send->hash (), open->hash () })); node1.vote_processor.vote (vote, std::make_shared (node1)); } node1.block_processor.flush (); @@ -814,12 +814,12 @@ TEST (active_transactions, fork_replacement_tally) nano::keypair key; auto send_last = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance - 2 * nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -827,12 +827,12 @@ TEST (active_transactions, fork_replacement_tally) for (auto i (0); i < reps_count; i++) { auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance - nano::Gxrb_ratio - i) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); node1.process_active (fork); @@ -848,12 +848,12 @@ TEST (active_transactions, fork_replacement_tally) for (auto i (0); i < reps_count; i++) { auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance - 1 - i) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto vote (std::make_shared (keys[i].pub, keys[i].prv, 0, std::vector{ fork->hash () })); @@ -886,7 +886,7 @@ TEST (active_transactions, fork_replacement_tally) ASSERT_FALSE (blocks1.find (send_last->hash ()) != blocks1.end ()); // Process vote for correct block & replace existing lowest tally block - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector{ send_last->hash () })); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector{ send_last->hash () })); node1.vote_processor.vote (vote, std::make_shared (node1)); node1.vote_processor.flush (); node2.network.flood_block (send_last); @@ -905,7 +905,7 @@ TEST (active_transactions, fork_replacement_tally) } ASSERT_FALSE (votes2.find (keys[max_blocks].pub) != votes2.end ()); ASSERT_FALSE (votes2.find (keys[max_blocks + 1].pub) != votes2.end ()); - ASSERT_TRUE (votes2.find (nano::dev_genesis_key.pub) != votes2.end ()); + ASSERT_TRUE (votes2.find (nano::dev::genesis_key.pub) != votes2.end ()); } namespace nano @@ -917,15 +917,15 @@ TEST (active_transactions, confirmation_consistency) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node = *system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); for (unsigned i = 0; i < 10; ++i) { - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::public_key (), node.config.receive_minimum.number ())); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::public_key (), node.config.receive_minimum.number ())); ASSERT_NE (nullptr, block); system.deadline_set (5s); while (!node.ledger.block_confirmed (node.store.tx_begin_read (), block->hash ())) { - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); ASSERT_NO_ERROR (system.poll (5ms)); } ASSERT_NO_ERROR (system.poll_until_true (1s, [&node, &block, i] { @@ -947,7 +947,7 @@ TEST (active_transactions, confirm_new) .previous (genesis.hash ()) .destination (nano::public_key ()) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (send); @@ -956,7 +956,7 @@ TEST (active_transactions, confirm_new) ASSERT_EQ (1, node1.active.size ()); auto & node2 = *system.add_node (); // Add key to node2 - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); // Let node2 know about the block ASSERT_TIMELY (5s, node2.block (send->hash ())); // Wait confirmation @@ -974,24 +974,24 @@ TEST (active_transactions, conflicting_block_vote_existing_election) nano::keypair key; nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 100) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto fork = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 200) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); - auto vote_fork (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), fork)); + auto vote_fork (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), fork)); ASSERT_EQ (nano::process_result::progress, node.process_local (send).code); node.scheduler.flush (); @@ -1020,30 +1020,30 @@ TEST (active_transactions, activate_account_chain) nano::keypair key; nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) - .link (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build (); auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 3) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send2->hash ())) .build (); auto open = builder.make_block () @@ -1070,19 +1070,19 @@ TEST (active_transactions, activate_account_chain) ASSERT_EQ (nano::process_result::progress, node.process (*open).code); ASSERT_EQ (nano::process_result::progress, node.process (*receive).code); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); node.scheduler.flush (); auto election1 = node.active.election (send->qualified_root ()); ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, election1->blocks ().count (send->hash ())); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); auto election2 = node.active.election (send->qualified_root ()); ASSERT_EQ (election2, election1); election1->force_confirm (); ASSERT_TIMELY (3s, node.block_confirmed (send->hash ())); // On cementing, the next election is started ASSERT_TIMELY (3s, node.active.active (send2->qualified_root ())); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); auto election3 = node.active.election (send2->qualified_root ()); ASSERT_NE (nullptr, election3); ASSERT_EQ (1, election3->blocks ().count (send2->hash ())); @@ -1091,7 +1091,7 @@ TEST (active_transactions, activate_account_chain) // On cementing, the next election is started ASSERT_TIMELY (3s, node.active.active (open->qualified_root ())); ASSERT_TIMELY (3s, node.active.active (send3->qualified_root ())); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); auto election4 = node.active.election (send3->qualified_root ()); ASSERT_NE (nullptr, election4); ASSERT_EQ (1, election4->blocks ().count (send3->hash ())); @@ -1120,21 +1120,21 @@ TEST (active_transactions, activate_inactive) nano::keypair key; nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (nano::keypair ().pub) .balance (nano::genesis_amount - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); auto open = builder.make_block () @@ -1181,24 +1181,24 @@ TEST (active_transactions, pessimistic_elections) nano::keypair key; nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) - .link (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build (); @@ -1320,24 +1320,24 @@ TEST (active_transactions, list_active) nano::keypair key; nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) - .link (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); @@ -1375,12 +1375,12 @@ TEST (active_transactions, vacancy) auto & node = *system.add_node (config); nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) - .link (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); std::atomic updated = false; @@ -1388,7 +1388,7 @@ TEST (active_transactions, vacancy) ASSERT_EQ (nano::process_result::progress, node.process (*send).code); ASSERT_EQ (1, node.active.vacancy ()); ASSERT_EQ (0, node.active.size ()); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); ASSERT_TIMELY (1s, updated); updated = false; ASSERT_EQ (0, node.active.vacancy ()); @@ -1413,12 +1413,12 @@ TEST (active_transactions, fifo) nano::state_block_builder builder; // Construct two pending entries that can be received simultaneously auto send0 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key0.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send0).code); @@ -1426,12 +1426,12 @@ TEST (active_transactions, fifo) ASSERT_TIMELY (1s, node.block_confirmed (send0->hash ())); ASSERT_TIMELY (1s, node.active.empty ()); auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send0->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key1.pub) .balance (nano::genesis_amount - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send0->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); @@ -1442,7 +1442,7 @@ TEST (active_transactions, fifo) auto receive0 = builder.make_block () .account (key0.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (send0->hash ()) .balance (1) .sign (key0.prv, key0.pub) @@ -1452,7 +1452,7 @@ TEST (active_transactions, fifo) auto receive1 = builder.make_block () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (send1->hash ()) .balance (1) .sign (key1.prv, key1.pub) diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp index 0897a255..bf68e4d1 100644 --- a/nano/core_test/block_store.cpp +++ b/nano/core_test/block_store.cpp @@ -343,10 +343,10 @@ TEST (block_store, genesis) ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.frontier, hash); - auto dev_pub_text (nano::dev_genesis_key.pub.to_string ()); - auto dev_pub_account (nano::dev_genesis_key.pub.to_account ()); - auto dev_prv_text (nano::dev_genesis_key.prv.to_string ()); - ASSERT_EQ (nano::dev::genesis->account (), nano::dev_genesis_key.pub); + auto dev_pub_text (nano::dev::genesis_key.pub.to_string ()); + auto dev_pub_account (nano::dev::genesis_key.pub.to_account ()); + auto dev_prv_text (nano::dev::genesis_key.prv.to_string ()); + ASSERT_EQ (nano::dev::genesis->account (), nano::dev::genesis_key.pub); } TEST (bootstrap, simple) @@ -932,8 +932,8 @@ TEST (block_store, DISABLED_change_dupsort) // Unchecked is no longer dupsort ta auto transaction (store.tx_begin_write ()); ASSERT_EQ (0, mdb_drop (store.env.tx (transaction), store.unchecked_handle, 1)); ASSERT_EQ (0, mdb_dbi_open (store.env.tx (transaction), "unchecked", MDB_CREATE, &store.unchecked_handle)); - auto send1 (std::make_shared (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); - auto send2 (std::make_shared (1, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (0, 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send2 (std::make_shared (1, 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); ASSERT_NE (send1->hash (), send2->hash ()); store.unchecked.put (transaction, send1->hash (), send1); store.unchecked.put (transaction, send1->hash (), send2); @@ -1016,29 +1016,29 @@ TEST (mdb_block_store, sideband_height) auto transaction (store.tx_begin_write ()); store.initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); + nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); - nano::change_block change (receive.hash (), 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive.hash ())); + nano::change_block change (receive.hash (), 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); - nano::state_block state_send1 (nano::dev_genesis_key.pub, change.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change.hash ())); + nano::state_block state_send1 (nano::dev::genesis_key.pub, change.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send1).code); - nano::state_block state_send2 (nano::dev_genesis_key.pub, state_send1.hash (), 0, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send1.hash ())); + nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send1.hash (), 0, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send2).code); - nano::state_block state_send3 (nano::dev_genesis_key.pub, state_send2.hash (), 0, nano::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send2.hash ())); + nano::state_block state_send3 (nano::dev::genesis_key.pub, state_send2.hash (), 0, nano::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send3).code); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_open).code); - nano::state_block epoch (key1.pub, state_open.hash (), 0, nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_open.hash ())); + nano::state_block epoch (key1.pub, state_open.hash (), 0, nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_open.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch).code); ASSERT_EQ (nano::epoch::epoch_1, store.block.version (transaction, epoch.hash ())); - nano::state_block epoch_open (key2.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (key2.pub)); + nano::state_block epoch_open (key2.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch_open).code); ASSERT_EQ (nano::epoch::epoch_1, store.block.version (transaction, epoch_open.hash ())); nano::state_block state_receive (key2.pub, epoch_open.hash (), 0, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (epoch_open.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_receive).code); - nano::open_block open (state_send3.hash (), nano::dev_genesis_key.pub, key3.pub, key3.prv, key3.pub, *pool.generate (key3.pub)); + nano::open_block open (state_send3.hash (), nano::dev::genesis_key.pub, key3.pub, key3.prv, key3.pub, *pool.generate (key3.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); auto block1 (store.block.get (transaction, genesis.hash ())); ASSERT_EQ (block1->sideband ().height, 1); @@ -1274,9 +1274,9 @@ TEST (mdb_block_store, upgrade_v14_v15) nano::genesis genesis; nano::network_params network_params; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block epoch (nano::dev_genesis_key.pub, send.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); - nano::state_block state_send (nano::dev_genesis_key.pub, epoch.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch (nano::dev::genesis_key.pub, send.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); { nano::logger_mt logger; nano::mdb_store store (logger, path); @@ -1317,8 +1317,8 @@ TEST (mdb_block_store, upgrade_v14_v15) store.block.del (transaction, epoch.hash ()); // Turn pending into v14 - ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_0)), 0)); - ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_1)), 0)); + ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0_handle, nano::mdb_val (nano::pending_key (nano::dev::genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_0)), 0)); + ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev::genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::dev::genesis->account (), nano::Gxrb_ratio, nano::epoch::epoch_1)), 0)); // This should fail as sizes are no longer correct for account_info nano::mdb_val value; @@ -1352,7 +1352,7 @@ TEST (mdb_block_store, upgrade_v14_v15) // accounts_v1, state_blocks_v1 & pending_v1 tables should be deleted auto error_get_accounts_v1 (mdb_get (store.env.tx (transaction), store.accounts_v1_handle, nano::mdb_val (nano::dev::genesis->account ()), value)); ASSERT_NE (error_get_accounts_v1, MDB_SUCCESS); - auto error_get_pending_v1 (mdb_get (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), value)); + auto error_get_pending_v1 (mdb_get (store.env.tx (transaction), store.pending_v1_handle, nano::mdb_val (nano::pending_key (nano::dev::genesis_key.pub, state_send.hash ())), value)); ASSERT_NE (error_get_pending_v1, MDB_SUCCESS); auto error_get_state_v1 (mdb_get (store.env.tx (transaction), store.state_blocks_v1_handle, nano::mdb_val (state_send.hash ()), value)); ASSERT_NE (error_get_state_v1, MDB_SUCCESS); @@ -1366,9 +1366,9 @@ TEST (mdb_block_store, upgrade_v14_v15) ASSERT_EQ (block->sideband ().details.epoch, nano::epoch::epoch_0); ASSERT_EQ (info.epoch (), nano::epoch::epoch_1); nano::pending_info pending_info; - store.pending.get (transaction, nano::pending_key (nano::dev_genesis_key.pub, send.hash ()), pending_info); + store.pending.get (transaction, nano::pending_key (nano::dev::genesis_key.pub, send.hash ()), pending_info); ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_0); - store.pending.get (transaction, nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ()), pending_info); + store.pending.get (transaction, nano::pending_key (nano::dev::genesis_key.pub, state_send.hash ()), pending_info); ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_1); // Version should be correct @@ -1430,9 +1430,9 @@ TEST (mdb_block_store, upgrade_v16_v17) } nano::genesis genesis; nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block block1 (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block block2 (nano::dev_genesis_key.pub, block1.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); - nano::state_block block3 (nano::dev_genesis_key.pub, block2.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 2, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block2.hash ())); + nano::state_block block1 (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block block2 (nano::dev::genesis_key.pub, block1.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); + nano::state_block block3 (nano::dev::genesis_key.pub, block2.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block2.hash ())); auto code = [&block1, &block2, &block3] (auto confirmation_height, nano::block_hash const & expected_cemented_frontier) { auto path (nano::unique_path ()); @@ -1499,16 +1499,16 @@ TEST (mdb_block_store, upgrade_v17_v18) nano::keypair key3; nano::network_params network_params; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send_zero (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block state_receive_zero (nano::dev_genesis_key.pub, send_zero.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, send_zero.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send_zero.hash ())); - nano::state_block epoch (nano::dev_genesis_key.pub, state_receive_zero.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_receive_zero.hash ())); - nano::state_block state_send (nano::dev_genesis_key.pub, epoch.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch.hash ())); - nano::state_block state_receive (nano::dev_genesis_key.pub, state_send.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, state_send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send.hash ())); - nano::state_block state_change (nano::dev_genesis_key.pub, state_receive.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_receive.hash ())); - nano::state_block state_send_change (nano::dev_genesis_key.pub, state_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_change.hash ())); - nano::state_block epoch_first (key1.pub, 0, 0, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (key1.pub)); + nano::send_block send_zero (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block state_receive_zero (nano::dev::genesis_key.pub, send_zero.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, send_zero.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send_zero.hash ())); + nano::state_block epoch (nano::dev::genesis_key.pub, state_receive_zero.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive_zero.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); + nano::state_block state_receive (nano::dev::genesis_key.pub, state_send.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, state_send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send.hash ())); + nano::state_block state_change (nano::dev::genesis_key.pub, state_receive.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive.hash ())); + nano::state_block state_send_change (nano::dev::genesis_key.pub, state_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_change.hash ())); + nano::state_block epoch_first (key1.pub, 0, 0, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (key1.pub)); nano::state_block state_receive2 (key1.pub, epoch_first.hash (), key1.pub, nano::Gxrb_ratio, state_send_change.hash (), key1.prv, key1.pub, *pool.generate (epoch_first.hash ())); - nano::state_block state_send2 (nano::dev_genesis_key.pub, state_send_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send_change.hash ())); + nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send_change.hash ())); nano::state_block state_open (key2.pub, 0, key2.pub, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (key2.pub)); nano::state_block state_send_epoch_link (key2.pub, state_open.hash (), key2.pub, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), key2.prv, key2.pub, *pool.generate (state_open.hash ())); { @@ -1700,11 +1700,11 @@ TEST (mdb_block_store, upgrade_v18_v19) nano::keypair key1; nano::work_pool pool (std::numeric_limits::max ()); nano::network_params network_params; - nano::send_block send (nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); - nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); - nano::change_block change (receive.hash (), 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive.hash ())); - nano::state_block state_epoch (nano::dev_genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change.hash ())); - nano::state_block state_send (nano::dev_genesis_key.pub, state_epoch.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_epoch.hash ())); + nano::send_block send (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); + nano::change_block change (receive.hash (), 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive.hash ())); + nano::state_block state_epoch (nano::dev::genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, state_epoch.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_epoch.hash ())); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); { diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp index ef13cba3..17278646 100644 --- a/nano/core_test/bootstrap.cpp +++ b/nano/core_test/bootstrap.cpp @@ -26,11 +26,11 @@ TEST (bulk_pull, genesis_to_end) nano::system system (1); auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); auto req = std::make_unique (); - req->start = nano::dev_genesis_key.pub; + req->start = nano::dev::genesis_key.pub; req->end.clear (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (system.nodes[0]->latest (nano::dev_genesis_key.pub), request->current); + ASSERT_EQ (system.nodes[0]->latest (nano::dev::genesis_key.pub), request->current); ASSERT_EQ (request->request->end, request->request->end); } @@ -40,11 +40,11 @@ TEST (bulk_pull, no_end) nano::system system (1); auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); auto req = std::make_unique (); - req->start = nano::dev_genesis_key.pub; + req->start = nano::dev::genesis_key.pub; req->end = 1; connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (system.nodes[0]->latest (nano::dev_genesis_key.pub), request->current); + ASSERT_EQ (system.nodes[0]->latest (nano::dev::genesis_key.pub), request->current); ASSERT_TRUE (request->request->end.is_zero ()); } @@ -52,9 +52,9 @@ TEST (bulk_pull, end_not_owned) { nano::system system (1); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100)); - nano::block_hash latest (system.nodes[0]->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100)); + nano::block_hash latest (system.nodes[0]->latest (nano::dev::genesis_key.pub)); nano::open_block open (0, 1, 2, nano::keypair ().prv, 4, 5); open.hashables.account = key2.pub; open.hashables.representative = key2.pub; @@ -79,7 +79,7 @@ TEST (bulk_pull, none) auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); nano::genesis genesis; auto req = std::make_unique (); - req->start = nano::dev_genesis_key.pub; + req->start = nano::dev::genesis_key.pub; req->end = genesis.hash (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); @@ -92,7 +92,7 @@ TEST (bulk_pull, get_next_on_open) nano::system system (1); auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); auto req = std::make_unique (); - req->start = nano::dev_genesis_key.pub; + req->start = nano::dev::genesis_key.pub; req->end.clear (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); @@ -145,9 +145,9 @@ TEST (bulk_pull, count_limit) auto node0 (system.nodes[0]); nano::genesis genesis; - auto send1 (std::make_shared (node0->latest (nano::dev_genesis_key.pub), nano::dev_genesis_key.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub)))); + auto send1 (std::make_shared (node0->latest (nano::dev::genesis_key.pub), nano::dev::genesis_key.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (node0->latest (nano::dev::genesis_key.pub)))); ASSERT_EQ (nano::process_result::progress, node0->process (*send1).code); - auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); ASSERT_EQ (nano::process_result::progress, node0->process (*receive1).code); auto connection (std::make_shared (std::make_shared (*node0), node0)); @@ -196,19 +196,19 @@ TEST (bootstrap_processor, process_one) nano::node_flags node_flags; node_flags.disable_bootstrap_bulk_push_client = true; auto node0 = system.add_node (node_config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 100)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 100)); ASSERT_NE (nullptr, send); node_config.peering_port = nano::get_available_port (); node_flags.disable_rep_crawler = true; auto node1 (std::make_shared (system.io_ctx, nano::unique_path (), node_config, system.work, node_flags)); - nano::block_hash hash1 (node0->latest (nano::dev_genesis_key.pub)); - nano::block_hash hash2 (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash hash1 (node0->latest (nano::dev::genesis_key.pub)); + nano::block_hash hash2 (node1->latest (nano::dev::genesis_key.pub)); ASSERT_NE (hash1, hash2); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub)); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub)); + ASSERT_NE (node1->latest (nano::dev::genesis_key.pub), node0->latest (nano::dev::genesis_key.pub)); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == node0->latest (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node1->active.size ()); node1->stop (); } @@ -221,12 +221,12 @@ TEST (bootstrap_processor, process_two) nano::node_flags node_flags; node_flags.disable_bootstrap_bulk_push_client = true; auto node0 (system.add_node (config, node_flags)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash hash1 (node0->latest (nano::dev_genesis_key.pub)); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 50)); - nano::block_hash hash2 (node0->latest (nano::dev_genesis_key.pub)); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 50)); - nano::block_hash hash3 (node0->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash hash1 (node0->latest (nano::dev::genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 50)); + nano::block_hash hash2 (node0->latest (nano::dev::genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 50)); + nano::block_hash hash3 (node0->latest (nano::dev::genesis_key.pub)); ASSERT_NE (hash1, hash2); ASSERT_NE (hash1, hash3); ASSERT_NE (hash2, hash3); @@ -234,8 +234,8 @@ TEST (bootstrap_processor, process_two) auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node1->init_error ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub)); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub)); + ASSERT_NE (node1->latest (nano::dev::genesis_key.pub), node0->latest (nano::dev::genesis_key.pub)); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == node0->latest (nano::dev::genesis_key.pub)); node1->stop (); } @@ -251,24 +251,24 @@ TEST (bootstrap_processor, process_state) nano::genesis genesis; nano::state_block_builder builder; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto block1 = builder - .account (nano::dev_genesis_key.pub) - .previous (node0->latest (nano::dev_genesis_key.pub)) - .representative (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) + .previous (node0->latest (nano::dev::genesis_key.pub)) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 100) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); auto block2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount) .link (block1->hash ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); @@ -278,11 +278,11 @@ TEST (bootstrap_processor, process_state) node0->process (*block2); auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); - ASSERT_EQ (node0->latest (nano::dev_genesis_key.pub), block2->hash ()); - ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), block2->hash ()); + ASSERT_EQ (node0->latest (nano::dev::genesis_key.pub), block2->hash ()); + ASSERT_NE (node1->latest (nano::dev::genesis_key.pub), block2->hash ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub)); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub)); + ASSERT_NE (node1->latest (nano::dev::genesis_key.pub), node0->latest (nano::dev::genesis_key.pub)); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == node0->latest (nano::dev::genesis_key.pub)); ASSERT_TIMELY (10s, node1->active.empty ()); node1->stop (); } @@ -297,15 +297,15 @@ TEST (bootstrap_processor, process_new) auto node1 (system.add_node (config, node_flags)); config.peering_port = nano::get_available_port (); auto node2 (system.add_node (config, node_flags)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; system.wallet (1)->insert_adhoc (key2.prv); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); ASSERT_NE (nullptr, send); ASSERT_TIMELY (10s, !node1->balance (key2.pub).is_zero ()); auto receive (node2->block (node2->latest (key2.pub))); ASSERT_NE (nullptr, receive); - nano::uint128_t balance1 (node1->balance (nano::dev_genesis_key.pub)); + nano::uint128_t balance1 (node1->balance (nano::dev::genesis_key.pub)); nano::uint128_t balance2 (node1->balance (key2.pub)); ASSERT_TIMELY (10s, node1->block_confirmed (send->hash ()) && node1->block_confirmed (receive->hash ()) && node1->active.empty () && node2->active.empty ()); // All blocks should be propagated & confirmed @@ -313,7 +313,7 @@ TEST (bootstrap_processor, process_new) ASSERT_FALSE (node3->init_error ()); node3->bootstrap_initiator.bootstrap (node1->network.endpoint (), false); ASSERT_TIMELY (10s, node3->balance (key2.pub) == balance2); - ASSERT_EQ (balance1, node3->balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (balance1, node3->balance (nano::dev::genesis_key.pub)); node3->stop (); } @@ -326,19 +326,19 @@ TEST (bootstrap_processor, pull_diamond) node_flags.disable_bootstrap_bulk_push_client = true; auto node0 (system.add_node (config, node_flags)); nano::keypair key; - auto send1 (std::make_shared (node0->latest (nano::dev_genesis_key.pub), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub)))); + auto send1 (std::make_shared (node0->latest (nano::dev::genesis_key.pub), key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (node0->latest (nano::dev::genesis_key.pub)))); ASSERT_EQ (nano::process_result::progress, node0->process (*send1).code); auto open (std::make_shared (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node0->process (*open).code); - auto send2 (std::make_shared (open->hash (), nano::dev_genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); + auto send2 (std::make_shared (open->hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); ASSERT_EQ (nano::process_result::progress, node0->process (*send2).code); - auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); ASSERT_EQ (nano::process_result::progress, node0->process (*receive).code); auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node1->init_error ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_TIMELY (10s, node1->balance (nano::dev_genesis_key.pub) == 100); - ASSERT_EQ (100, node1->balance (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node1->balance (nano::dev::genesis_key.pub) == 100); + ASSERT_EQ (100, node1->balance (nano::dev::genesis_key.pub)); node1->stop (); } @@ -359,12 +359,12 @@ TEST (bootstrap_processor, DISABLED_pull_requeue_network_error) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -377,7 +377,7 @@ TEST (bootstrap_processor, DISABLED_pull_requeue_network_error) nano::unique_lock lock (node1->bootstrap_initiator.connections->mutex); ASSERT_FALSE (attempt->stopped); ++attempt->pulling; - node1->bootstrap_initiator.connections->pulls.emplace_back (nano::dev_genesis_key.pub, send1->hash (), genesis.hash (), attempt->incremental_id); + node1->bootstrap_initiator.connections->pulls.emplace_back (nano::dev::genesis_key.pub, send1->hash (), genesis.hash (), attempt->incremental_id); node1->bootstrap_initiator.connections->request_pull (lock); node2->stop (); } @@ -395,19 +395,19 @@ TEST (bootstrap_processor, push_diamond) auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node1->init_error ()); auto wallet1 (node1->wallets.create (100)); - wallet1->insert_adhoc (nano::dev_genesis_key.prv); + wallet1->insert_adhoc (nano::dev::genesis_key.prv); wallet1->insert_adhoc (key.prv); - auto send1 (std::make_shared (node0->latest (nano::dev_genesis_key.pub), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub)))); + auto send1 (std::make_shared (node0->latest (nano::dev::genesis_key.pub), key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (node0->latest (nano::dev::genesis_key.pub)))); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto open (std::make_shared (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); - auto send2 (std::make_shared (open->hash (), nano::dev_genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); + auto send2 (std::make_shared (open->hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); - auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*receive).code); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_TIMELY (10s, node0->balance (nano::dev_genesis_key.pub) == 100); - ASSERT_EQ (100, node0->balance (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node0->balance (nano::dev::genesis_key.pub) == 100); + ASSERT_EQ (100, node0->balance (nano::dev::genesis_key.pub)); node1->stop (); } @@ -424,8 +424,8 @@ TEST (bootstrap_processor, push_diamond_pruning) node_flags.enable_pruning = true; auto node1 (std::make_shared (system.io_ctx, nano::unique_path (), config, system.work, node_flags, 1)); ASSERT_FALSE (node1->init_error ()); - auto latest (node0->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (latest, key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest))); + auto latest (node0->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (latest, key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto open (std::make_shared (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); @@ -433,9 +433,9 @@ TEST (bootstrap_processor, push_diamond_pruning) node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); ASSERT_TIMELY (10s, node0->balance (key.pub) == nano::genesis_amount); // Process more blocks & prune old - auto send2 (std::make_shared (open->hash (), nano::dev_genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); + auto send2 (std::make_shared (open->hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); - auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto receive (std::make_shared (send1->hash (), send2->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*receive).code); { auto transaction (node1->store.tx_begin_write ()); @@ -453,8 +453,8 @@ TEST (bootstrap_processor, push_diamond_pruning) } // 2nd bootstrap node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_TIMELY (10s, node0->balance (nano::dev_genesis_key.pub) == 100); - ASSERT_EQ (100, node0->balance (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node0->balance (nano::dev::genesis_key.pub) == 100); + ASSERT_EQ (100, node0->balance (nano::dev::genesis_key.pub)); node1->stop (); } @@ -468,13 +468,13 @@ TEST (bootstrap_processor, push_one) auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); auto wallet (node1->wallets.create (nano::random_wallet_id ())); ASSERT_NE (nullptr, wallet); - wallet->insert_adhoc (nano::dev_genesis_key.prv); - nano::uint128_t balance1 (node1->balance (nano::dev_genesis_key.pub)); - auto send (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); + wallet->insert_adhoc (nano::dev::genesis_key.prv); + nano::uint128_t balance1 (node1->balance (nano::dev::genesis_key.pub)); + auto send (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, 100)); ASSERT_NE (nullptr, send); - ASSERT_NE (balance1, node1->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (balance1, node1->balance (nano::dev::genesis_key.pub)); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_TIMELY (10s, node0->balance (nano::dev_genesis_key.pub) != balance1); + ASSERT_TIMELY (10s, node0->balance (nano::dev::genesis_key.pub) != balance1); node1->stop (); } @@ -494,12 +494,12 @@ TEST (bootstrap_processor, lazy_hash) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -569,12 +569,12 @@ TEST (bootstrap_processor, lazy_hash_bootstrap_id) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -646,52 +646,52 @@ TEST (bootstrap_processor, lazy_hash_pruning) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount) .link (send1->hash ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (send1->hash ())) .build_shared (); auto change1 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (receive1->hash ()) .representative (key1.pub) .balance (nano::genesis_amount) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (receive1->hash ())) .build_shared (); auto change2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (change1->hash ()) .representative (key2.pub) .balance (nano::genesis_amount) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (change1->hash ())) .build_shared (); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (change2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (change2->hash ())) .build_shared (); auto receive2 = builder @@ -780,12 +780,12 @@ TEST (bootstrap_processor, lazy_max_pull_count) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -832,7 +832,7 @@ TEST (bootstrap_processor, lazy_max_pull_count) .make_block () .account (key2.pub) .previous (change1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (0) .sign (key2.prv, key2.pub) @@ -883,23 +883,23 @@ TEST (bootstrap_processor, lazy_unclear_state_link) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); @@ -946,12 +946,12 @@ TEST (bootstrap_processor, lazy_unclear_state_link_not_existing) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); @@ -998,23 +998,23 @@ TEST (bootstrap_processor, DISABLED_lazy_destinations) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); @@ -1063,23 +1063,23 @@ TEST (bootstrap_processor, lazy_pruning_missing_block) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1->process_active (send1); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); node1->process_active (send2); @@ -1158,12 +1158,12 @@ TEST (bootstrap_processor, lazy_cancel) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); @@ -1198,12 +1198,12 @@ TEST (bootstrap_processor, wallet_lazy_frontier) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -1277,12 +1277,12 @@ TEST (bootstrap_processor, wallet_lazy_pending) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -1339,12 +1339,12 @@ TEST (bootstrap_processor, multiple_attempts) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (genesis.hash ())) .build_shared (); auto receive1 = builder @@ -1433,7 +1433,7 @@ TEST (frontier_req, begin) req->count = std::numeric_limitscount)>::max (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (nano::dev_genesis_key.pub, request->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request->current); nano::genesis genesis; ASSERT_EQ (genesis.hash (), request->frontier); } @@ -1443,7 +1443,7 @@ TEST (frontier_req, end) nano::system system (1); auto connection (std::make_shared (std::make_shared (*system.nodes[0]), system.nodes[0])); auto req = std::make_unique (); - req->start = nano::dev_genesis_key.pub.number () + 1; + req->start = nano::dev::genesis_key.pub.number () + 1; req->age = std::numeric_limitsage)>::max (); req->count = std::numeric_limitscount)>::max (); connection->requests.push (std::unique_ptr{}); @@ -1461,12 +1461,12 @@ TEST (frontier_req, count) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1->work_generate_blocking (*send1); @@ -1475,7 +1475,7 @@ TEST (frontier_req, count) .make_block () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -1491,7 +1491,7 @@ TEST (frontier_req, count) req->count = 1; connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (nano::dev_genesis_key.pub, request->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request->current); ASSERT_EQ (send1->hash (), request->frontier); } @@ -1505,7 +1505,7 @@ TEST (frontier_req, time_bound) req->count = std::numeric_limitscount)>::max (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (nano::dev_genesis_key.pub, request->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request->current); // Wait 2 seconds until age of account will be > 1 seconds std::this_thread::sleep_for (std::chrono::milliseconds (2100)); auto req2 (std::make_unique ()); @@ -1528,7 +1528,7 @@ TEST (frontier_req, time_cutoff) req->count = std::numeric_limitscount)>::max (); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (nano::dev_genesis_key.pub, request->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request->current); nano::genesis genesis; ASSERT_EQ (genesis.hash (), request->frontier); // Wait 4 seconds until age of account will be > 3 seconds @@ -1550,13 +1550,13 @@ TEST (frontier_req, confirmed_frontier) nano::genesis genesis; nano::raw_key priv_key; // Public key before genesis in accounts table - while (nano::pub_key (priv_key).number () >= nano::dev_genesis_key.pub.number ()) + while (nano::pub_key (priv_key).number () >= nano::dev::genesis_key.pub.number ()) { priv_key = nano::keypair ().prv; } nano::keypair key_before_genesis (priv_key.to_string ()); // Public key after genesis in accounts table - while (nano::pub_key (priv_key).number () <= nano::dev_genesis_key.pub.number ()) + while (nano::pub_key (priv_key).number () <= nano::dev::genesis_key.pub.number ()) { priv_key = nano::keypair ().prv; } @@ -1564,24 +1564,24 @@ TEST (frontier_req, confirmed_frontier) nano::state_block_builder builder; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key_before_genesis.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1->work_generate_blocking (*send1); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key_after_genesis.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1->work_generate_blocking (*send2); @@ -1590,7 +1590,7 @@ TEST (frontier_req, confirmed_frontier) .make_block () .account (key_before_genesis.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send1->hash ()) .sign (key_before_genesis.prv, key_before_genesis.pub) @@ -1602,7 +1602,7 @@ TEST (frontier_req, confirmed_frontier) .make_block () .account (key_after_genesis.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send2->hash ()) .sign (key_after_genesis.prv, key_after_genesis.pub) @@ -1622,7 +1622,7 @@ TEST (frontier_req, confirmed_frontier) ASSERT_TRUE (req->header.frontier_req_is_only_confirmed_present ()); connection->requests.push (std::unique_ptr{}); auto request (std::make_shared (connection, std::move (req))); - ASSERT_EQ (nano::dev_genesis_key.pub, request->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request->current); ASSERT_EQ (genesis.hash (), request->frontier); // Request starting with account before genesis (confirmed only) @@ -1636,7 +1636,7 @@ TEST (frontier_req, confirmed_frontier) ASSERT_TRUE (req2->header.frontier_req_is_only_confirmed_present ()); connection2->requests.push (std::unique_ptr{}); auto request2 (std::make_shared (connection2, std::move (req2))); - ASSERT_EQ (nano::dev_genesis_key.pub, request2->current); + ASSERT_EQ (nano::dev::genesis_key.pub, request2->current); ASSERT_EQ (genesis.hash (), request2->frontier); // Request starting with account after genesis (confirmed only) @@ -1719,21 +1719,21 @@ TEST (bulk, genesis) node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_lazy_bootstrap = true; auto node1 = system.add_node (config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto node2 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node2->init_error ()); - nano::block_hash latest1 (node1->latest (nano::dev_genesis_key.pub)); - nano::block_hash latest2 (node2->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest1 (node1->latest (nano::dev::genesis_key.pub)); + nano::block_hash latest2 (node2->latest (nano::dev::genesis_key.pub)); ASSERT_EQ (latest1, latest2); nano::keypair key2; - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100)); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, send); - nano::block_hash latest3 (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest3 (node1->latest (nano::dev::genesis_key.pub)); ASSERT_NE (latest1, latest3); node2->bootstrap_initiator.bootstrap (node1->network.endpoint (), false); - ASSERT_TIMELY (10s, node2->latest (nano::dev_genesis_key.pub) == node1->latest (nano::dev_genesis_key.pub)); - ASSERT_EQ (node2->latest (nano::dev_genesis_key.pub), node1->latest (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node2->latest (nano::dev::genesis_key.pub) == node1->latest (nano::dev::genesis_key.pub)); + ASSERT_EQ (node2->latest (nano::dev::genesis_key.pub), node1->latest (nano::dev::genesis_key.pub)); node2->stop (); } @@ -1746,7 +1746,7 @@ TEST (bulk, offline_send) node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_lazy_bootstrap = true; auto node1 = system.add_node (config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto node2 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node2->init_error ()); node2->start (); @@ -1754,9 +1754,9 @@ TEST (bulk, offline_send) nano::keypair key2; auto wallet (node2->wallets.create (nano::random_wallet_id ())); wallet->insert_adhoc (key2.prv); - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); ASSERT_NE (nullptr, send1); - ASSERT_NE (std::numeric_limits::max (), node1->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (std::numeric_limits::max (), node1->balance (nano::dev::genesis_key.pub)); node1->block_processor.flush (); node1->scheduler.flush (); // Wait to finish election background tasks @@ -1771,7 +1771,7 @@ TEST (bulk, offline_send) ASSERT_NO_ERROR (system.poll ()); } while (node1->network.empty () || node2->network.empty ()); // Send block arrival via bootstrap - ASSERT_TIMELY (10s, node2->balance (nano::dev_genesis_key.pub) != std::numeric_limits::max ()); + ASSERT_TIMELY (10s, node2->balance (nano::dev::genesis_key.pub) != std::numeric_limits::max ()); // Receiving send block ASSERT_TIMELY (20s, node2->balance (key2.pub) == node1->config.receive_minimum.number ()); node2->stop (); @@ -1789,25 +1789,25 @@ TEST (bulk, genesis_pruning) node_flags.disable_ongoing_bootstrap = true; node_flags.enable_pruning = true; auto node1 = system.add_node (config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node_flags.enable_pruning = false; auto node2 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); ASSERT_FALSE (node2->init_error ()); - nano::block_hash latest1 (node1->latest (nano::dev_genesis_key.pub)); - nano::block_hash latest2 (node2->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest1 (node1->latest (nano::dev::genesis_key.pub)); + nano::block_hash latest2 (node2->latest (nano::dev::genesis_key.pub)); ASSERT_EQ (latest1, latest2); nano::keypair key2; - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100)); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, send1); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100)); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, send2); - auto send3 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100)); + auto send3 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, send3); { auto transaction (node1->wallets.tx_begin_write ()); - system.wallet (0)->store.erase (transaction, nano::dev_genesis_key.pub); + system.wallet (0)->store.erase (transaction, nano::dev::genesis_key.pub); } - nano::block_hash latest3 (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest3 (node1->latest (nano::dev::genesis_key.pub)); ASSERT_NE (latest1, latest3); ASSERT_EQ (send3->hash (), latest3); // Confirm last block to prune previous @@ -1855,8 +1855,8 @@ TEST (bulk, genesis_pruning) // New bootstrap ASSERT_TIMELY (5s, node2->bootstrap_initiator.connections->connections_count == 0); node2->bootstrap_initiator.bootstrap (node1->network.endpoint (), false); - ASSERT_TIMELY (10s, node2->latest (nano::dev_genesis_key.pub) == node1->latest (nano::dev_genesis_key.pub)); - ASSERT_EQ (node2->latest (nano::dev_genesis_key.pub), node1->latest (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node2->latest (nano::dev::genesis_key.pub) == node1->latest (nano::dev::genesis_key.pub)); + ASSERT_EQ (node2->latest (nano::dev::genesis_key.pub), node1->latest (nano::dev::genesis_key.pub)); node2->stop (); } @@ -1865,7 +1865,7 @@ TEST (bulk_pull_account, basics) nano::system system (1); system.nodes[0]->config.receive_minimum = 20; nano::keypair key1; - 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 (key1.prv); auto send1 (system.wallet (0)->send_action (nano::dev::genesis->account (), key1.pub, 25)); auto send2 (system.wallet (0)->send_action (nano::dev::genesis->account (), key1.pub, 10)); diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp index 6dba764a..edd60acc 100644 --- a/nano/core_test/confirmation_height.cpp +++ b/nano/core_test/confirmation_height.cpp @@ -38,15 +38,15 @@ TEST (confirmation_height, single) node_flags.confirmation_height_processor_mode = mode_a; auto node = system.add_node (node_flags); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest1 (node->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, latest1, nano::dev_genesis_key.pub, amount - 100, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest1 (node->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, latest1, nano::dev::genesis_key.pub, amount - 100, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1))); // Check confirmation heights before, should be uninitialized (1 for genesis). nano::confirmation_height_info confirmation_height_info; add_callback_stats (*node); auto transaction = node->store.tx_begin_read (); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); @@ -58,7 +58,7 @@ TEST (confirmation_height, single) { auto transaction = node->store.tx_begin_write (); ASSERT_TRUE (node->ledger.block_confirmed (transaction, send1->hash ())); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (2, confirmation_height_info.height); ASSERT_EQ (send1->hash (), confirmation_height_info.frontier); @@ -90,12 +90,12 @@ TEST (confirmation_height, multiple_accounts) nano::keypair key1; nano::keypair key2; nano::keypair key3; - nano::block_hash latest1 (system.nodes[0]->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest1 (system.nodes[0]->latest (nano::dev::genesis_key.pub)); // Send to all accounts - nano::send_block send1 (latest1, key1.pub, node->online_reps.delta () + 300, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)); - nano::send_block send2 (send1.hash (), key2.pub, node->online_reps.delta () + 200, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::send_block send3 (send2.hash (), key3.pub, node->online_reps.delta () + 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ())); + nano::send_block send1 (latest1, key1.pub, node->online_reps.delta () + 300, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1)); + nano::send_block send2 (send1.hash (), key2.pub, node->online_reps.delta () + 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block send3 (send2.hash (), key3.pub, node->online_reps.delta () + 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); // Open all accounts nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); @@ -132,7 +132,7 @@ TEST (confirmation_height, multiple_accounts) // Check confirmation heights of all the accounts (except genesis) are uninitialized (0), // as we have any just added them to the ledger and not processed any live transactions yet. nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); ASSERT_TRUE (node->store.confirmation_height.get (transaction, key1.pub, confirmation_height_info)); @@ -162,8 +162,8 @@ TEST (confirmation_height, multiple_accounts) auto & store = node->store; auto transaction = node->store.tx_begin_read (); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ())); - ASSERT_FALSE (store.account.get (transaction, nano::dev_genesis_key.pub, account_info)); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (store.account.get (transaction, nano::dev::genesis_key.pub, account_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (4, confirmation_height_info.height); ASSERT_EQ (send3.hash (), confirmation_height_info.frontier); ASSERT_EQ (4, account_info.block_count); @@ -198,7 +198,7 @@ TEST (confirmation_height, multiple_accounts) // Confirm the other latest can't be rolled back either ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (key3.pub))); - ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (nano::dev_genesis_key.pub))); + ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (nano::dev::genesis_key.pub))); // Attempt some others which have been cemented ASSERT_TRUE (node->ledger.rollback (transaction, open1.hash ())); @@ -225,11 +225,11 @@ TEST (confirmation_height, gap_bootstrap) auto & node1 = *system.add_node (node_flags); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -259,7 +259,7 @@ TEST (confirmation_height, gap_bootstrap) ASSERT_EQ (unchecked_count, 2); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node1.store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node1.store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); } @@ -275,7 +275,7 @@ TEST (confirmation_height, gap_bootstrap) ASSERT_EQ (unchecked_count, 0); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node1.store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node1.store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); ASSERT_TRUE (node1.store.confirmation_height.get (transaction, destination.pub, confirmation_height_info)); @@ -307,15 +307,15 @@ TEST (confirmation_height, gap_live) node_config.receive_minimum = nano::genesis_amount; // Prevent auto-receive & open1/receive1/receive2 blocks conflicts system.add_node (node_config, node_flags); nano::keypair destination; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (destination.prv); nano::genesis genesis; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); @@ -341,7 +341,7 @@ TEST (confirmation_height, gap_live) { auto transaction = node->store.tx_begin_read (); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (nano::dev::genesis->hash (), confirmation_height_info.frontier); } @@ -363,7 +363,7 @@ TEST (confirmation_height, gap_live) nano::confirmation_height_info confirmation_height_info; ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive2->hash ())); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (4, confirmation_height_info.height); ASSERT_EQ (send3->hash (), confirmation_height_info.frontier); ASSERT_FALSE (node->store.confirmation_height.get (transaction, destination.pub, confirmation_height_info)); @@ -392,24 +392,24 @@ TEST (confirmation_height, send_receive_between_2_accounts) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); nano::keypair key1; - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); - nano::send_block send1 (latest, key1.pub, node->online_reps.delta () + 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (latest, key1.pub, node->online_reps.delta () + 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::send_block send2 (open1.hash (), nano::dev::genesis->account (), 1000, key1.prv, key1.pub, *system.work.generate (open1.hash ())); nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), 900, key1.prv, key1.pub, *system.work.generate (send2.hash ())); nano::send_block send4 (send3.hash (), nano::dev::genesis->account (), 500, key1.prv, key1.pub, *system.work.generate (send3.hash ())); - nano::receive_block receive1 (send1.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::receive_block receive2 (receive1.hash (), send3.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1.hash ())); - nano::receive_block receive3 (receive2.hash (), send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::receive_block receive1 (send1.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::receive_block receive2 (receive1.hash (), send3.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1.hash ())); + nano::receive_block receive3 (receive2.hash (), send4.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); - nano::send_block send5 (receive3.hash (), key1.pub, node->online_reps.delta () + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive3.hash ())); + nano::send_block send5 (receive3.hash (), key1.pub, node->online_reps.delta () + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive3.hash ())); auto receive4 = std::make_shared (send4.hash (), send5.hash (), key1.prv, key1.pub, *system.work.generate (send4.hash ())); // Unpocketed send nano::keypair key2; - nano::send_block send6 (send5.hash (), key2.pub, node->online_reps.delta (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5.hash ())); + nano::send_block send6 (send5.hash (), key2.pub, node->online_reps.delta (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); @@ -443,8 +443,8 @@ TEST (confirmation_height, send_receive_between_2_accounts) ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive4->hash ())); nano::account_info account_info; nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.account.get (transaction, nano::dev_genesis_key.pub, account_info)); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.account.get (transaction, nano::dev::genesis_key.pub, account_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (6, confirmation_height_info.height); ASSERT_EQ (send5.hash (), confirmation_height_info.frontier); ASSERT_EQ (7, account_info.block_count); @@ -476,19 +476,19 @@ TEST (confirmation_height, send_receive_self) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); - nano::send_block send1 (latest, nano::dev_genesis_key.pub, nano::genesis_amount - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1.hash ())); - nano::send_block send3 (send2.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ())); + nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); - nano::receive_block receive2 (send3.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); - auto receive3 = std::make_shared (receive2.hash (), send3.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::receive_block receive2 (send3.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); + auto receive3 = std::make_shared (receive2.hash (), send3.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); // Send to another account to prevent automatic receiving on the genesis account nano::keypair key1; - nano::send_block send4 (receive3->hash (), key1.pub, node->online_reps.delta (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive3->hash ())); + nano::send_block send4 (receive3->hash (), key1.pub, node->online_reps.delta (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive3->hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); @@ -513,9 +513,9 @@ TEST (confirmation_height, send_receive_self) auto transaction (node->store.tx_begin_read ()); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ())); nano::account_info account_info; - ASSERT_FALSE (node->store.account.get (transaction, nano::dev_genesis_key.pub, account_info)); + ASSERT_FALSE (node->store.account.get (transaction, nano::dev::genesis_key.pub, account_info)); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (7, confirmation_height_info.height); ASSERT_EQ (receive3->hash (), confirmation_height_info.frontier); ASSERT_EQ (8, account_info.block_count); @@ -539,14 +539,14 @@ TEST (confirmation_height, all_block_types) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; nano::keypair key2; auto & store = node->store; - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::state_block state_open (key2.pub, 0, 0, nano::Gxrb_ratio, send1.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)); nano::send_block send2 (open.hash (), key2.pub, 0, key1.prv, key1.pub, *system.work.generate (open.hash ())); @@ -557,19 +557,19 @@ TEST (confirmation_height, all_block_types) nano::change_block change (receive.hash (), key2.pub, key1.prv, key1.pub, *system.work.generate (receive.hash ())); - nano::state_block state_change (key2.pub, state_send.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *system.work.generate (state_send.hash ())); + nano::state_block state_change (key2.pub, state_send.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *system.work.generate (state_send.hash ())); - nano::state_block epoch (key2.pub, state_change.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (state_change.hash ())); + nano::state_block epoch (key2.pub, state_change.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (state_change.hash ())); - nano::state_block epoch1 (key1.pub, change.hash (), key2.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (change.hash ())); + nano::state_block epoch1 (key1.pub, change.hash (), key2.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (change.hash ())); nano::state_block state_send1 (key1.pub, epoch1.hash (), 0, nano::Gxrb_ratio - 1, key2.pub, key1.prv, key1.pub, *system.work.generate (epoch1.hash ())); nano::state_block state_receive2 (key2.pub, epoch.hash (), 0, nano::Gxrb_ratio + 1, state_send1.hash (), key2.prv, key2.pub, *system.work.generate (epoch.hash ())); auto state_send2 = std::make_shared (key2.pub, state_receive2.hash (), 0, nano::Gxrb_ratio, key1.pub, key2.prv, key2.pub, *system.work.generate (state_receive2.hash ())); nano::state_block state_send3 (key2.pub, state_send2->hash (), 0, nano::Gxrb_ratio - 1, key1.pub, key2.prv, key2.pub, *system.work.generate (state_send2->hash ())); - nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::dev_genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ())); - nano::state_block state_receive3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::dev::genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ())); + nano::state_block state_receive3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); { auto transaction (store.tx_begin_write ()); @@ -611,8 +611,8 @@ TEST (confirmation_height, all_block_types) ASSERT_TRUE (node->ledger.block_confirmed (transaction, state_send2->hash ())); nano::account_info account_info; nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.account.get (transaction, nano::dev_genesis_key.pub, account_info)); - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.account.get (transaction, nano::dev::genesis_key.pub, account_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (3, confirmation_height_info.height); ASSERT_EQ (send1.hash (), confirmation_height_info.frontier); ASSERT_LE (4, account_info.block_count); @@ -656,10 +656,10 @@ TEST (confirmation_height, conflict_rollback_cemented) ASSERT_EQ (1, node1->network.size ()); nano::keypair key1; nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); nano::publish publish1 (send1); nano::keypair key2; - auto send2 (std::make_shared (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send2 (std::make_shared (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); nano::publish publish2 (send2); auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ())); node1->network.inbound (publish1, channel1); @@ -671,7 +671,7 @@ TEST (confirmation_height, conflict_rollback_cemented) node2->scheduler.flush (); ASSERT_EQ (1, node1->active.size ()); ASSERT_EQ (1, node2->active.size ()); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node1->network.inbound (publish2, channel1); node1->block_processor.flush (); node2->network.inbound (publish1, channel2); @@ -729,7 +729,7 @@ TEST (confirmation_heightDeathTest, rollback_added_block) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -759,9 +759,9 @@ TEST (confirmation_height, observers) node_flags.confirmation_height_processor_mode = mode_a; auto node1 = system.add_node (node_flags); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest1 (node1->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (latest1, key1.pub, amount - node1->config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest1 (node1->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (latest1, key1.pub, amount - node1->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1))); add_callback_stats (*node1); @@ -806,7 +806,7 @@ TEST (confirmation_heightDeathTest, modified_chain) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -877,7 +877,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open = std::make_shared (key1.pub, 0, 0, nano::Gxrb_ratio, send->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); { auto transaction (store->tx_begin_write ()); @@ -936,12 +936,12 @@ TEST (confirmation_height, pending_observer_callbacks) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); { auto transaction = node->store.tx_begin_write (); @@ -979,16 +979,16 @@ TEST (confirmation_height, callback_confirmed_history) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); } - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ())); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); add_callback_stats (*node); @@ -1060,12 +1060,12 @@ TEST (confirmation_height, dependent_election) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ())); - auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())); + auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); + auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); @@ -1110,27 +1110,27 @@ TEST (confirmation_height, cemented_gap_below_receive) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; system.wallet (0)->insert_adhoc (key1.prv); - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::keypair dummy_key; - nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); - nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); + nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); - nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send.hash ())); - nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send.hash ())); + nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); nano::keypair key2; system.wallet (0)->insert_adhoc (key2.prv); - nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); - nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); + nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); + nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); @@ -1195,27 +1195,27 @@ TEST (confirmation_height, cemented_gap_below_no_cache) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; system.wallet (0)->insert_adhoc (key1.prv); - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::keypair dummy_key; - nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); - nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); + nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); - nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send.hash ())); - nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send.hash ())); + nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); nano::keypair key2; system.wallet (0)->insert_adhoc (key2.prv); - nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); - nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); + nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); + nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); @@ -1278,12 +1278,12 @@ TEST (confirmation_height, election_winner_details_clearing) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ())); - auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())); + auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); + auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); { auto transaction = node->store.tx_begin_write (); @@ -1344,7 +1344,7 @@ TEST (confirmation_height, election_winner_details_clearing_node_process_confirm nano::system system (1); auto node = system.nodes.front (); - auto send = std::make_shared (nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ())); // Add to election_winner_details. Use an unrealistic iteration so that it should fall into the else case and do a cleanup node->active.add_election_winner_details (send->hash (), nullptr); nano::election_status election; @@ -1372,8 +1372,8 @@ TEST (confirmation_height, unbounded_block_cache_iteration) nano::work_pool pool (std::numeric_limits::max ()); nano::logging logging; nano::keypair key1; - auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send->hash ())); + auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send->hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -1422,7 +1422,7 @@ TEST (confirmation_height, pruned_source) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1, key2; - auto send1 = std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 100, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send1 = std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 100, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open1 = std::make_shared (key1.pub, 0, key1.pub, 100, send1->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); auto send2 = std::make_shared (key1.pub, open1->hash (), key1.pub, 50, key2.pub, key1.prv, key1.pub, *pool.generate (open1->hash ())); auto send3 = std::make_shared (key1.pub, send2->hash (), key1.pub, 25, key2.pub, key1.prv, key1.pub, *pool.generate (send2->hash ())); diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp index 13a297c8..19572e40 100644 --- a/nano/core_test/confirmation_solicitor.cpp +++ b/nano/core_test/confirmation_solicitor.cpp @@ -19,16 +19,16 @@ TEST (confirmation_solicitor, batches) auto & node2 = *system.add_node (node_flags); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); // Solicitor will only solicit from this representative - nano::representative representative (nano::dev_genesis_key.pub, nano::genesis_amount, channel1); + nano::representative representative (nano::dev::genesis_key.pub, nano::genesis_amount, channel1); std::vector representatives{ representative }; nano::confirmation_solicitor solicitor (node2.network, node2.config); solicitor.prepare (representatives); // Ensure the representatives are correct ASSERT_EQ (1, representatives.size ()); ASSERT_EQ (channel1, representatives.front ().channel); - ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account); + ASSERT_EQ (nano::dev::genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); { nano::lock_guard guard (node2.active.mutex); @@ -63,16 +63,16 @@ TEST (confirmation_solicitor, different_hash) auto & node2 = *system.add_node (node_flags); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); // Solicitor will only solicit from this representative - nano::representative representative (nano::dev_genesis_key.pub, nano::genesis_amount, channel1); + nano::representative representative (nano::dev::genesis_key.pub, nano::genesis_amount, channel1); std::vector representatives{ representative }; nano::confirmation_solicitor solicitor (node2.network, node2.config); solicitor.prepare (representatives); // Ensure the representatives are correct ASSERT_EQ (1, representatives.size ()); ASSERT_EQ (channel1, representatives.front ().channel); - ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account); + ASSERT_EQ (nano::dev::genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner @@ -108,7 +108,7 @@ TEST (confirmation_solicitor, bypass_max_requests_cap) ASSERT_EQ (max_representatives + 1, representatives.size ()); solicitor.prepare (representatives); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner diff --git a/nano/core_test/conflicts.cpp b/nano/core_test/conflicts.cpp index 33940bab..cfbb4c3b 100644 --- a/nano/core_test/conflicts.cpp +++ b/nano/core_test/conflicts.cpp @@ -14,11 +14,11 @@ TEST (conflicts, start_stop) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); ASSERT_EQ (0, node1.active.size ()); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); ASSERT_EQ (1, node1.active.size ()); @@ -32,14 +32,14 @@ TEST (conflicts, add_existing) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); nano::keypair key2; - auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); send2->sideband_set ({}); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election1 = node1.active.election (send2->qualified_root ()); ASSERT_NE (nullptr, election1); @@ -57,16 +57,16 @@ TEST (conflicts, add_two) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); node1.block_confirm (send1); node1.active.election (send1->qualified_root ())->force_confirm (); nano::keypair key2; - auto send2 (std::make_shared (send1->hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (send1->hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); ASSERT_EQ (2, node1.active.size ()); } diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp index 3c0d77e3..c731faa6 100644 --- a/nano/core_test/election.cpp +++ b/nano/core_test/election.cpp @@ -28,24 +28,24 @@ TEST (election, quorum_minimum_flip_success) nano::keypair key1; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send1); nano::keypair key2; auto send2 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key2.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send2); node1.process_active (send1); @@ -57,7 +57,7 @@ TEST (election, quorum_minimum_flip_success) auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_EQ (2, election->blocks ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send2)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send2)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); node1.block_processor.flush (); ASSERT_NE (nullptr, node1.block (send2->hash ())); @@ -74,24 +74,24 @@ TEST (election, quorum_minimum_flip_fail) nano::keypair key1; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send1); nano::keypair key2; auto send2 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key2.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send2); node1.process_active (send1); @@ -103,7 +103,7 @@ TEST (election, quorum_minimum_flip_fail) auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_EQ (2, election->blocks ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send2)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send2)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); node1.block_processor.flush (); ASSERT_NE (nullptr, node1.block (send1->hash ())); @@ -120,23 +120,23 @@ TEST (election, quorum_minimum_confirm_success) nano::keypair key1; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta ()) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send1); node1.process_active (send1); node1.block_processor.flush (); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_EQ (1, election->blocks ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); node1.block_processor.flush (); ASSERT_NE (nullptr, node1.block (send1->hash ())); @@ -153,23 +153,23 @@ TEST (election, quorum_minimum_confirm_fail) nano::keypair key1; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (node1.online_reps.delta () - 1) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send1); node1.process_active (send1); node1.block_processor.flush (); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_EQ (1, election->blocks ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); node1.block_processor.flush (); ASSERT_NE (nullptr, node1.block (send1->hash ())); @@ -184,18 +184,18 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto amount = ((nano::uint256_t (node_config.online_weight_minimum.number ()) * nano::online_reps::online_weight_quorum) / 100).convert_to () - 1; nano::keypair key1; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (amount) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); node1.work_generate_blocking (*send1); auto open1 = builder.state () @@ -235,12 +235,12 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks) node2.block_processor.flush (); ASSERT_EQ (node2.ledger.cache.block_count, 4); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_EQ (1, election->blocks ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); auto vote2 (std::make_shared (key1.pub, key1.prv, std::numeric_limits::max (), send1)); auto channel = node1.network.find_channel (node2.network.endpoint ()); diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp index 368ee24f..565d5d05 100644 --- a/nano/core_test/election_scheduler.cpp +++ b/nano/core_test/election_scheduler.cpp @@ -18,16 +18,16 @@ TEST (election_scheduler, activate_one_timely) nano::system system{ 1 }; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); system.nodes[0]->ledger.process (system.nodes[0]->store.tx_begin_write (), *send1); - system.nodes[0]->scheduler.activate (nano::dev_genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); + system.nodes[0]->scheduler.activate (nano::dev::genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); ASSERT_TIMELY (1s, system.nodes[0]->active.election (send1->qualified_root ())); } @@ -36,16 +36,16 @@ TEST (election_scheduler, activate_one_flush) nano::system system{ 1 }; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); system.nodes[0]->ledger.process (system.nodes[0]->store.tx_begin_write (), *send1); - system.nodes[0]->scheduler.activate (nano::dev_genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); + system.nodes[0]->scheduler.activate (nano::dev::genesis_key.pub, system.nodes[0]->store.tx_begin_read ()); system.nodes[0]->scheduler.flush (); ASSERT_NE (nullptr, system.nodes[0]->active.election (send1->qualified_root ())); } @@ -61,12 +61,12 @@ TEST (election_scheduler, no_vacancy) // Activating accounts depends on confirmed dependencies. First, prepare 2 accounts auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto receive = builder.make_block () @@ -87,12 +87,12 @@ TEST (election_scheduler, no_vacancy) // Second, process two eligble transactions auto block0 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) - .link (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); auto block1 = builder.make_block () @@ -106,7 +106,7 @@ TEST (election_scheduler, no_vacancy) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*block0).code); ASSERT_EQ (nano::process_result::progress, node.process (*block1).code); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); // There is vacancy so it should be inserted ASSERT_TIMELY (1s, node.active.size () == 1); node.scheduler.activate (key.pub, node.store.tx_begin_read ()); @@ -134,16 +134,16 @@ TEST (election_scheduler, flush_vacancy) nano::keypair key; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); - node.scheduler.activate (nano::dev_genesis_key.pub, node.store.tx_begin_read ()); + node.scheduler.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ()); // Ensure this call does not block, even though no elections can be activated. node.scheduler.flush (); ASSERT_EQ (0, node.active.size ()); diff --git a/nano/core_test/frontiers_confirmation.cpp b/nano/core_test/frontiers_confirmation.cpp index ea4674df..009a2e37 100644 --- a/nano/core_test/frontiers_confirmation.cpp +++ b/nano/core_test/frontiers_confirmation.cpp @@ -20,29 +20,29 @@ TEST (frontiers_confirmation, prioritize_frontiers) nano::keypair key2; nano::keypair key3; nano::keypair key4; - nano::block_hash latest1 (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest1 (node->latest (nano::dev::genesis_key.pub)); // Send different numbers of blocks all accounts - nano::send_block send1 (latest1, key1.pub, node->config.online_weight_minimum.number () + 10000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)); - nano::send_block send2 (send1.hash (), key1.pub, node->config.online_weight_minimum.number () + 8500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); - nano::send_block send3 (send2.hash (), key1.pub, node->config.online_weight_minimum.number () + 8000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ())); - nano::send_block send4 (send3.hash (), key2.pub, node->config.online_weight_minimum.number () + 7500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ())); - nano::send_block send5 (send4.hash (), key3.pub, node->config.online_weight_minimum.number () + 6500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send4.hash ())); - nano::send_block send6 (send5.hash (), key4.pub, node->config.online_weight_minimum.number () + 6000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5.hash ())); + nano::send_block send1 (latest1, key1.pub, node->config.online_weight_minimum.number () + 10000, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1)); + nano::send_block send2 (send1.hash (), key1.pub, node->config.online_weight_minimum.number () + 8500, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block send3 (send2.hash (), key1.pub, node->config.online_weight_minimum.number () + 8000, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); + nano::send_block send4 (send3.hash (), key2.pub, node->config.online_weight_minimum.number () + 7500, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); + nano::send_block send5 (send4.hash (), key3.pub, node->config.online_weight_minimum.number () + 6500, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send4.hash ())); + nano::send_block send6 (send5.hash (), key4.pub, node->config.online_weight_minimum.number () + 6000, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5.hash ())); // Open all accounts and add other sends to get different uncemented counts (as well as some which are the same) nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); - nano::send_block send7 (open1.hash (), nano::dev_genesis_key.pub, 500, key1.prv, key1.pub, *system.work.generate (open1.hash ())); + nano::send_block send7 (open1.hash (), nano::dev::genesis_key.pub, 500, key1.prv, key1.pub, *system.work.generate (open1.hash ())); nano::open_block open2 (send4.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); nano::open_block open3 (send5.hash (), nano::dev::genesis->account (), key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); - nano::send_block send8 (open3.hash (), nano::dev_genesis_key.pub, 500, key3.prv, key3.pub, *system.work.generate (open3.hash ())); - nano::send_block send9 (send8.hash (), nano::dev_genesis_key.pub, 200, key3.prv, key3.pub, *system.work.generate (send8.hash ())); + nano::send_block send8 (open3.hash (), nano::dev::genesis_key.pub, 500, key3.prv, key3.pub, *system.work.generate (open3.hash ())); + nano::send_block send9 (send8.hash (), nano::dev::genesis_key.pub, 200, key3.prv, key3.pub, *system.work.generate (send8.hash ())); nano::open_block open4 (send6.hash (), nano::dev::genesis->account (), key4.pub, key4.prv, key4.pub, *system.work.generate (key4.pub)); - nano::send_block send10 (open4.hash (), nano::dev_genesis_key.pub, 500, key4.prv, key4.pub, *system.work.generate (open4.hash ())); - nano::send_block send11 (send10.hash (), nano::dev_genesis_key.pub, 200, key4.prv, key4.pub, *system.work.generate (send10.hash ())); + nano::send_block send10 (open4.hash (), nano::dev::genesis_key.pub, 500, key4.prv, key4.pub, *system.work.generate (open4.hash ())); + nano::send_block send11 (send10.hash (), nano::dev::genesis_key.pub, 200, key4.prv, key4.pub, *system.work.generate (send10.hash ())); { auto transaction = node->store.tx_begin_write (); @@ -85,7 +85,7 @@ TEST (frontiers_confirmation, prioritize_frontiers) { // Add some to the local node wallets and check ordering of both containers - 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 (key1.prv); system.wallet (0)->insert_adhoc (key2.prv); node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); @@ -111,12 +111,12 @@ TEST (frontiers_confirmation, prioritize_frontiers) } // Check that accounts which already exist have their order modified when the uncemented count changes. - nano::send_block send12 (send9.hash (), nano::dev_genesis_key.pub, 100, key3.prv, key3.pub, *system.work.generate (send9.hash ())); - nano::send_block send13 (send12.hash (), nano::dev_genesis_key.pub, 90, key3.prv, key3.pub, *system.work.generate (send12.hash ())); - nano::send_block send14 (send13.hash (), nano::dev_genesis_key.pub, 80, key3.prv, key3.pub, *system.work.generate (send13.hash ())); - nano::send_block send15 (send14.hash (), nano::dev_genesis_key.pub, 70, key3.prv, key3.pub, *system.work.generate (send14.hash ())); - nano::send_block send16 (send15.hash (), nano::dev_genesis_key.pub, 60, key3.prv, key3.pub, *system.work.generate (send15.hash ())); - nano::send_block send17 (send16.hash (), nano::dev_genesis_key.pub, 50, key3.prv, key3.pub, *system.work.generate (send16.hash ())); + nano::send_block send12 (send9.hash (), nano::dev::genesis_key.pub, 100, key3.prv, key3.pub, *system.work.generate (send9.hash ())); + nano::send_block send13 (send12.hash (), nano::dev::genesis_key.pub, 90, key3.prv, key3.pub, *system.work.generate (send12.hash ())); + nano::send_block send14 (send13.hash (), nano::dev::genesis_key.pub, 80, key3.prv, key3.pub, *system.work.generate (send13.hash ())); + nano::send_block send15 (send14.hash (), nano::dev::genesis_key.pub, 70, key3.prv, key3.pub, *system.work.generate (send14.hash ())); + nano::send_block send16 (send15.hash (), nano::dev::genesis_key.pub, 60, key3.prv, key3.pub, *system.work.generate (send15.hash ())); + nano::send_block send17 (send16.hash (), nano::dev::genesis_key.pub, 50, key3.prv, key3.pub, *system.work.generate (send16.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send12).code); @@ -161,7 +161,7 @@ TEST (frontiers_confirmation, prioritize_frontiers_max_optimistic_elections) auto transaction = node->store.tx_begin_write (); auto latest = node->latest (nano::dev::genesis->account ()); nano::keypair key; - nano::send_block send (latest, key.pub, node->config.online_weight_minimum.number () + 10000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key.pub, node->config.online_weight_minimum.number () + 10000, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); nano::open_block open (send.hash (), nano::dev::genesis->account (), key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, open).code); @@ -219,7 +219,7 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::always; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -232,7 +232,7 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::automatic; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -245,12 +245,12 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); } - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); std::this_thread::sleep_for (std::chrono::seconds (1)); ASSERT_EQ (0, node->active.size ()); } diff --git a/nano/core_test/gap_cache.cpp b/nano/core_test/gap_cache.cpp index c12624c1..972cb082 100644 --- a/nano/core_test/gap_cache.cpp +++ b/nano/core_test/gap_cache.cpp @@ -65,9 +65,9 @@ TEST (gap_cache, gap_bootstrap) auto & node1 (*system.nodes[0]); auto & node2 (*system.nodes[1]); - nano::block_hash latest (node1.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node1.latest (nano::dev::genesis_key.pub)); nano::keypair key; - auto send (std::make_shared (latest, key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest))); + auto send (std::make_shared (latest, key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); node1.process (*send); ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); @@ -78,8 +78,8 @@ TEST (gap_cache, gap_bootstrap) election->force_confirm (); ASSERT_TIMELY (2s, node1.block_confirmed (send->hash ())); node1.active.erase (*send); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto latest_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto latest_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 100)); ASSERT_NE (nullptr, latest_block); ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::dev::genesis->account ())); ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); @@ -92,8 +92,8 @@ TEST (gap_cache, two_dependencies) auto & node1 (*system.nodes[0]); nano::keypair key; nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), key.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); - auto send2 (std::make_shared (send1->hash (), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto send1 (std::make_shared (genesis.hash (), key.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send2 (std::make_shared (send1->hash (), key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); auto open (std::make_shared (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (0, node1.gap_cache.size ()); node1.block_processor.add (send2, nano::seconds_since_epoch ()); diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp index 01f322b0..67530c10 100644 --- a/nano/core_test/ledger.cpp +++ b/nano/core_test/ledger.cpp @@ -76,7 +76,7 @@ TEST (ledger, process_modifies_sideband) nano::genesis genesis; store->initialize (store->tx_begin_write (), ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), send1).code); ASSERT_EQ (send1.sideband ().timestamp, store->block.get (store->tx_begin_read (), send1.hash ())->sideband ().timestamp); } @@ -94,25 +94,25 @@ TEST (ledger, process_send) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key2; - nano::send_block send (info1.head, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send (info1.head, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); nano::block_hash hash1 (send.hash ()); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, info1.head)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, info1.head)); ASSERT_EQ (1, info1.block_count); // This was a valid block, it should progress. auto return1 (ledger.process (transaction, send)); - ASSERT_EQ (nano::dev_genesis_key.pub, send.sideband ().account); + ASSERT_EQ (nano::dev::genesis_key.pub, send.sideband ().account); ASSERT_EQ (2, send.sideband ().height); ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash1)); ASSERT_TRUE (store->frontier.get (transaction, info1.head).is_zero ()); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, hash1)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, hash1)); ASSERT_EQ (nano::process_result::progress, return1.code); - ASSERT_EQ (nano::dev_genesis_key.pub, store->block.account_calculated (send)); - ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->block.account_calculated (send)); + ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); nano::account_info info2; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info2)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info2)); ASSERT_EQ (2, info2.block_count); auto latest6 (store->block.get (transaction, info2.head)); ASSERT_NE (nullptr, latest6); @@ -135,10 +135,10 @@ TEST (ledger, process_send) ASSERT_EQ (key2.pub, store->frontier.get (transaction, hash2)); ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); - ASSERT_EQ (50, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key2.pub)); nano::account_info info3; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info3)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); auto latest2 (store->block.get (transaction, info3.head)); ASSERT_NE (nullptr, latest2); auto latest3 (dynamic_cast (latest2.get ())); @@ -157,27 +157,27 @@ TEST (ledger, process_send) ASSERT_TRUE (ledger.store.account.get (transaction, key2.pub, info5)); nano::pending_info pending1; ASSERT_FALSE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash1), pending1)); - ASSERT_EQ (nano::dev_genesis_key.pub, pending1.source); + ASSERT_EQ (nano::dev::genesis_key.pub, pending1.source); ASSERT_EQ (nano::genesis_amount - 50, pending1.amount.number ()); ASSERT_EQ (0, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); - ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); - ASSERT_EQ (50, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); nano::account_info info6; - ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev_genesis_key.pub, info6)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis_key.pub, info6)); ASSERT_EQ (hash1, info6.head); ASSERT_FALSE (ledger.rollback (transaction, info6.head)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev_genesis_key.pub)); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, info1.head)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, info1.head)); ASSERT_TRUE (store->frontier.get (transaction, hash1).is_zero ()); nano::account_info info7; - ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev_genesis_key.pub, info7)); + ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis_key.pub, info7)); ASSERT_EQ (1, info7.block_count); ASSERT_EQ (info1.head, info7.head); nano::pending_info pending2; ASSERT_TRUE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash1), pending2)); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -194,9 +194,9 @@ TEST (ledger, process_receive) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key2; - nano::send_block send (info1.head, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send (info1.head, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); nano::block_hash hash1 (send.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::keypair key3; @@ -210,7 +210,7 @@ TEST (ledger, process_receive) ASSERT_EQ (1, open.sideband ().height); ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash2)); ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); - nano::send_block send2 (hash1, key2.pub, 25, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (hash1)); + nano::send_block send2 (hash1, key2.pub, 25, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); nano::block_hash hash3 (send2.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::receive_block receive (hash2, hash3, key2.prv, key2.pub, *pool.generate (hash2)); @@ -226,7 +226,7 @@ TEST (ledger, process_receive) ASSERT_EQ (nano::process_result::progress, return2.code); ASSERT_EQ (key2.pub, store->block.account_calculated (receive)); ASSERT_EQ (hash4, ledger.latest (transaction, key2.pub)); - ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (nano::genesis_amount - 25, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (nano::genesis_amount - 25, ledger.weight (key3.pub)); @@ -234,14 +234,14 @@ TEST (ledger, process_receive) ASSERT_TRUE (store->block.successor (transaction, hash2).is_zero ()); ASSERT_EQ (key2.pub, store->frontier.get (transaction, hash2)); ASSERT_TRUE (store->frontier.get (transaction, hash4).is_zero ()); - ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (25, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); ASSERT_EQ (hash2, ledger.latest (transaction, key2.pub)); nano::pending_info pending1; ASSERT_FALSE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash3), pending1)); - ASSERT_EQ (nano::dev_genesis_key.pub, pending1.source); + ASSERT_EQ (nano::dev::genesis_key.pub, pending1.source); ASSERT_EQ (25, pending1.amount.number ()); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -258,9 +258,9 @@ TEST (ledger, rollback_receiver) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key2; - nano::send_block send (info1.head, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send (info1.head, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); nano::block_hash hash1 (send.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::keypair key3; @@ -268,15 +268,15 @@ TEST (ledger, rollback_receiver) nano::block_hash hash2 (open.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); ASSERT_EQ (hash2, ledger.latest (transaction, key2.pub)); - ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (50, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, hash1)); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); nano::account_info info2; @@ -298,18 +298,18 @@ TEST (ledger, rollback_representation) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key5; - nano::change_block change1 (genesis.hash (), key5.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block change1 (genesis.hash (), key5.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); nano::keypair key3; - nano::change_block change2 (change1.hash (), key3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); + nano::change_block change2 (change1.hash (), key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change2).code); nano::keypair key2; - nano::send_block send1 (change2.hash (), key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change2.hash ())); + nano::send_block send1 (change2.hash (), key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair key4; nano::open_block open (send1.hash (), key4.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); - nano::send_block send2 (send1.hash (), key2.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key2.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::receive_block receive1 (open.hash (), send2.hash (), key2.prv, key2.pub, *pool.generate (open.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); @@ -330,11 +330,11 @@ TEST (ledger, rollback_representation) ledger.rollback (transaction, send1.hash ()); ASSERT_EQ (nano::genesis_amount, ledger.weight (key3.pub)); nano::account_info info3; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info3)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); ASSERT_EQ (key3.pub, info3.representative); ASSERT_FALSE (ledger.rollback (transaction, change2.hash ())); nano::account_info info4; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info4)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info4)); ASSERT_EQ (key5.pub, info4.representative); ASSERT_EQ (nano::genesis_amount, ledger.weight (key5.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); @@ -351,9 +351,9 @@ TEST (ledger, receive_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); + nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_FALSE (ledger.rollback (transaction, receive.hash ())); } @@ -370,9 +370,9 @@ TEST (ledger, process_duplicate) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key2; - nano::send_block send (info1.head, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send (info1.head, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); nano::block_hash hash1 (send.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::old, ledger.process (transaction, send).code); @@ -391,7 +391,7 @@ TEST (ledger, representative_genesis) nano::genesis genesis; auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - auto latest (ledger.latest (transaction, nano::dev_genesis_key.pub)); + auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); ASSERT_FALSE (latest.is_zero ()); ASSERT_EQ (genesis.open->hash (), ledger.representative (transaction, latest)); } @@ -421,30 +421,30 @@ TEST (ledger, representative_change) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::change_block block (info1.head, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::change_block block (info1.head, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, info1.head)); auto return1 (ledger.process (transaction, block)); ASSERT_EQ (0, ledger.amount (transaction, block.hash ())); ASSERT_TRUE (store->frontier.get (transaction, info1.head).is_zero ()); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, block.hash ())); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, block.hash ())); ASSERT_EQ (nano::process_result::progress, return1.code); - ASSERT_EQ (nano::dev_genesis_key.pub, store->block.account_calculated (block)); - ASSERT_EQ (0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->block.account_calculated (block)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount, ledger.weight (key2.pub)); nano::account_info info2; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info2)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info2)); ASSERT_EQ (block.hash (), info2.head); ASSERT_FALSE (ledger.rollback (transaction, info2.head)); - ASSERT_EQ (nano::dev_genesis_key.pub, store->frontier.get (transaction, info1.head)); + ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, info1.head)); ASSERT_TRUE (store->frontier.get (transaction, block.hash ()).is_zero ()); nano::account_info info3; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info3)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); ASSERT_EQ (info1.head, info3.head); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); } @@ -462,10 +462,10 @@ TEST (ledger, send_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block block (info1.head, key2.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block block (info1.head, key2.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block).code); - nano::send_block block2 (info1.head, key3.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block block2 (info1.head, key3.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, block2).code); } @@ -483,14 +483,14 @@ TEST (ledger, receive_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block block (info1.head, key2.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block block (info1.head, key2.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block).code); nano::open_block block2 (block.hash (), key2.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); nano::change_block block3 (block2.hash (), key3.pub, key2.prv, key2.pub, *pool.generate (block2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); - nano::send_block block4 (block.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block.hash ())); + nano::send_block block4 (block.hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block4).code); nano::receive_block block5 (block2.hash (), block4.hash (), key2.prv, key2.pub, *pool.generate (block2.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, block5).code); @@ -510,8 +510,8 @@ TEST (ledger, open_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block block (info1.head, key2.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block block (info1.head, key2.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block).code); nano::open_block block2 (block.hash (), key2.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); @@ -542,38 +542,38 @@ TEST (ledger, representation) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - ASSERT_EQ (nano::genesis_amount, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, rep_weights.representation_get (nano::dev::genesis_key.pub)); nano::keypair key2; - nano::send_block block1 (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); - ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); nano::keypair key3; nano::open_block block2 (block1.hash (), key3.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); - ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (100, rep_weights.representation_get (key3.pub)); - nano::send_block block3 (block1.hash (), key2.pub, nano::genesis_amount - 200, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block3 (block1.hash (), key2.pub, nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (100, rep_weights.representation_get (key3.pub)); nano::receive_block block4 (block2.hash (), block3.hash (), key2.prv, key2.pub, *pool.generate (block2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block4).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (200, rep_weights.representation_get (key3.pub)); nano::keypair key4; nano::change_block block5 (block4.hash (), key4.pub, key2.prv, key2.pub, *pool.generate (block4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block5).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (200, rep_weights.representation_get (key4.pub)); nano::keypair key5; nano::send_block block6 (block5.hash (), key5.pub, 100, key2.prv, key2.pub, *pool.generate (block5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block6).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (100, rep_weights.representation_get (key4.pub)); @@ -581,7 +581,7 @@ TEST (ledger, representation) nano::keypair key6; nano::open_block block7 (block6.hash (), key6.pub, key5.pub, key5.prv, key5.pub, *pool.generate (key5.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block7).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (100, rep_weights.representation_get (key4.pub)); @@ -589,7 +589,7 @@ TEST (ledger, representation) ASSERT_EQ (100, rep_weights.representation_get (key6.pub)); nano::send_block block8 (block6.hash (), key5.pub, 0, key2.prv, key2.pub, *pool.generate (block6.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block8).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (0, rep_weights.representation_get (key4.pub)); @@ -597,7 +597,7 @@ TEST (ledger, representation) ASSERT_EQ (100, rep_weights.representation_get (key6.pub)); nano::receive_block block9 (block7.hash (), block8.hash (), key5.prv, key5.pub, *pool.generate (block7.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block9).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (0, rep_weights.representation_get (key4.pub)); @@ -617,11 +617,11 @@ TEST (ledger, double_open) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key2; - nano::send_block send1 (genesis.hash (), key2.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), key2.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), key2.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); - nano::open_block open2 (send1.hash (), nano::dev_genesis_key.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); + nano::open_block open2 (send1.hash (), nano::dev::genesis_key.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, open2).code); } @@ -637,7 +637,7 @@ TEST (ledger, double_receive) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key2; - nano::send_block send1 (genesis.hash (), key2.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), key2.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), key2.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -653,17 +653,17 @@ TEST (votes, check_signature) auto & node1 = *system.add_node (node_config); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); { auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); } - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); ASSERT_EQ (1, election1->votes ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send1)); vote1->signature.bytes[0] ^= 1; ASSERT_EQ (nano::vote_code::invalid, node1.vote_processor.vote_blocking (vote1, std::make_shared (node1))); vote1->signature.bytes[0] ^= 1; @@ -677,7 +677,7 @@ TEST (votes, add_one) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); @@ -685,13 +685,13 @@ TEST (votes, add_one) node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); ASSERT_EQ (1, election1->votes ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 2, send1)); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 2, send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote2)); ASSERT_EQ (2, election1->votes ().size ()); auto votes1 (election1->votes ()); - auto existing1 (votes1.find (nano::dev_genesis_key.pub)); + auto existing1 (votes1.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes1.end (), existing1); ASSERT_EQ (send1->hash (), existing1->second.hash); nano::lock_guard guard (node1.active.mutex); @@ -706,7 +706,7 @@ TEST (votes, add_two) auto & node1 = *system.nodes[0]; nano::genesis genesis; nano::keypair key1; - auto send1 = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + auto send1 = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); node1.work_generate_blocking (*send1); auto transaction = node1.store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); @@ -714,15 +714,15 @@ TEST (votes, add_two) node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); nano::keypair key2; - auto send2 = std::make_shared (genesis.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + auto send2 = std::make_shared (genesis.hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto vote2 = std::make_shared (key2.pub, key2.prv, 1, send2); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote2)); - auto vote1 = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send1); + auto vote1 = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send1); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); ASSERT_EQ (3, election1->votes ().size ()); auto votes1 = election1->votes (); - ASSERT_NE (votes1.end (), votes1.find (nano::dev_genesis_key.pub)); - ASSERT_EQ (send1->hash (), votes1[nano::dev_genesis_key.pub].hash); + ASSERT_NE (votes1.end (), votes1.find (nano::dev::genesis_key.pub)); + ASSERT_EQ (send1->hash (), votes1[nano::dev::genesis_key.pub].hash); ASSERT_NE (votes1.end (), votes1.find (key2.pub)); ASSERT_EQ (send2->hash (), votes1[key2.pub].hash); ASSERT_EQ (*send1, *election1->winner ()); @@ -741,53 +741,53 @@ TEST (votes, add_existing) nano::keypair key1; nano::block_builder builder; std::shared_ptr send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) // No representative, blocks can't confirm + .representative (nano::dev::genesis_key.pub) // No representative, blocks can't confirm .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) .link (key1.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build (); node1.work_generate_blocking (*send1); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (node1.store.tx_begin_write (), *send1).code); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send1)); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote1)); // Block is already processed from vote ASSERT_TRUE (node1.active.publish (send1)); - ASSERT_EQ (1, election1->last_votes[nano::dev_genesis_key.pub].timestamp); + ASSERT_EQ (1, election1->last_votes[nano::dev::genesis_key.pub].timestamp); nano::keypair key2; std::shared_ptr send2 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) // No representative, blocks can't confirm + .representative (nano::dev::genesis_key.pub) // No representative, blocks can't confirm .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) .link (key2.pub) .work (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build (); node1.work_generate_blocking (*send2); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 2, send2)); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 2, send2)); // Pretend we've waited the timeout nano::unique_lock lock (election1->mutex); - election1->last_votes[nano::dev_genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); + election1->last_votes[nano::dev::genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); lock.unlock (); ASSERT_EQ (nano::vote_code::vote, node1.active.vote (vote2)); ASSERT_FALSE (node1.active.publish (send2)); - ASSERT_EQ (2, election1->last_votes[nano::dev_genesis_key.pub].timestamp); + ASSERT_EQ (2, election1->last_votes[nano::dev::genesis_key.pub].timestamp); // Also resend the old vote, and see if we respect the timestamp lock.lock (); - election1->last_votes[nano::dev_genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); + election1->last_votes[nano::dev::genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); lock.unlock (); ASSERT_EQ (nano::vote_code::replay, node1.active.vote (vote1)); - ASSERT_EQ (2, election1->votes ()[nano::dev_genesis_key.pub].timestamp); + ASSERT_EQ (2, election1->votes ()[nano::dev::genesis_key.pub].timestamp); auto votes (election1->votes ()); ASSERT_EQ (2, votes.size ()); - ASSERT_NE (votes.end (), votes.find (nano::dev_genesis_key.pub)); - ASSERT_EQ (send2->hash (), votes[nano::dev_genesis_key.pub].hash); + ASSERT_NE (votes.end (), votes.find (nano::dev::genesis_key.pub)); + ASSERT_EQ (send2->hash (), votes[nano::dev::genesis_key.pub].hash); ASSERT_EQ (*send2, *election1->tally ().begin ()->second); } @@ -798,29 +798,29 @@ TEST (votes, add_old) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); node1.block_confirm (send1); node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 2, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 2, send1)); auto channel (std::make_shared (node1)); node1.vote_processor.vote_blocking (vote1, channel); nano::keypair key2; - auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send2)); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send2)); { nano::lock_guard lock (election1->mutex); - election1->last_votes[nano::dev_genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); + election1->last_votes[nano::dev::genesis_key.pub].time = std::chrono::steady_clock::now () - std::chrono::seconds (20); } node1.vote_processor.vote_blocking (vote2, channel); ASSERT_EQ (2, election1->votes ().size ()); auto votes (election1->votes ()); - ASSERT_NE (votes.end (), votes.find (nano::dev_genesis_key.pub)); - ASSERT_EQ (send1->hash (), votes[nano::dev_genesis_key.pub].hash); + ASSERT_NE (votes.end (), votes.find (nano::dev::genesis_key.pub)); + ASSERT_EQ (send1->hash (), votes[nano::dev::genesis_key.pub].hash); ASSERT_EQ (*send1, *election1->winner ()); } } @@ -832,9 +832,9 @@ TEST (votes, add_old_different_account) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (send1->hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (send1->hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code); @@ -845,23 +845,23 @@ TEST (votes, add_old_different_account) ASSERT_NE (nullptr, election2); ASSERT_EQ (1, election1->votes ().size ()); ASSERT_EQ (1, election2->votes ().size ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 2, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 2, send1)); auto channel (std::make_shared (node1)); auto vote_result1 (node1.vote_processor.vote_blocking (vote1, channel)); ASSERT_EQ (nano::vote_code::vote, vote_result1); ASSERT_EQ (2, election1->votes ().size ()); ASSERT_EQ (1, election2->votes ().size ()); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send2)); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send2)); auto vote_result2 (node1.vote_processor.vote_blocking (vote2, channel)); ASSERT_EQ (nano::vote_code::vote, vote_result2); ASSERT_EQ (2, election1->votes ().size ()); ASSERT_EQ (2, election2->votes ().size ()); auto votes1 (election1->votes ()); auto votes2 (election2->votes ()); - ASSERT_NE (votes1.end (), votes1.find (nano::dev_genesis_key.pub)); - ASSERT_NE (votes2.end (), votes2.find (nano::dev_genesis_key.pub)); - ASSERT_EQ (send1->hash (), votes1[nano::dev_genesis_key.pub].hash); - ASSERT_EQ (send2->hash (), votes2[nano::dev_genesis_key.pub].hash); + ASSERT_NE (votes1.end (), votes1.find (nano::dev::genesis_key.pub)); + ASSERT_NE (votes2.end (), votes2.find (nano::dev::genesis_key.pub)); + ASSERT_EQ (send1->hash (), votes1[nano::dev::genesis_key.pub].hash); + ASSERT_EQ (send2->hash (), votes2[nano::dev::genesis_key.pub].hash); ASSERT_EQ (*send1, *election1->winner ()); ASSERT_EQ (*send2, *election2->winner ()); } @@ -873,25 +873,25 @@ TEST (votes, add_cooldown) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); node1.block_confirm (send1); node1.scheduler.flush (); auto election1 = node1.active.election (send1->qualified_root ()); - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, send1)); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, send1)); auto channel (std::make_shared (node1)); node1.vote_processor.vote_blocking (vote1, channel); nano::keypair key2; - auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (genesis.hash (), key2.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); - auto vote2 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 2, send2)); + auto vote2 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 2, send2)); node1.vote_processor.vote_blocking (vote2, channel); ASSERT_EQ (2, election1->votes ().size ()); auto votes (election1->votes ()); - ASSERT_NE (votes.end (), votes.find (nano::dev_genesis_key.pub)); - ASSERT_EQ (send1->hash (), votes[nano::dev_genesis_key.pub].hash); + ASSERT_NE (votes.end (), votes.find (nano::dev::genesis_key.pub)); + ASSERT_EQ (send1->hash (), votes[nano::dev::genesis_key.pub].hash); ASSERT_EQ (*send1, *election1->winner ()); } @@ -902,7 +902,7 @@ TEST (ledger, successor) auto & node1 (*system.nodes[0]); nano::keypair key1; nano::genesis genesis; - nano::send_block send1 (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::send_block send1 (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); node1.work_generate_blocking (send1); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, send1).code); @@ -923,7 +923,7 @@ TEST (ledger, fail_change_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::change_block block (genesis.hash (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block block (genesis.hash (), key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block)); ASSERT_EQ (nano::process_result::progress, result1.code); auto result2 (ledger.process (transaction, block)); @@ -942,7 +942,7 @@ TEST (ledger, fail_change_gap_previous) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::change_block block (1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::root (1))); + nano::change_block block (1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::root (1))); auto result1 (ledger.process (transaction, block)); ASSERT_EQ (nano::process_result::gap_previous, result1.code); } @@ -976,11 +976,11 @@ TEST (ledger, fail_change_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::change_block block1 (genesis.hash (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block block1 (genesis.hash (), key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); nano::keypair key2; - nano::change_block block2 (genesis.hash (), key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block block2 (genesis.hash (), key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::fork, result2.code); } @@ -997,7 +997,7 @@ TEST (ledger, fail_send_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block)); ASSERT_EQ (nano::process_result::progress, result1.code); auto result2 (ledger.process (transaction, block)); @@ -1016,7 +1016,7 @@ TEST (ledger, fail_send_gap_previous) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block (1, key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::root (1))); + nano::send_block block (1, key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::root (1))); auto result1 (ledger.process (transaction, block)); ASSERT_EQ (nano::process_result::gap_previous, result1.code); } @@ -1050,10 +1050,10 @@ TEST (ledger, fail_send_negative_spend) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); nano::keypair key2; - nano::send_block block2 (block1.hash (), key2.pub, 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key2.pub, 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); ASSERT_EQ (nano::process_result::negative_spend, ledger.process (transaction, block2).code); } @@ -1069,10 +1069,10 @@ TEST (ledger, fail_send_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); nano::keypair key2; - nano::send_block block2 (genesis.hash (), key2.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block2 (genesis.hash (), key2.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, block2).code); } @@ -1088,7 +1088,7 @@ TEST (ledger, fail_open_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); nano::open_block block2 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); @@ -1124,7 +1124,7 @@ TEST (ledger, fail_open_bad_signature) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); nano::open_block block2 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); block2.signature.clear (); @@ -1143,9 +1143,9 @@ TEST (ledger, fail_open_fork_previous) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); @@ -1166,7 +1166,7 @@ TEST (ledger, fail_open_account_mismatch) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); nano::keypair badkey; nano::open_block block2 (block1.hash (), 1, badkey.pub, badkey.prv, badkey.pub, *pool.generate (badkey.pub)); @@ -1186,9 +1186,9 @@ TEST (ledger, fail_receive_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); @@ -1209,10 +1209,10 @@ TEST (ledger, fail_receive_gap_source) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1235,7 +1235,7 @@ TEST (ledger, fail_receive_overreceive) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); nano::open_block block2 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1258,10 +1258,10 @@ TEST (ledger, fail_receive_bad_signature) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1284,10 +1284,10 @@ TEST (ledger, fail_receive_gap_previous_opened) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1310,10 +1310,10 @@ TEST (ledger, fail_receive_gap_previous_unopened) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); nano::receive_block block3 (1, block2.hash (), key1.prv, key1.pub, *pool.generate (nano::root (1))); @@ -1333,10 +1333,10 @@ TEST (ledger, fail_receive_fork_previous) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1363,13 +1363,13 @@ TEST (ledger, fail_receive_received_source) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - nano::send_block block1 (genesis.hash (), key1.pub, 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key1.pub, 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); auto result1 (ledger.process (transaction, block1)); ASSERT_EQ (nano::process_result::progress, result1.code); - nano::send_block block2 (block1.hash (), key1.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), key1.pub, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); auto result2 (ledger.process (transaction, block2)); ASSERT_EQ (nano::process_result::progress, result2.code); - nano::send_block block6 (block2.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block2.hash ())); + nano::send_block block6 (block2.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block2.hash ())); auto result6 (ledger.process (transaction, block6)); ASSERT_EQ (nano::process_result::progress, result6.code); nano::open_block block3 (block1.hash (), 1, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1413,10 +1413,10 @@ TEST (ledger, latest_root) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; ASSERT_EQ (key.pub, ledger.latest_root (transaction, key.pub)); - auto hash1 (ledger.latest (transaction, nano::dev_genesis_key.pub)); - nano::send_block send (hash1, 0, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (hash1)); + auto hash1 (ledger.latest (transaction, nano::dev::genesis_key.pub)); + nano::send_block send (hash1, 0, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - ASSERT_EQ (send.hash (), ledger.latest_root (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (send.hash (), ledger.latest_root (transaction, nano::dev::genesis_key.pub)); } TEST (ledger, change_representative_move_representation) @@ -1432,12 +1432,12 @@ TEST (ledger, change_representative_move_representation) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); auto hash1 (genesis.hash ()); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev_genesis_key.pub)); - nano::send_block send (hash1, key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (hash1)); + ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + nano::send_block send (hash1, key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - ASSERT_EQ (0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); nano::keypair key2; - nano::change_block change (send.hash (), key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); + nano::change_block change (send.hash (), key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); nano::keypair key3; nano::open_block open (send.hash (), key3.pub, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); @@ -1457,12 +1457,12 @@ TEST (ledger, send_open_receive_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key1; - nano::send_block send1 (info1.head, key1.pub, nano::genesis_amount - 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send1 (info1.head, key1.pub, nano::genesis_amount - 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); auto return1 (ledger.process (transaction, send1)); ASSERT_EQ (nano::process_result::progress, return1.code); - nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); auto return2 (ledger.process (transaction, send2)); ASSERT_EQ (nano::process_result::progress, return2.code); nano::keypair key2; @@ -1474,34 +1474,34 @@ TEST (ledger, send_open_receive_rollback) ASSERT_EQ (nano::process_result::progress, return5.code); nano::keypair key3; ASSERT_EQ (100, ledger.weight (key2.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - nano::change_block change1 (send2.hash (), key3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::change_block change1 (send2.hash (), key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); auto return6 (ledger.process (transaction, change1)); ASSERT_EQ (nano::process_result::progress, return6.code); ASSERT_EQ (100, ledger.weight (key2.pub)); - ASSERT_EQ (0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, receive.hash ())); ASSERT_EQ (50, ledger.weight (key2.pub)); - ASSERT_EQ (0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, open.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); - ASSERT_EQ (0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, change1.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_FALSE (ledger.rollback (transaction, send2.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 0, ledger.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - 0, ledger.weight (nano::dev::genesis_key.pub)); } TEST (ledger, bootstrap_rep_weight) @@ -1518,8 +1518,8 @@ TEST (ledger, bootstrap_rep_weight) { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block send (info1.head, key2.pub, std::numeric_limits::max () - 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block send (info1.head, key2.pub, std::numeric_limits::max () - 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); } ASSERT_EQ (2, ledger.cache.block_count); @@ -1530,8 +1530,8 @@ TEST (ledger, bootstrap_rep_weight) } { auto transaction (store->tx_begin_write ()); - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block send (info1.head, key2.pub, std::numeric_limits::max () - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block send (info1.head, key2.pub, std::numeric_limits::max () - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); } ASSERT_EQ (3, ledger.cache.block_count); @@ -1555,17 +1555,17 @@ TEST (ledger, block_destination_source) nano::keypair dest; nano::uint128_t balance (nano::genesis_amount); balance -= nano::Gxrb_ratio; - nano::send_block block1 (genesis.hash (), dest.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), dest.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); balance -= nano::Gxrb_ratio; - nano::send_block block2 (block1.hash (), nano::dev::genesis->account (), balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block2 (block1.hash (), nano::dev::genesis->account (), balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); balance += nano::Gxrb_ratio; - nano::receive_block block3 (block2.hash (), block2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block2.hash ())); + nano::receive_block block3 (block2.hash (), block2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block2.hash ())); balance -= nano::Gxrb_ratio; - nano::state_block block4 (nano::dev::genesis->account (), block3.hash (), nano::dev::genesis->account (), balance, dest.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block3.hash ())); + nano::state_block block4 (nano::dev::genesis->account (), block3.hash (), nano::dev::genesis->account (), balance, dest.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block3.hash ())); balance -= nano::Gxrb_ratio; - nano::state_block block5 (nano::dev::genesis->account (), block4.hash (), nano::dev::genesis->account (), balance, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block4.hash ())); + nano::state_block block5 (nano::dev::genesis->account (), block4.hash (), nano::dev::genesis->account (), balance, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block4.hash ())); balance += nano::Gxrb_ratio; - nano::state_block block6 (nano::dev::genesis->account (), block5.hash (), nano::dev::genesis->account (), balance, block5.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block5.hash ())); + nano::state_block block6 (nano::dev::genesis->account (), block5.hash (), nano::dev::genesis->account (), balance, block5.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); @@ -1598,7 +1598,7 @@ TEST (ledger, state_account) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (nano::dev::genesis->account (), ledger.account (transaction, send1.hash ())); } @@ -1614,7 +1614,7 @@ TEST (ledger, state_send_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1628,7 +1628,7 @@ TEST (ledger, state_send_receive) ASSERT_TRUE (send2->sideband ().details.is_send); ASSERT_FALSE (send2->sideband ().details.is_receive); ASSERT_FALSE (send2->sideband ().details.is_epoch); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -1656,7 +1656,7 @@ TEST (ledger, state_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1665,7 +1665,7 @@ TEST (ledger, state_receive) ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -1692,7 +1692,7 @@ TEST (ledger, state_rep_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_TRUE (store->block.exists (transaction, change1.hash ())); auto change2 (store->block.get (transaction, change1.hash ())); @@ -1720,7 +1720,7 @@ TEST (ledger, state_open) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1759,9 +1759,9 @@ TEST (ledger, send_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::send_block send2 (send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, send2).code); } @@ -1777,9 +1777,9 @@ TEST (ledger, receive_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, receive1).code); } @@ -1795,10 +1795,10 @@ TEST (ledger, change_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::change_block change1 (send1.hash (), rep.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::change_block change1 (send1.hash (), rep.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); } @@ -1813,7 +1813,7 @@ TEST (ledger, state_unreceivable_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1822,7 +1822,7 @@ TEST (ledger, state_unreceivable_fail) ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, receive1).code); } @@ -1837,7 +1837,7 @@ TEST (ledger, state_receive_bad_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1846,7 +1846,7 @@ TEST (ledger, state_receive_bad_amount_fail) ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, receive1).code); } @@ -1861,10 +1861,10 @@ TEST (ledger, state_no_link_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, change1).code); } @@ -1879,7 +1879,7 @@ TEST (ledger, state_receive_wrong_account_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -1905,7 +1905,7 @@ TEST (ledger, state_open_state_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -1926,7 +1926,7 @@ TEST (ledger, state_state_open_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -1948,7 +1948,7 @@ TEST (ledger, state_open_previous_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 1, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (1)); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, open1).code); @@ -1966,7 +1966,7 @@ TEST (ledger, state_open_source_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), 0, 0, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, open1).code); @@ -1984,7 +1984,7 @@ TEST (ledger, state_send_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -2011,7 +2011,7 @@ TEST (ledger, state_receive_change) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -2021,7 +2021,7 @@ TEST (ledger, state_receive_change) ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::keypair rep; - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); @@ -2049,7 +2049,7 @@ TEST (ledger, state_open_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -2070,9 +2070,9 @@ TEST (ledger, state_receive_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -2094,7 +2094,7 @@ TEST (ledger, state_rollback_send) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); @@ -2126,9 +2126,9 @@ TEST (ledger, state_rollback_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), receive1.hash ()))); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); @@ -2154,7 +2154,7 @@ TEST (ledger, state_rollback_received_send) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block receive1 (key.pub, 0, key.pub, nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); @@ -2182,7 +2182,7 @@ TEST (ledger, state_rep_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_FALSE (ledger.rollback (transaction, change1.hash ())); ASSERT_FALSE (store->block.exists (transaction, change1.hash ())); @@ -2203,7 +2203,7 @@ TEST (ledger, state_open_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -2230,7 +2230,7 @@ TEST (ledger, state_send_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); @@ -2251,10 +2251,10 @@ TEST (ledger, state_receive_change_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); @@ -2276,14 +2276,14 @@ TEST (ledger, epoch_blocks_v1_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_FALSE (epoch1.sideband ().details.is_send); ASSERT_FALSE (epoch1.sideband ().details.is_receive); ASSERT_TRUE (epoch1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch2).code); nano::account_info genesis_info; ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); @@ -2299,9 +2299,9 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_TRUE (epoch1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (send1.sideband ().details.is_send); ASSERT_FALSE (send1.sideband ().details.is_receive); @@ -2310,9 +2310,9 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_EQ (nano::epoch::epoch_0, send1.sideband ().source_epoch); // Not used for send blocks nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open1).code); - nano::state_block epoch3 (destination.pub, 0, nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); + nano::state_block epoch3 (destination.pub, 0, nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::representative_mismatch, ledger.process (transaction, epoch3).code); - nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); + nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); ASSERT_FALSE (epoch4.sideband ().details.is_send); ASSERT_FALSE (epoch4.sideband ().details.is_receive); @@ -2347,19 +2347,19 @@ TEST (ledger, epoch_blocks_v2_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); // Trying to upgrade from epoch 0 to epoch 2. It is a requirement epoch upgrades are sequential unless the account is unopened ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch1).code); // Set it to the first epoch and it should now succeed - epoch1 = nano::state_block (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, epoch1.work); + epoch1 = nano::state_block (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, epoch1.work); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); ASSERT_EQ (nano::epoch::epoch_2, epoch2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch2.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch3 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch3).code); nano::account_info genesis_info; ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); @@ -2370,21 +2370,21 @@ TEST (ledger, epoch_blocks_v2_general) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_1); - nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (nano::epoch::epoch_1, send1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send1.sideband ().source_epoch); // Not used for send blocks nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open1).code); - nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination.pub)); + nano::state_block epoch4 (destination.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); ASSERT_EQ (nano::epoch::epoch_1, epoch4.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch4.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch5 (destination.pub, epoch4.hash (), nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch4.hash ())); + nano::state_block epoch5 (destination.pub, epoch4.hash (), nano::dev::genesis->account (), 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch4.hash ())); ASSERT_EQ (nano::process_result::representative_mismatch, ledger.process (transaction, epoch5).code); - nano::state_block epoch6 (destination.pub, epoch4.hash (), 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch4.hash ())); + nano::state_block epoch6 (destination.pub, epoch4.hash (), 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch6).code); ASSERT_EQ (nano::epoch::epoch_2, epoch6.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch6.sideband ().source_epoch); // Not used for epoch blocks @@ -2413,11 +2413,11 @@ TEST (ledger, epoch_blocks_receive_upgrade) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_EQ (nano::epoch::epoch_1, send2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send2.sideband ().source_epoch); // Not used for send blocks @@ -2439,7 +2439,7 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_0); nano::pending_info pending_send2; ASSERT_FALSE (ledger.store.pending.get (transaction, nano::pending_key (destination.pub, send2.hash ()), pending_send2)); - ASSERT_EQ (nano::dev_genesis_key.pub, pending_send2.source); + ASSERT_EQ (nano::dev::genesis_key.pub, pending_send2.source); ASSERT_EQ (nano::Gxrb_ratio, pending_send2.amount.number ()); ASSERT_EQ (nano::epoch::epoch_1, pending_send2.epoch); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive2).code); @@ -2454,14 +2454,14 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open2).code); // Upgrade to epoch 2 and send to destination. Try to create an open block from an epoch 2 source block. nano::keypair destination3; - nano::state_block epoch2 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); - nano::state_block send4 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block send4 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send4).code); nano::open_block open3 (send4.hash (), destination3.pub, destination3.pub, destination3.prv, destination3.pub, *pool.generate (destination3.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open3).code); // Send it to an epoch 1 account - nano::state_block send5 (nano::dev::genesis->account (), send4.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send4.hash ())); + nano::state_block send5 (nano::dev::genesis->account (), send4.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send5).code); ASSERT_FALSE (ledger.store.account.get (transaction, destination.pub, destination_info)); ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_1); @@ -2473,9 +2473,9 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_2); // Upgrade an unopened account straight to epoch 2 nano::keypair destination4; - nano::state_block send6 (nano::dev::genesis->account (), send5.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send5.hash ())); + nano::state_block send6 (nano::dev::genesis->account (), send5.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send6).code); - nano::state_block epoch4 (destination4.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (destination4.pub)); + nano::state_block epoch4 (destination4.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (destination4.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); ASSERT_EQ (nano::epoch::epoch_2, epoch4.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch4.sideband ().source_epoch); // Not used for epoch blocks @@ -2494,17 +2494,17 @@ TEST (ledger, epoch_blocks_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::send_block send1 (genesis.hash (), nano::account (0), nano::genesis_amount, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::account (0), nano::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch1).code); - nano::state_block epoch2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); - nano::state_block epoch3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch3).code); ASSERT_EQ (nano::epoch::epoch_1, epoch3.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch3.sideband ().source_epoch); // Not used for epoch state blocks - nano::state_block epoch4 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch4 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); } @@ -2515,12 +2515,12 @@ TEST (ledger, successor_epoch) nano::keypair key1; nano::genesis genesis; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), key1.pub, nano::genesis_amount - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), key1.pub, nano::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); nano::state_block open (key1.pub, 0, key1.pub, 1, send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); nano::state_block change (key1.pub, open.hash (), key1.pub, 1, 0, key1.prv, key1.pub, *pool.generate (open.hash ())); auto open_hash = open.hash (); - nano::send_block send2 (send1.hash (), reinterpret_cast (open_hash), nano::genesis_amount - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); - nano::state_block epoch_open (reinterpret_cast (open_hash), 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (open.hash ())); + nano::send_block send2 (send1.hash (), reinterpret_cast (open_hash), nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch_open (reinterpret_cast (open_hash), 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (open.hash ())); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, send1).code); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, open).code); @@ -2546,7 +2546,7 @@ TEST (ledger, epoch_open_pending) .representative (0) .balance (0) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (key1.pub)) .build_shared (); auto process_result (node1.ledger.process (node1.store.tx_begin_write (), *epoch_open)); @@ -2567,7 +2567,7 @@ TEST (ledger, epoch_open_pending) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (nano::dev::genesis->hash ())) .build_shared (); node1.block_processor.add (send1); @@ -2595,7 +2595,7 @@ TEST (ledger, block_hash_account_conflict) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) .build_shared (); @@ -2635,7 +2635,7 @@ TEST (ledger, block_hash_account_conflict) .representative (0) .balance (0) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (receive1->hash ())) .build_shared (); @@ -2679,14 +2679,14 @@ TEST (ledger, could_fit) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; // Test legacy and state change blocks could_fit - nano::change_block change1 (genesis.hash (), nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block change2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::change_block change1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_TRUE (ledger.could_fit (transaction, change1)); ASSERT_TRUE (ledger.could_fit (transaction, change2)); // Test legacy and state send nano::keypair key1; - nano::send_block send1 (change1.hash (), key1.pub, nano::genesis_amount - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), change1.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); + nano::send_block send1 (change1.hash (), key1.pub, nano::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), change1.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, send1)); ASSERT_FALSE (ledger.could_fit (transaction, send2)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); @@ -2708,7 +2708,7 @@ TEST (ledger, could_fit) ASSERT_TRUE (ledger.could_fit (transaction, open1)); ASSERT_TRUE (ledger.could_fit (transaction, open2)); // Create another send to receive - nano::state_block send3 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block send3 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); // Test legacy and state receive nano::receive_block receive1 (open1.hash (), send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); nano::state_block receive2 (key1.pub, open1.hash (), nano::dev::genesis->account (), 2, send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); @@ -2718,7 +2718,7 @@ TEST (ledger, could_fit) ASSERT_TRUE (ledger.could_fit (transaction, receive1)); ASSERT_TRUE (ledger.could_fit (transaction, receive2)); // Test epoch (state) - nano::state_block epoch1 (key1.pub, receive1.hash (), nano::dev::genesis->account (), 2, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive1.hash ())); + nano::state_block epoch1 (key1.pub, receive1.hash (), nano::dev::genesis->account (), 2, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, epoch1)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (ledger.could_fit (transaction, receive1)); @@ -2734,11 +2734,11 @@ TEST (ledger, unchecked_epoch) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); - auto epoch1 (std::make_shared (destination.pub, open1->hash (), destination.pub, nano::Gxrb_ratio, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto epoch1 (std::make_shared (destination.pub, open1->hash (), destination.pub, nano::Gxrb_ratio, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*epoch1); node1.block_processor.add (epoch1); node1.block_processor.flush (); @@ -2774,7 +2774,7 @@ TEST (ledger, unchecked_epoch_invalid) auto & node1 (*system.add_node (node_config)); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2826,12 +2826,12 @@ TEST (ledger, unchecked_open) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); // Invalid signature for open block - auto open2 (std::make_shared (send1->hash (), nano::dev_genesis_key.pub, destination.pub, destination.prv, destination.pub, 0)); + auto open2 (std::make_shared (send1->hash (), nano::dev::genesis_key.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open2); open2->signature.bytes[0] ^= 1; node1.block_processor.add (open1); @@ -2863,9 +2863,9 @@ TEST (ledger, unchecked_receive) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2919,9 +2919,9 @@ TEST (ledger, confirmation_height_not_updated) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info account_info; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, account_info)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, account_info)); nano::keypair key; - nano::send_block send1 (account_info.head, key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (account_info.head)); + nano::send_block send1 (account_info.head, key.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (account_info.head)); nano::confirmation_height_info confirmation_height_info; ASSERT_FALSE (store->confirmation_height.get (transaction, nano::dev::genesis->account (), confirmation_height_info)); ASSERT_EQ (1, confirmation_height_info.height); @@ -2944,29 +2944,29 @@ TEST (ledger, zero_rep) nano::genesis genesis; nano::block_builder builder; auto block1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (0) .balance (nano::genesis_amount) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build (); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *block1).code); - ASSERT_EQ (0, node1.ledger.cache.rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, node1.ledger.cache.rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::genesis_amount, node1.ledger.cache.rep_weights.representation_get (0)); auto block2 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *block2).code); - ASSERT_EQ (nano::genesis_amount, node1.ledger.cache.rep_weights.representation_get (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount, node1.ledger.cache.rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node1.ledger.cache.rep_weights.representation_get (0)); } @@ -2981,7 +2981,7 @@ TEST (ledger, work_validation) store->initialize (store->tx_begin_write (), ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::block_builder builder; - auto gen = nano::dev_genesis_key; + auto gen = nano::dev::genesis_key; nano::keypair key; // With random work the block doesn't pass, then modifies the block with sufficient work and ensures a correct result @@ -3083,7 +3083,7 @@ TEST (ledger, dependents_confirmed) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send1).code); @@ -3094,7 +3094,7 @@ TEST (ledger, dependents_confirmed) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 200) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send2).code); @@ -3156,7 +3156,7 @@ TEST (ledger, dependents_confirmed_pruning) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send1).code); @@ -3166,7 +3166,7 @@ TEST (ledger, dependents_confirmed_pruning) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 200) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send2).code); @@ -3208,7 +3208,7 @@ TEST (ledger, block_confirmed) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) .build (); // Must be safe against non-existing blocks @@ -3261,7 +3261,7 @@ TEST (ledger, cache) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - (i + 1)) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (latest)) .build (); auto open = builder.state () @@ -3346,14 +3346,14 @@ TEST (ledger, pruning_action) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send1_stored (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send1_stored); ASSERT_EQ (send1, *send1_stored); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3370,7 +3370,7 @@ TEST (ledger, pruning_action) ASSERT_TRUE (store->block.exists (transaction, genesis.hash ())); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Receiving pruned block - nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive1_stored (store->block.get (transaction, receive1.hash ())); @@ -3407,10 +3407,10 @@ TEST (ledger, pruning_large_chain) auto last_hash (genesis.hash ()); for (auto i (0); i < send_receive_pairs; i++) { - nano::state_block send (nano::dev::genesis->account (), last_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (last_hash)); + nano::state_block send (nano::dev::genesis->account (), last_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (last_hash)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_TRUE (store->block.exists (transaction, send.hash ())); - nano::state_block receive (nano::dev::genesis->account (), send.hash (), nano::dev::genesis->account (), nano::genesis_amount, send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ())); + nano::state_block receive (nano::dev::genesis->account (), send.hash (), nano::dev::genesis->account (), nano::genesis_amount, send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_TRUE (store->block.exists (transaction, receive.hash ())); last_hash = receive.hash (); @@ -3440,12 +3440,12 @@ TEST (ledger, pruning_source_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3461,7 +3461,7 @@ TEST (ledger, pruning_source_rollback) ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_EQ (nano::epoch::epoch_1, info.epoch); // Receiving pruned block - nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); @@ -3492,15 +3492,15 @@ TEST (ledger, pruning_source_rollback_legacy) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); nano::keypair key1; - nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (key1.pub, send2.hash ()))); - nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send2.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send3).code); ASSERT_TRUE (store->block.exists (transaction, send3.hash ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send3.hash ()))); @@ -3522,7 +3522,7 @@ TEST (ledger, pruning_source_rollback_legacy) ASSERT_EQ (nano::Gxrb_ratio, info2.amount.number ()); ASSERT_EQ (nano::epoch::epoch_0, info2.epoch); // Receiving pruned block - nano::receive_block receive1 (send3.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send3.hash ())); + nano::receive_block receive1 (send3.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send3.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); @@ -3571,7 +3571,7 @@ TEST (ledger, pruning_process_error) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (0, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3582,7 +3582,7 @@ TEST (ledger, pruning_process_error) // Attempt to process pruned block again ASSERT_EQ (nano::process_result::old, ledger.process (transaction, send1).code); // Attept to process new block after pruned - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, send2).code); ASSERT_EQ (1, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3601,14 +3601,14 @@ TEST (ledger, pruning_legacy_blocks) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); - nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); - nano::change_block change1 (receive1.hash (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive1.hash ())); + nano::change_block change1 (receive1.hash (), key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); - nano::send_block send2 (change1.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change1.hash ())); + nano::send_block send2 (change1.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::open_block open1 (send2.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -3646,10 +3646,10 @@ TEST (ledger, pruning_safe_functions) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3689,10 +3689,10 @@ TEST (ledger, hash_root_random) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3734,12 +3734,12 @@ TEST (ledger, migrate_lmdb_to_rocksdb) nano::work_pool pool (std::numeric_limits::max ()); auto send = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (0) .link (nano::account (10)) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -3826,7 +3826,7 @@ TEST (ledger, unconfirmed_frontiers) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - 100) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (latest)) .build (); diff --git a/nano/core_test/ledger_walker.cpp b/nano/core_test/ledger_walker.cpp index d76e8b67..6c8aef22 100644 --- a/nano/core_test/ledger_walker.cpp +++ b/nano/core_test/ledger_walker.cpp @@ -69,10 +69,10 @@ TEST (ledger_walker, genesis_account_longer) EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.open_block), 1); EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.head), 1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); for (auto itr = 1; itr <= 5; ++itr) { - const auto send = system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 1); + const auto send = system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 1); ASSERT_TRUE (send); EXPECT_EQ (get_number_of_walked_blocks (send->hash ()), 1 + itr * 2 - 1); ASSERT_TIMELY (3s, 1 + itr * 2 == node->ledger.cache.cemented_count); @@ -97,13 +97,13 @@ TEST (ledger_walker, cross_account) const auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - ASSERT_TRUE (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 1)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + ASSERT_TRUE (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 1)); ASSERT_TIMELY (3s, 3 == node->ledger.cache.cemented_count); nano::keypair key{}; system.wallet (0)->insert_adhoc (key.prv); - ASSERT_TRUE (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + ASSERT_TRUE (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_TIMELY (3s, 5 == node->ledger.cache.cemented_count); const auto transaction = node->ledger.store.tx_begin_read (); @@ -146,11 +146,11 @@ TEST (ledger_walker, ladder_geometry) const auto node = system.add_node (node_config); std::array keys{}; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); for (auto itr = 0; itr != keys.size (); ++itr) { system.wallet (0)->insert_adhoc (keys[itr].prv); - const auto block = system.wallet (0)->send_action (nano::dev_genesis_key.pub, keys[itr].pub, 1000); + const auto block = system.wallet (0)->send_action (nano::dev::genesis_key.pub, keys[itr].pub, 1000); ASSERT_TIMELY (3s, 1 + (itr + 1) * 2 == node->ledger.cache.cemented_count); } diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp index a4797dfb..fd840137 100644 --- a/nano/core_test/network.cpp +++ b/nano/core_test/network.cpp @@ -209,13 +209,13 @@ TEST (network, send_discarded_publish) { auto transaction (node1.store.tx_begin_read ()); node1.network.flood_block (block); - ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub)); - ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node2.latest (nano::dev::genesis_key.pub)); } ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); auto transaction (node1.store.tx_begin_read ()); - ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub)); - ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node2.latest (nano::dev::genesis_key.pub)); } TEST (network, send_invalid_publish) @@ -224,17 +224,17 @@ TEST (network, send_invalid_publish) auto & node1 (*system.nodes[0]); auto & node2 (*system.nodes[1]); nano::genesis genesis; - auto block (std::make_shared (1, 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::root (1)))); + auto block (std::make_shared (1, 1, 20, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::root (1)))); { auto transaction (node1.store.tx_begin_read ()); node1.network.flood_block (block); - ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub)); - ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node2.latest (nano::dev::genesis_key.pub)); } ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); auto transaction (node1.store.tx_begin_read ()); - ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub)); - ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (genesis.hash (), node2.latest (nano::dev::genesis_key.pub)); } TEST (network, send_valid_confirm_ack) @@ -253,16 +253,16 @@ TEST (network, send_valid_confirm_ack) auto & node1 (*system.nodes[0]); auto & node2 (*system.nodes[1]); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (key2.prv); - nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub)); - nano::send_block block2 (latest1, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)); - nano::block_hash latest2 (node2.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest1 (node1.latest (nano::dev::genesis_key.pub)); + nano::send_block block2 (latest1, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1)); + nano::block_hash latest2 (node2.latest (nano::dev::genesis_key.pub)); node1.process_active (std::make_shared (block2)); // Keep polling until latest block changes - ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) != latest2); + ASSERT_TIMELY (10s, node2.latest (nano::dev::genesis_key.pub) != latest2); // Make sure the balance has decreased after processing the block. - ASSERT_EQ (50, node2.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (50, node2.balance (nano::dev::genesis_key.pub)); } } @@ -283,18 +283,18 @@ TEST (network, send_valid_publish) auto & node2 (*system.nodes[1]); node1.bootstrap_initiator.stop (); node2.bootstrap_initiator.stop (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; system.wallet (1)->insert_adhoc (key2.prv); - nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub)); - nano::send_block block2 (latest1, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)); + nano::block_hash latest1 (node1.latest (nano::dev::genesis_key.pub)); + nano::send_block block2 (latest1, key2.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1)); auto hash2 (block2.hash ()); - nano::block_hash latest2 (node2.latest (nano::dev_genesis_key.pub)); + nano::block_hash latest2 (node2.latest (nano::dev::genesis_key.pub)); node2.process_active (std::make_shared (block2)); ASSERT_TIMELY (10s, node1.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); ASSERT_NE (hash2, latest2); - ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) != latest2); - ASSERT_EQ (50, node2.balance (nano::dev_genesis_key.pub)); + ASSERT_TIMELY (10s, node2.latest (nano::dev::genesis_key.pub) != latest2); + ASSERT_EQ (50, node2.balance (nano::dev::genesis_key.pub)); } } @@ -305,7 +305,7 @@ TEST (network, send_insufficient_work_udp) node_flags.disable_udp = false; auto & node1 = *system.add_node (node_flags); auto & node2 = *system.add_node (node_flags); - auto block (std::make_shared (0, 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block (std::make_shared (0, 1, 20, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); nano::publish publish (block); nano::transport::channel_udp channel (node1.network.udp_channels, node2.network.endpoint (), node1.network_params.protocol.protocol_version); channel.send (publish, [] (boost::system::error_code const & ec, size_t size) {}); @@ -320,7 +320,7 @@ TEST (network, send_insufficient_work) auto & node1 = *system.nodes[0]; auto & node2 = *system.nodes[1]; // Block zero work - auto block1 (std::make_shared (0, 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block1 (std::make_shared (0, 1, 20, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); nano::publish publish1 (block1); auto tcp_channel (node1.network.tcp_channels.find_channel (nano::transport::map_endpoint_to_tcp (node2.network.endpoint ()))); tcp_channel->send (publish1, [] (boost::system::error_code const & ec, size_t size) {}); @@ -328,20 +328,20 @@ TEST (network, send_insufficient_work) ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::error, nano::stat::detail::insufficient_work) != 0); ASSERT_EQ (1, node2.stats.count (nano::stat::type::error, nano::stat::detail::insufficient_work)); // Legacy block work between epoch_2_recieve & epoch_1 - auto block2 (std::make_shared (block1->hash (), 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, system.work_generate_limited (block1->hash (), node1.network_params.network.publish_thresholds.epoch_2_receive, node1.network_params.network.publish_thresholds.epoch_1 - 1))); + auto block2 (std::make_shared (block1->hash (), 1, 20, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, system.work_generate_limited (block1->hash (), node1.network_params.network.publish_thresholds.epoch_2_receive, node1.network_params.network.publish_thresholds.epoch_1 - 1))); nano::publish publish2 (block2); tcp_channel->send (publish2, [] (boost::system::error_code const & ec, size_t size) {}); ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::error, nano::stat::detail::insufficient_work) != 1); ASSERT_EQ (2, node2.stats.count (nano::stat::type::error, nano::stat::detail::insufficient_work)); // Legacy block work epoch_1 - auto block3 (std::make_shared (block2->hash (), 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (block2->hash (), node1.network_params.network.publish_thresholds.epoch_2))); + auto block3 (std::make_shared (block2->hash (), 1, 20, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (block2->hash (), node1.network_params.network.publish_thresholds.epoch_2))); nano::publish publish3 (block3); tcp_channel->send (publish3, [] (boost::system::error_code const & ec, size_t size) {}); ASSERT_EQ (0, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in)); ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); ASSERT_EQ (1, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in)); // State block work epoch_2_recieve - auto block4 (std::make_shared (nano::dev_genesis_key.pub, block1->hash (), nano::dev_genesis_key.pub, 20, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, system.work_generate_limited (block1->hash (), node1.network_params.network.publish_thresholds.epoch_2_receive, node1.network_params.network.publish_thresholds.epoch_1 - 1))); + auto block4 (std::make_shared (nano::dev::genesis_key.pub, block1->hash (), nano::dev::genesis_key.pub, 20, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, system.work_generate_limited (block1->hash (), node1.network_params.network.publish_thresholds.epoch_2_receive, node1.network_params.network.publish_thresholds.epoch_1 - 1))); nano::publish publish4 (block4); tcp_channel->send (publish4, [] (boost::system::error_code const & ec, size_t size) {}); ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); @@ -354,10 +354,10 @@ TEST (receivable_processor, confirm_insufficient_pos) nano::system system (1); auto & node1 (*system.nodes[0]); nano::genesis genesis; - auto block1 (std::make_shared (genesis.hash (), 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block1 (std::make_shared (genesis.hash (), 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*block1); ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); nano::keypair key1; auto vote (std::make_shared (key1.pub, key1.prv, 0, block1)); nano::confirm_ack con1 (vote); @@ -369,11 +369,11 @@ TEST (receivable_processor, confirm_sufficient_pos) nano::system system (1); auto & node1 (*system.nodes[0]); nano::genesis genesis; - auto block1 (std::make_shared (genesis.hash (), 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block1 (std::make_shared (genesis.hash (), 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*block1); ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code); - node1.scheduler.activate (nano::dev_genesis_key.pub, node1.store.tx_begin_read ()); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, block1)); + node1.scheduler.activate (nano::dev::genesis_key.pub, node1.store.tx_begin_read ()); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, block1)); nano::confirm_ack con1 (vote); node1.network.inbound (con1, node1.network.udp_channels.create (node1.network.endpoint ())); } @@ -395,26 +395,26 @@ TEST (receivable_processor, send_with_receive) auto & node2 (*system.nodes[1]); auto amount (std::numeric_limits::max ()); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest1 (node1.latest (nano::dev::genesis_key.pub)); system.wallet (1)->insert_adhoc (key2.prv); - auto block1 (std::make_shared (latest1, key2.pub, amount - node1.config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1))); - ASSERT_EQ (amount, node1.balance (nano::dev_genesis_key.pub)); + auto block1 (std::make_shared (latest1, key2.pub, amount - node1.config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest1))); + ASSERT_EQ (amount, node1.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node1.balance (key2.pub)); - ASSERT_EQ (amount, node2.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (amount, node2.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node2.balance (key2.pub)); node1.process_active (block1); node1.block_processor.flush (); node2.process_active (block1); node2.block_processor.flush (); - ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node1.balance (key2.pub)); - ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node2.balance (key2.pub)); ASSERT_TIMELY (10s, node1.balance (key2.pub) == node1.config.receive_minimum.number () && node2.balance (key2.pub) == node1.config.receive_minimum.number ()); - ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (node1.config.receive_minimum.number (), node1.balance (key2.pub)); - ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev::genesis_key.pub)); ASSERT_EQ (node1.config.receive_minimum.number (), node2.balance (key2.pub)); } } @@ -422,14 +422,14 @@ TEST (receivable_processor, send_with_receive) TEST (network, receive_weight_change) { nano::system system (2); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; system.wallet (1)->insert_adhoc (key2.prv); { auto transaction (system.nodes[1]->wallets.tx_begin_write ()); system.wallet (1)->store.representative_set (transaction, key2.pub); } - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return node_a->weight (key2.pub) == system.nodes[0]->config.receive_minimum.number (); })); } diff --git a/nano/core_test/network_filter.cpp b/nano/core_test/network_filter.cpp index 6eb35274..2e2c58bd 100644 --- a/nano/core_test/network_filter.cpp +++ b/nano/core_test/network_filter.cpp @@ -39,12 +39,12 @@ TEST (network_filter, unit) } nano::state_block_builder builder; auto new_block = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.open->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 10 * nano::xrb_ratio) .link (nano::public_key ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); @@ -69,12 +69,12 @@ TEST (network_filter, many) { nano::state_block_builder builder; auto block = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.open->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - i * 10 * nano::xrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp index 88be824a..7d0647cd 100644 --- a/nano/core_test/node.cpp +++ b/nano/core_test/node.cpp @@ -102,15 +102,15 @@ TEST (node, password_fanout) TEST (node, balance) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto transaction (system.nodes[0]->store.tx_begin_write ()); - ASSERT_EQ (std::numeric_limits::max (), system.nodes[0]->ledger.account_balance (transaction, nano::dev_genesis_key.pub)); + ASSERT_EQ (std::numeric_limits::max (), system.nodes[0]->ledger.account_balance (transaction, nano::dev::genesis_key.pub)); } TEST (node, representative) { nano::system system (1); - auto block1 (system.nodes[0]->rep_block (nano::dev_genesis_key.pub)); + auto block1 (system.nodes[0]->rep_block (nano::dev::genesis_key.pub)); { auto transaction (system.nodes[0]->store.tx_begin_read ()); ASSERT_TRUE (system.nodes[0]->ledger.store.block.exists (transaction, block1)); @@ -123,30 +123,30 @@ TEST (node, send_unkeyed) { nano::system system (1); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (0)->store.password.value_set (nano::keypair ().prv); - ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); } TEST (node, send_self) { nano::system system (1); nano::keypair key2; - 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); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); ASSERT_TIMELY (10s, !system.nodes[0]->balance (key2.pub).is_zero ()); - ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub)); } TEST (node, send_single) { nano::system system (2); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (key2.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); - ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub)); ASSERT_TRUE (system.nodes[0]->balance (key2.pub).is_zero ()); ASSERT_TIMELY (10s, !system.nodes[0]->balance (key2.pub).is_zero ()); } @@ -155,10 +155,10 @@ TEST (node, send_single_observing_peer) { nano::system system (3); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (key2.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); - ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub)); ASSERT_TRUE (system.nodes[0]->balance (key2.pub).is_zero ()); ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return !node_a->balance (key2.pub).is_zero (); })); } @@ -167,10 +167,10 @@ TEST (node, send_single_many_peers) { nano::system system (10); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (key2.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); - ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); + ASSERT_EQ (std::numeric_limits::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub)); ASSERT_TRUE (system.nodes[0]->balance (key2.pub).is_zero ()); ASSERT_TIMELY (3.5min, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return !node_a->balance (key2.pub).is_zero (); })); system.stop (); @@ -192,27 +192,27 @@ TEST (node, send_out_of_order) .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (send1->hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - 2 * node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto send3 = builder.make_block () .previous (send2->hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - 3 * node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send2->hash ())) .build_shared (); node1.process_active (send3); node1.process_active (send2); node1.process_active (send1); - ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return node_a->balance (nano::dev_genesis_key.pub) == nano::genesis_amount - node1.config.receive_minimum.number () * 3; })); + ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return node_a->balance (nano::dev::genesis_key.pub) == nano::genesis_amount - node1.config.receive_minimum.number () * 3; })); } TEST (node, quick_confirm) @@ -220,20 +220,20 @@ TEST (node, quick_confirm) nano::system system (1); auto & node1 (*system.nodes[0]); nano::keypair key; - nano::block_hash previous (node1.latest (nano::dev_genesis_key.pub)); - auto genesis_start_balance (node1.balance (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1.latest (nano::dev::genesis_key.pub)); + auto genesis_start_balance (node1.balance (nano::dev::genesis_key.pub)); system.wallet (0)->insert_adhoc (key.prv); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto send = nano::send_block_builder () .previous (previous) .destination (key.pub) .balance (node1.online_reps.delta () + 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); node1.process_active (send); ASSERT_TIMELY (10s, !node1.balance (key.pub).is_zero ()); - ASSERT_EQ (node1.balance (nano::dev_genesis_key.pub), node1.online_reps.delta () + 1); + ASSERT_EQ (node1.balance (nano::dev::genesis_key.pub), node1.online_reps.delta () + 1); ASSERT_EQ (node1.balance (key.pub), genesis_start_balance - (node1.online_reps.delta () + 1)); } @@ -242,13 +242,13 @@ TEST (node, node_receive_quorum) nano::system system (1); auto & node1 = *system.nodes[0]; nano::keypair key; - nano::block_hash previous (node1.latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1.latest (nano::dev::genesis_key.pub)); system.wallet (0)->insert_adhoc (key.prv); auto send = nano::send_block_builder () .previous (previous) .destination (key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); node1.process_active (send); @@ -262,7 +262,7 @@ TEST (node, node_receive_quorum) nano::system system2; system2.add_node (); - system2.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system2.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TRUE (node1.balance (key.pub).is_zero ()); node1.network.tcp_channels.start_tcp (system2.nodes[0]->network.endpoint (), nano::keepalive_tcp_callback (node1)); while (node1.balance (key.pub).is_zero ()) @@ -282,9 +282,9 @@ TEST (node, auto_bootstrap) node_flags.disable_lazy_bootstrap = true; auto node0 = system.add_node (config, node_flags); nano::keypair key2; - 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); - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node0->config.receive_minimum.number ())); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node0->config.receive_minimum.number ())); ASSERT_NE (nullptr, send1); ASSERT_TIMELY (10s, node0->balance (key2.pub) == node0->config.receive_minimum.number ()); auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); @@ -314,11 +314,11 @@ TEST (node, auto_bootstrap_reverse) node_flags.disable_lazy_bootstrap = true; auto node0 = system.add_node (config, node_flags); nano::keypair key2; - 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); auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); ASSERT_FALSE (node1->init_error ()); - 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 (); system.nodes.push_back (node1); ASSERT_NE (nullptr, nano::establish_tcp (system, *node0, node1->network.endpoint ())); @@ -383,8 +383,8 @@ TEST (node, search_pending) nano::system system (1); auto node (system.nodes[0]); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); system.wallet (0)->insert_adhoc (key2.prv); ASSERT_FALSE (system.wallet (0)->search_pending (system.wallet (0)->wallets.tx_begin_read ())); ASSERT_TIMELY (10s, !node->balance (key2.pub).is_zero ()); @@ -395,9 +395,9 @@ TEST (node, search_pending_same) nano::system system (1); auto node (system.nodes[0]); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); system.wallet (0)->insert_adhoc (key2.prv); ASSERT_FALSE (system.wallet (0)->search_pending (system.wallet (0)->wallets.tx_begin_read ())); ASSERT_TIMELY (10s, node->balance (key2.pub) == 2 * node->config.receive_minimum.number ()); @@ -409,11 +409,11 @@ TEST (node, search_pending_multiple) auto node (system.nodes[0]); nano::keypair key2; nano::keypair key3; - 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 (key3.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key3.pub, node->config.receive_minimum.number ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key3.pub, node->config.receive_minimum.number ())); ASSERT_TIMELY (10s, !node->balance (key3.pub).is_zero ()); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (key3.pub, key2.pub, node->config.receive_minimum.number ())); system.wallet (0)->insert_adhoc (key2.prv); ASSERT_FALSE (system.wallet (0)->search_pending (system.wallet (0)->wallets.tx_begin_read ())); @@ -427,10 +427,10 @@ TEST (node, search_pending_confirmed) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, send1); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, send2); ASSERT_TIMELY (10s, node->active.empty ()); bool confirmed (false); @@ -443,7 +443,7 @@ TEST (node, search_pending_confirmed) } { auto transaction (node->wallets.tx_begin_write ()); - system.wallet (0)->store.erase (transaction, nano::dev_genesis_key.pub); + system.wallet (0)->store.erase (transaction, nano::dev::genesis_key.pub); } system.wallet (0)->insert_adhoc (key2.prv); ASSERT_FALSE (system.wallet (0)->search_pending (system.wallet (0)->wallets.tx_begin_read ())); @@ -469,17 +469,17 @@ TEST (node, search_pending_pruned) config.enable_voting = false; // Remove after allowing pruned voting auto node2 = system.add_node (config, node_flags); nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node2->config.receive_minimum.number ())); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node2->config.receive_minimum.number ())); ASSERT_NE (nullptr, send1); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node2->config.receive_minimum.number ())); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node2->config.receive_minimum.number ())); ASSERT_NE (nullptr, send2); // Confirmation ASSERT_TIMELY (10s, node1->active.empty () && node2->active.empty ()); ASSERT_TIMELY (5s, node1->ledger.block_confirmed (node1->store.tx_begin_read (), send2->hash ())); ASSERT_TIMELY (5s, node2->ledger.cache.cemented_count == 3); - system.wallet (0)->store.erase (node1->wallets.tx_begin_write (), nano::dev_genesis_key.pub); + system.wallet (0)->store.erase (node1->wallets.tx_begin_write (), nano::dev::genesis_key.pub); // Pruning { @@ -507,14 +507,14 @@ TEST (node, unlock_search) nano::system system (1); auto node (system.nodes[0]); nano::keypair key2; - nano::uint128_t balance (node->balance (nano::dev_genesis_key.pub)); + nano::uint128_t balance (node->balance (nano::dev::genesis_key.pub)); { auto transaction (system.wallet (0)->wallets.tx_begin_write ()); system.wallet (0)->store.rekey (transaction, ""); } - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); - ASSERT_TIMELY (10s, node->balance (nano::dev_genesis_key.pub) != balance); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number ())); + ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) != balance); ASSERT_TIMELY (10s, node->active.empty ()); system.wallet (0)->insert_adhoc (key2.prv); { @@ -570,7 +570,7 @@ TEST (node, price) TEST (node, confirm_locked) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto transaction (system.wallet (0)->wallets.tx_begin_read ()); system.wallet (0)->enter_password (transaction, "1"); auto block = nano::send_block_builder () @@ -1048,7 +1048,7 @@ TEST (node, fork_publish) nano::system system (1); node0 = system.nodes[0]; auto & node1 (*system.nodes[0]); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; nano::genesis genesis; nano::send_block_builder builder; @@ -1056,7 +1056,7 @@ TEST (node, fork_publish) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1.work_generate_blocking (*send1); @@ -1065,7 +1065,7 @@ TEST (node, fork_publish) .previous (genesis.hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1.work_generate_blocking (*send2); @@ -1080,7 +1080,7 @@ TEST (node, fork_publish) node1.process_active (send2); node1.block_processor.flush (); auto votes1 (election->votes ()); - auto existing1 (votes1.find (nano::dev_genesis_key.pub)); + auto existing1 (votes1.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes1.end (), existing1); ASSERT_EQ (send1->hash (), existing1->second.hash); auto winner (*election->tally ().begin ()); @@ -1102,14 +1102,14 @@ TEST (node, fork_publish_inactive) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (send1->block_work ()) .build_shared (); auto & node = *system.nodes[0]; @@ -1140,14 +1140,14 @@ TEST (node, fork_keep) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (send1); @@ -1158,7 +1158,7 @@ TEST (node, fork_keep) node2.scheduler.flush (); ASSERT_EQ (1, node1.active.size ()); ASSERT_EQ (1, node2.active.size ()); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node1.process_active (send2); node1.block_processor.flush (); node2.process_active (send2); @@ -1193,7 +1193,7 @@ TEST (node, fork_flip) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::publish publish1 (send1); @@ -1202,7 +1202,7 @@ TEST (node, fork_flip) .previous (genesis.hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::publish publish2 (send2); @@ -1216,7 +1216,7 @@ TEST (node, fork_flip) node2.scheduler.flush (); ASSERT_EQ (1, node1.active.size ()); ASSERT_EQ (1, node2.active.size ()); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node1.network.inbound (publish2, channel1); node1.block_processor.flush (); node2.network.inbound (publish1, channel2); @@ -1261,7 +1261,7 @@ TEST (node, fork_multi_flip) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::publish publish1 (send1); @@ -1270,7 +1270,7 @@ TEST (node, fork_multi_flip) .previous (genesis.hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::publish publish2 (send2); @@ -1278,7 +1278,7 @@ TEST (node, fork_multi_flip) .previous (publish2.block->hash ()) .destination (key2.pub) .balance (nano::genesis_amount - 100) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (publish2.block->hash ())) .build_shared (); nano::publish publish3 (send3); @@ -1291,7 +1291,7 @@ TEST (node, fork_multi_flip) node2.scheduler.flush (); ASSERT_EQ (1, node1.active.size ()); ASSERT_EQ (1, node2.active.size ()); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node1.network.inbound (publish2, node1.network.udp_channels.create (node1.network.endpoint ())); node1.network.inbound (publish3, node1.network.udp_channels.create (node1.network.endpoint ())); node1.block_processor.flush (); @@ -1328,15 +1328,15 @@ TEST (node, fork_bootstrap_flip) auto & node1 = *system0.add_node (config0, node_flags); nano::node_config config1 (nano::get_available_port (), system1.logging); auto & node2 = *system1.add_node (config1, node_flags); - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest = node1.latest (nano::dev_genesis_key.pub); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest = node1.latest (nano::dev::genesis_key.pub); nano::keypair key1; nano::send_block_builder builder; auto send1 = builder.make_block () .previous (latest) .destination (key1.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system0.work.generate (latest)) .build_shared (); nano::keypair key2; @@ -1344,7 +1344,7 @@ TEST (node, fork_bootstrap_flip) .previous (latest) .destination (key2.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system0.work.generate (latest)) .build_shared (); // Insert but don't rebroadcast, simulating settled blocks @@ -1372,7 +1372,7 @@ TEST (node, fork_open) .previous (genesis.hash ()) .destination (key1.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::publish publish1 (send1); @@ -1405,7 +1405,7 @@ TEST (node, fork_open) .work (*system.work.generate (key1.pub)) .build_shared (); nano::publish publish3 (open2); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node1.network.inbound (publish3, channel1); node1.block_processor.flush (); node1.scheduler.flush (); @@ -1431,7 +1431,7 @@ TEST (node, fork_open_flip) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); // A copy is necessary to avoid data races during ledger processing, which sets the sideband @@ -1466,7 +1466,7 @@ TEST (node, fork_open_flip) node2.block_confirm (open2); ASSERT_EQ (2, node1.active.size ()); ASSERT_EQ (2, node2.active.size ()); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Notify both nodes that a fork exists node1.process_active (open2); node1.block_processor.flush (); @@ -1498,9 +1498,9 @@ TEST (node, coherent_observer) auto transaction (node1.store.tx_begin_read ()); ASSERT_TRUE (node1.store.block.exists (transaction, status_a.winner->hash ())); }); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1); } TEST (node, fork_no_vote_quorum) @@ -1509,21 +1509,21 @@ TEST (node, fork_no_vote_quorum) auto & node1 (*system.nodes[0]); auto & node2 (*system.nodes[1]); auto & node3 (*system.nodes[2]); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto key4 (system.wallet (0)->deterministic_insert ()); - system.wallet (0)->send_action (nano::dev_genesis_key.pub, key4, nano::genesis_amount / 4); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key4, nano::genesis_amount / 4); auto key1 (system.wallet (1)->deterministic_insert ()); { auto transaction (system.wallet (1)->wallets.tx_begin_write ()); system.wallet (1)->store.representative_set (transaction, key1); } - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1, node1.config.receive_minimum.number ())); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1, node1.config.receive_minimum.number ())); ASSERT_NE (nullptr, block); ASSERT_TIMELY (30s, node3.balance (key1) == node1.config.receive_minimum.number () && node2.balance (key1) == node1.config.receive_minimum.number () && node1.balance (key1) == node1.config.receive_minimum.number ()); ASSERT_EQ (node1.config.receive_minimum.number (), node1.weight (key1)); ASSERT_EQ (node1.config.receive_minimum.number (), node2.weight (key1)); ASSERT_EQ (node1.config.receive_minimum.number (), node3.weight (key1)); - nano::state_block send1 (nano::dev_genesis_key.pub, block->hash (), nano::dev_genesis_key.pub, (nano::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2), key1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (block->hash ())); + nano::state_block send1 (nano::dev::genesis_key.pub, block->hash (), nano::dev::genesis_key.pub, (nano::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2), key1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (block->hash ())); ASSERT_EQ (nano::process_result::progress, node1.process (send1).code); ASSERT_EQ (nano::process_result::progress, node2.process (send1).code); ASSERT_EQ (nano::process_result::progress, node3.process (send1).code); @@ -1532,7 +1532,7 @@ TEST (node, fork_no_vote_quorum) .previous (block->hash ()) .destination (key2) .balance ((nano::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2)) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block->hash ())) .build_shared (); nano::raw_key key3; @@ -1549,9 +1549,9 @@ TEST (node, fork_no_vote_quorum) ASSERT_NE (nullptr, channel); channel->send_buffer (nano::shared_const_buffer (std::move (buffer))); ASSERT_TIMELY (10s, node3.stats.count (nano::stat::type::message, nano::stat::detail::confirm_ack, nano::stat::dir::in) >= 3); - ASSERT_TRUE (node1.latest (nano::dev_genesis_key.pub) == send1.hash ()); - ASSERT_TRUE (node2.latest (nano::dev_genesis_key.pub) == send1.hash ()); - ASSERT_TRUE (node3.latest (nano::dev_genesis_key.pub) == send1.hash ()); + ASSERT_TRUE (node1.latest (nano::dev::genesis_key.pub) == send1.hash ()); + ASSERT_TRUE (node2.latest (nano::dev::genesis_key.pub) == send1.hash ()); + ASSERT_TRUE (node3.latest (nano::dev::genesis_key.pub) == send1.hash ()); } // Disabled because it sometimes takes way too long (but still eventually finishes) @@ -1562,7 +1562,7 @@ TEST (node, DISABLED_fork_pre_confirm) auto & node1 (*system.nodes[1]); auto & node2 (*system.nodes[2]); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; system.wallet (1)->insert_adhoc (key1.prv); { @@ -1575,31 +1575,31 @@ TEST (node, DISABLED_fork_pre_confirm) auto transaction (system.wallet (2)->wallets.tx_begin_write ()); system.wallet (2)->store.representative_set (transaction, key2.pub); } - auto block0 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, nano::genesis_amount / 3)); + auto block0 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::genesis_amount / 3)); ASSERT_NE (nullptr, block0); ASSERT_TIMELY (30s, node0.balance (key1.pub) != 0); - auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, nano::genesis_amount / 3)); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, nano::genesis_amount / 3)); ASSERT_NE (nullptr, block1); ASSERT_TIMELY (30s, node0.balance (key2.pub) != 0); nano::keypair key3; nano::keypair key4; nano::state_block_builder builder; auto block2 = builder.make_block () - .account (nano::dev_genesis_key.pub) - .previous (node0.latest (nano::dev_genesis_key.pub)) + .account (nano::dev::genesis_key.pub) + .previous (node0.latest (nano::dev::genesis_key.pub)) .representative (key3.pub) - .balance (node0.balance (nano::dev_genesis_key.pub)) + .balance (node0.balance (nano::dev::genesis_key.pub)) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); auto block3 = builder.make_block () - .account (nano::dev_genesis_key.pub) - .previous (node0.latest (nano::dev_genesis_key.pub)) + .account (nano::dev::genesis_key.pub) + .previous (node0.latest (nano::dev::genesis_key.pub)) .representative (key4.pub) - .balance (node0.balance (nano::dev_genesis_key.pub)) + .balance (node0.balance (nano::dev::genesis_key.pub)) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node0.work_generate_blocking (*block2); @@ -1612,8 +1612,8 @@ TEST (node, DISABLED_fork_pre_confirm) system.deadline_set (70s); while (!done) { - done |= node0.latest (nano::dev_genesis_key.pub) == block2->hash () && node1.latest (nano::dev_genesis_key.pub) == block2->hash () && node2.latest (nano::dev_genesis_key.pub) == block2->hash (); - done |= node0.latest (nano::dev_genesis_key.pub) == block3->hash () && node1.latest (nano::dev_genesis_key.pub) == block3->hash () && node2.latest (nano::dev_genesis_key.pub) == block3->hash (); + done |= node0.latest (nano::dev::genesis_key.pub) == block2->hash () && node1.latest (nano::dev::genesis_key.pub) == block2->hash () && node2.latest (nano::dev::genesis_key.pub) == block2->hash (); + done |= node0.latest (nano::dev::genesis_key.pub) == block3->hash () && node1.latest (nano::dev::genesis_key.pub) == block3->hash () && node2.latest (nano::dev::genesis_key.pub) == block3->hash (); ASSERT_NO_ERROR (system.poll ()); } } @@ -1622,25 +1622,25 @@ TEST (node, DISABLED_fork_pre_confirm) TEST (node, DISABLED_fork_stale) { nano::system system1 (1); - system1.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system1.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::system system2 (1); auto & node1 (*system1.nodes[0]); auto & node2 (*system2.nodes[0]); node2.bootstrap_initiator.bootstrap (node1.network.endpoint (), false); std::shared_ptr channel (std::make_shared (node2.network.udp_channels, node1.network.endpoint (), node2.network_params.protocol.protocol_version)); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector ()); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector ()); node2.rep_crawler.response (channel, vote); nano::genesis genesis; nano::keypair key1; nano::keypair key2; nano::state_block_builder builder; auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Mxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1.work_generate_blocking (*send3); @@ -1652,22 +1652,22 @@ TEST (node, DISABLED_fork_stale) ASSERT_NO_ERROR (system2.poll ()); } auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Mxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1.work_generate_blocking (*send1); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Mxrb_ratio) .link (key2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1.work_generate_blocking (*send2); @@ -1721,7 +1721,7 @@ TEST (node, broadcast_elected) .previous (nano::dev::genesis->hash ()) .destination (rep_big.pub) .balance (nano::Gxrb_ratio * 5) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open_big = *builder.open () @@ -1735,7 +1735,7 @@ TEST (node, broadcast_elected) .previous (fund_big.hash ()) .destination (rep_small.pub) .balance (nano::Gxrb_ratio * 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (fund_big.hash ())) .build (); auto open_small = *builder.open () @@ -1749,7 +1749,7 @@ TEST (node, broadcast_elected) .previous (fund_small.hash ()) .destination (rep_other.pub) .balance (nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (fund_small.hash ())) .build (); auto open_other = *builder.open () @@ -1781,7 +1781,7 @@ TEST (node, broadcast_elected) // Confirm blocks to allow voting for (auto & node : system.nodes) { - auto block (node->block (node->latest (nano::dev_genesis_key.pub))); + auto block (node->block (node->latest (nano::dev::genesis_key.pub))); ASSERT_NE (nullptr, block); node->block_confirm (block); auto election (node->active.election (block->qualified_root ())); @@ -1794,22 +1794,22 @@ TEST (node, broadcast_elected) system.wallet (1)->insert_adhoc (rep_small.prv); system.wallet (2)->insert_adhoc (rep_other.prv); auto fork0 = builder.send () - .previous (node2->latest (nano::dev_genesis_key.pub)) + .previous (node2->latest (nano::dev::genesis_key.pub)) .destination (rep_small.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*node0->work_generate_blocking (node2->latest (nano::dev_genesis_key.pub))) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) + .work (*node0->work_generate_blocking (node2->latest (nano::dev::genesis_key.pub))) .build_shared (); // A copy is necessary to avoid data races during ledger processing, which sets the sideband auto fork0_copy (std::make_shared (*fork0)); node0->process_active (fork0); node1->process_active (fork0_copy); auto fork1 = builder.send () - .previous (node2->latest (nano::dev_genesis_key.pub)) + .previous (node2->latest (nano::dev::genesis_key.pub)) .destination (rep_big.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*node0->work_generate_blocking (node2->latest (nano::dev_genesis_key.pub))) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) + .work (*node0->work_generate_blocking (node2->latest (nano::dev::genesis_key.pub))) .build_shared (); system.wallet (2)->insert_adhoc (rep_small.prv); node2->process_active (fork1); @@ -1839,7 +1839,7 @@ TEST (node, rep_self_vote) .previous (nano::dev::genesis->hash ()) .destination (rep_big.pub) .balance (nano::uint128_t{ "0xb0000000000000000000000000000000" }) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open_big = *builder.open () @@ -1858,26 +1858,26 @@ TEST (node, rep_self_vote) election->force_confirm (); system.wallet (0)->insert_adhoc (rep_big.prv); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_EQ (system.wallet (0)->wallets.reps ().voting, 2); auto block0 = builder.send () .previous (fund_big.hash ()) .destination (rep_big.pub) .balance (nano::uint128_t ("0x60000000000000000000000000000000")) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (fund_big.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node0->process (*block0).code); auto & active = node0->active; auto & scheduler = node0->scheduler; - scheduler.activate (nano::dev_genesis_key.pub, node0->store.tx_begin_read ()); + scheduler.activate (nano::dev::genesis_key.pub, node0->store.tx_begin_read ()); scheduler.flush (); auto election1 = active.election (block0->qualified_root ()); ASSERT_NE (nullptr, election1); // Wait until representatives are activated & make vote ASSERT_TIMELY (1s, election1->votes ().size () == 3); auto rep_votes (election1->votes ()); - ASSERT_NE (rep_votes.end (), rep_votes.find (nano::dev_genesis_key.pub)); + ASSERT_NE (rep_votes.end (), rep_votes.find (nano::dev::genesis_key.pub)); ASSERT_NE (rep_votes.end (), rep_votes.find (rep_big.pub)); } @@ -1890,7 +1890,7 @@ TEST (node, DISABLED_bootstrap_no_publish) auto node1 (system1.nodes[0]); nano::keypair key0; // node0 knows about send0 but node1 doesn't. - nano::send_block send0 (node0->latest (nano::dev_genesis_key.pub), key0.pub, 500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::send_block send0 (node0->latest (nano::dev::genesis_key.pub), key0.pub, 500, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, send0).code); @@ -1927,7 +1927,7 @@ TEST (node, bootstrap_bulk_push) .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (500) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node0->process (*send0).code); @@ -1965,7 +1965,7 @@ TEST (node, bootstrap_fork_open) .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (nano::genesis_amount - 500) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); auto open0 = *builder.open () @@ -1988,7 +1988,7 @@ TEST (node, bootstrap_fork_open) // Confirm send0 to allow starting and voting on the following blocks for (auto node : system.nodes) { - node->block_confirm (node->block (node->latest (nano::dev_genesis_key.pub))); + node->block_confirm (node->block (node->latest (nano::dev::genesis_key.pub))); ASSERT_TIMELY (1s, node->active.election (send0.qualified_root ())); auto election = node->active.election (send0.qualified_root ()); ASSERT_NE (nullptr, election); @@ -1999,7 +1999,7 @@ TEST (node, bootstrap_fork_open) // They disagree about open0/open1 ASSERT_EQ (nano::process_result::progress, node0->process (open0).code); ASSERT_EQ (nano::process_result::progress, node1->process (open1).code); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_FALSE (node1->ledger.block_or_pruned_exists (open0.hash ())); ASSERT_FALSE (node1->bootstrap_initiator.in_progress ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); @@ -2014,14 +2014,14 @@ TEST (node, bootstrap_confirm_frontiers) nano::system system1 (1); auto node0 (system0.nodes[0]); auto node1 (system1.nodes[0]); - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key0; // node0 knows about send0 but node1 doesn't. auto send0 = nano::send_block_builder () .previous (nano::dev::genesis->hash ()) .destination (key0.pub) .balance (nano::genesis_amount - 500) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node0->process (*send0).code); @@ -2072,7 +2072,7 @@ TEST (node, DISABLED_unconfirmed_send) auto wallet1 (system.wallet (1)); nano::keypair key0; wallet1->insert_adhoc (key0.prv); - wallet0->insert_adhoc (nano::dev_genesis_key.prv); + wallet0->insert_adhoc (nano::dev::genesis_key.prv); auto send1 (wallet0->send_action (nano::dev::genesis->account (), key0.pub, 2 * nano::Mxrb_ratio)); ASSERT_TIMELY (10s, node1.balance (key0.pub) == 2 * nano::Mxrb_ratio && !node1.bootstrap_initiator.in_progress ()); auto latest (node1.latest (key0.pub)); @@ -2093,10 +2093,10 @@ TEST (node, rep_list) auto wallet0 (system.wallet (0)); auto wallet1 (system.wallet (1)); // Node0 has a rep - wallet0->insert_adhoc (nano::dev_genesis_key.prv); + wallet0->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; // Broadcast a confirm so others should know this is a rep node - wallet0->send_action (nano::dev_genesis_key.pub, key1.pub, nano::Mxrb_ratio); + wallet0->send_action (nano::dev::genesis_key.pub, key1.pub, nano::Mxrb_ratio); ASSERT_EQ (0, node1.rep_crawler.representatives (1).size ()); system.deadline_set (10s); auto done (false); @@ -2135,12 +2135,12 @@ TEST (node, rep_weight) auto amount_not_pr (node.minimum_principal_weight () - 100); std::shared_ptr block1 = builder .state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - amount_not_pr) .link (keypair1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build (); std::shared_ptr block2 = builder @@ -2155,12 +2155,12 @@ TEST (node, rep_weight) .build (); std::shared_ptr block3 = builder .state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - amount_not_pr - amount_pr) .link (keypair2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) .build (); std::shared_ptr block4 = builder @@ -2187,7 +2187,7 @@ TEST (node, rep_weight) ASSERT_NE (nullptr, channel2); std::shared_ptr channel3 = nano::establish_tcp (system, node, node3.network.endpoint ()); ASSERT_NE (nullptr, channel3); - auto vote0 = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, genesis.open); + auto vote0 = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, genesis.open); auto vote1 = std::make_shared (keypair1.pub, keypair1.prv, 0, genesis.open); auto vote2 = std::make_shared (keypair2.pub, keypair2.prv, 0, genesis.open); node.rep_crawler.response (channel1, vote0); @@ -2197,8 +2197,8 @@ TEST (node, rep_weight) // Make sure we get the rep with the most weight first auto reps (node.rep_crawler.representatives (1)); ASSERT_EQ (1, reps.size ()); - ASSERT_EQ (node.balance (nano::dev_genesis_key.pub), reps[0].weight.number ()); - ASSERT_EQ (nano::dev_genesis_key.pub, reps[0].account); + ASSERT_EQ (node.balance (nano::dev::genesis_key.pub), reps[0].weight.number ()); + ASSERT_EQ (nano::dev::genesis_key.pub, reps[0].account); ASSERT_EQ (*channel1, reps[0].channel_ref ()); ASSERT_TRUE (node.rep_crawler.is_pr (*channel1)); ASSERT_FALSE (node.rep_crawler.is_pr (*channel2)); @@ -2217,12 +2217,12 @@ TEST (node, rep_remove) nano::block_builder builder; std::shared_ptr block1 = builder .state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - node.minimum_principal_weight () * 2) .link (keypair1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build (); std::shared_ptr block2 = builder @@ -2237,12 +2237,12 @@ TEST (node, rep_remove) .build (); std::shared_ptr block3 = builder .state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - node.minimum_principal_weight () * 4) .link (keypair2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) .build (); std::shared_ptr block4 = builder @@ -2284,10 +2284,10 @@ TEST (node, rep_remove) ASSERT_TIMELY (10s, node.rep_crawler.representative_count () == 0); // Add working representative auto node1 = system.add_node (nano::node_config (nano::get_available_port (), system.logging)); - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); auto channel1 (node.network.find_channel (node1->network.endpoint ())); ASSERT_NE (nullptr, channel1); - auto vote2 = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, genesis.open); + auto vote2 = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, genesis.open); node.rep_crawler.response (channel1, vote2); ASSERT_TIMELY (10s, node.rep_crawler.representative_count () == 1); // Add inactive TCP representative channel @@ -2304,7 +2304,7 @@ TEST (node, rep_remove) node2->stop (); ASSERT_TIMELY (10s, node.rep_crawler.representative_count () == 1); reps = node.rep_crawler.representatives (1); - ASSERT_EQ (nano::dev_genesis_key.pub, reps[0].account); + ASSERT_EQ (nano::dev::genesis_key.pub, reps[0].account); ASSERT_EQ (1, node.network.size ()); auto list (node.network.list (1)); ASSERT_EQ (node1->network.endpoint (), list[0]->get_endpoint ()); @@ -2316,7 +2316,7 @@ TEST (node, rep_connection_close) auto & node1 (*system.nodes[0]); auto & node2 (*system.nodes[1]); // Add working representative (node 2) - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (10s, node1.rep_crawler.representative_count () == 1); node2.stop (); // Remove representative with closed channel @@ -2335,11 +2335,11 @@ TEST (node, no_voting) auto wallet0 (system.wallet (0)); auto wallet1 (system.wallet (1)); // Node1 has a rep - wallet1->insert_adhoc (nano::dev_genesis_key.prv); + wallet1->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; wallet1->insert_adhoc (key1.prv); // Broadcast a confirm so others should know this is a rep node - wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, nano::Mxrb_ratio); + wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, nano::Mxrb_ratio); ASSERT_TIMELY (10s, node0.active.empty ()); ASSERT_EQ (0, node0.stats.count (nano::stat::type::message, nano::stat::detail::confirm_ack, nano::stat::dir::in)); } @@ -2349,14 +2349,14 @@ TEST (node, send_callback) nano::system system (1); auto & node0 (*system.nodes[0]); nano::keypair key2; - 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); node0.config.callback_address = "localhost"; node0.config.callback_port = 8010; node0.config.callback_target = "/"; - 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 ())); ASSERT_TIMELY (10s, node0.balance (key2.pub).is_zero ()); - ASSERT_EQ (std::numeric_limits::max () - node0.config.receive_minimum.number (), node0.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (std::numeric_limits::max () - node0.config.receive_minimum.number (), node0.balance (nano::dev::genesis_key.pub)); } TEST (node, balance_observer) @@ -2370,13 +2370,13 @@ TEST (node, balance_observer) { balances++; } - else if (nano::dev_genesis_key.pub == account_a && !is_pending) + else if (nano::dev::genesis_key.pub == account_a && !is_pending) { balances++; } }); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1); system.deadline_set (10s); auto done (false); while (!done) @@ -2476,7 +2476,7 @@ TEST (node, online_reps) ASSERT_EQ (node1.config.online_weight_minimum, node1.online_reps.trended ()); auto vote (std::make_shared ()); ASSERT_EQ (0, node1.online_reps.online ()); - node1.online_reps.observe (nano::dev_genesis_key.pub); + node1.online_reps.observe (nano::dev::genesis_key.pub); ASSERT_EQ (nano::genesis_amount, node1.online_reps.online ()); // 1 minimum, 1 maximum ASSERT_EQ (node1.config.online_weight_minimum, node1.online_reps.trended ()); @@ -2496,7 +2496,7 @@ TEST (node, online_reps_rep_crawler) nano::node_flags flags; flags.disable_rep_crawler = true; auto & node1 = *system.add_node (flags); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ nano::dev::genesis->hash () }); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ nano::dev::genesis->hash () }); ASSERT_EQ (0, node1.online_reps.online ()); // Without rep crawler node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); @@ -2522,12 +2522,12 @@ TEST (node, online_reps_election) nano::keypair key; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) .build_shared (); node1.process_active (send1); @@ -2535,7 +2535,7 @@ TEST (node, online_reps_election) node1.scheduler.flush (); ASSERT_EQ (1, node1.active.size ()); // Process vote for ongoing election - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send1->hash () }); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send1->hash () }); ASSERT_EQ (0, node1.online_reps.online ()); node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, node1.online_reps.online ()); @@ -2559,14 +2559,14 @@ TEST (node, block_confirm) nano::genesis genesis; nano::keypair key; nano::state_block_builder builder; - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) .build_shared (); // A copy is necessary to avoid data races during ledger processing, which sets the sideband @@ -2638,26 +2638,26 @@ TEST (node, confirm_quorum) nano::system system (1); auto & node1 = *system.nodes[0]; nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Put greater than node.delta () in pending so quorum can't be reached nano::amount new_balance = node1.online_reps.delta () - nano::Gxrb_ratio; auto send1 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (new_balance) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); - system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, new_balance.number ()); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, new_balance.number ()); ASSERT_TIMELY (2s, node1.active.election (send1->qualified_root ())); auto election = node1.active.election (send1->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_FALSE (election->confirmed ()); ASSERT_EQ (1, election->votes ().size ()); - ASSERT_EQ (0, node1.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, node1.balance (nano::dev::genesis_key.pub)); } TEST (node, local_votes_cache) @@ -2670,30 +2670,30 @@ TEST (node, local_votes_cache) nano::genesis genesis; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) .build_shared (); { @@ -2707,7 +2707,7 @@ TEST (node, local_votes_cache) ASSERT_NE (nullptr, election); election->force_confirm (); ASSERT_TIMELY (3s, node.ledger.cache.cemented_count == 3); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::confirm_req message1 (send1); nano::confirm_req message2 (send2); auto channel (node.network.udp_channels.create (node.network.endpoint ())); @@ -2754,34 +2754,34 @@ TEST (node, local_votes_cache_batch) auto & node (*system.add_node (node_config)); ASSERT_GE (node.network_params.voting.max_cache, 2); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; auto send1 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); node.confirmation_height_processor.add (send1); ASSERT_TIMELY (5s, node.ledger.block_confirmed (node.store.tx_begin_read (), send1->hash ())); auto send2 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send2).code); auto receive1 = nano::state_block_builder () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -2823,7 +2823,7 @@ TEST (node, local_votes_cache_generate_new_vote) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Repsond with cached vote nano::confirm_req message1 (genesis.open); auto channel (node.network.udp_channels.create (node.network.endpoint ())); @@ -2835,12 +2835,12 @@ TEST (node, local_votes_cache_generate_new_vote) ASSERT_EQ (genesis.open->hash (), boost::get (votes1[0]->blocks[0])); ASSERT_TIMELY (3s, node.stats.count (nano::stat::type::requests, nano::stat::detail::requests_generated_votes) == 1); auto send1 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); @@ -2873,28 +2873,28 @@ TEST (node, local_votes_cache_fork) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 (*system.add_node (node_config, node_flags)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto send1 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) .build_shared (); auto send1_fork = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); // Cache vote - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector (1, send1->hash ()))); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector (1, send1->hash ()))); node1.vote_processor.vote (vote, std::make_shared (node1)); node1.history.add (send1->root (), send1->hash (), vote); auto votes2 (node1.history.votes (send1->root (), send1->hash ())); @@ -2922,20 +2922,20 @@ TEST (node, vote_republish) .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number () * 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (send1); ASSERT_TIMELY (5s, node2.block (send1->hash ())); node1.process_active (send2); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), send2)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), send2)); ASSERT_TRUE (node1.active.active (*send1)); ASSERT_TIMELY (10s, node2.active.active (*send1)); node1.vote_processor.vote (vote, std::make_shared (node1)); @@ -2956,12 +2956,12 @@ TEST (node, vote_by_hash_bundle) nano::state_block_builder builder; std::vector> blocks; auto block = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); blocks.push_back (block); @@ -2972,7 +2972,7 @@ TEST (node, vote_by_hash_bundle) .from (*blocks.back ()) .previous (blocks.back ()->hash ()) .balance (nano::genesis_amount - i) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (blocks.back ()->hash ())) .build_shared (); blocks.push_back (block); @@ -2982,7 +2982,7 @@ TEST (node, vote_by_hash_bundle) auto election = node.active.election (blocks.back ()->qualified_root ()); ASSERT_NE (nullptr, election); election->force_confirm (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; system.wallet (0)->insert_adhoc (key1.prv); @@ -3016,14 +3016,14 @@ TEST (node, vote_by_hash_republish) .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number () * 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (send1); @@ -3031,7 +3031,7 @@ TEST (node, vote_by_hash_republish) node1.process_active (send2); std::vector vote_blocks; vote_blocks.push_back (send2->hash ()); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), vote_blocks); // Final vote for confirmation + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), vote_blocks); // Final vote for confirmation ASSERT_TRUE (node1.active.active (*send1)); ASSERT_TRUE (node2.active.active (*send1)); node1.vote_processor.vote (vote, std::make_shared (node1)); @@ -3055,7 +3055,7 @@ TEST (node, vote_by_hash_epoch_block_republish) .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto epoch1 = nano::state_block_builder () @@ -3064,7 +3064,7 @@ TEST (node, vote_by_hash_epoch_block_republish) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); node1.process_active (send1); @@ -3072,7 +3072,7 @@ TEST (node, vote_by_hash_epoch_block_republish) node1.active.publish (epoch1); std::vector vote_blocks; vote_blocks.push_back (epoch1->hash ()); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, vote_blocks)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, vote_blocks)); ASSERT_TRUE (node1.active.active (*send1)); ASSERT_TRUE (node2.active.active (*send1)); node1.vote_processor.vote (vote, std::make_shared (node1)); @@ -3092,15 +3092,15 @@ TEST (node, epoch_conflict_confirm) auto node1 = system.add_node (node_config); nano::keypair key; nano::genesis genesis; - nano::keypair epoch_signer (nano::dev_genesis_key); + nano::keypair epoch_signer (nano::dev::genesis_key); nano::state_block_builder builder; auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto open = builder.make_block () @@ -3122,12 +3122,12 @@ TEST (node, epoch_conflict_confirm) .work (*system.work.generate (open->hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2) .link (open->hash ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); auto epoch_open = builder.make_block () @@ -3165,7 +3165,7 @@ TEST (node, epoch_conflict_confirm) ASSERT_TRUE (node0->active.blocks.find (change->hash ()) != node0->active.blocks.end ()); ASSERT_TRUE (node0->active.blocks.find (epoch_open->hash ()) != node0->active.blocks.end ()); } - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (5s, node0->active.election (change->qualified_root ()) == nullptr); ASSERT_TIMELY (5s, node0->active.empty ()); { @@ -3194,20 +3194,20 @@ TEST (node, fork_invalid_block_signature) .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) .balance (std::numeric_limits::max () - node1.config.receive_minimum.number () * 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2_corrupt (std::make_shared (*send2)); send2_corrupt->signature = nano::signature (123); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, send2)); - auto vote_corrupt (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, send2_corrupt)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, send2)); + auto vote_corrupt (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, send2_corrupt)); node1.process_active (send1); ASSERT_TIMELY (5s, node1.block (send1->hash ())); @@ -3229,31 +3229,31 @@ TEST (node, fork_election_invalid_block_signature) nano::genesis genesis; nano::block_builder builder; auto send1 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); auto send2 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); auto send3 = builder.state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) - .sign (nano::dev_genesis_key.prv, 0) // Invalid signature + .sign (nano::dev::genesis_key.prv, 0) // Invalid signature .build_shared (); auto channel1 (node1.network.udp_channels.create (node1.network.endpoint ())); node1.network.inbound (nano::publish (send1), channel1); @@ -3271,58 +3271,58 @@ TEST (node, block_processor_signatures) { nano::system system0 (1); auto & node1 (*system0.nodes[0]); - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest (system0.nodes[0]->latest (nano::dev_genesis_key.pub)); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest (system0.nodes[0]->latest (nano::dev::genesis_key.pub)); nano::state_block_builder builder; nano::keypair key1; nano::keypair key2; nano::keypair key3; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (latest)) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send1->hash ())) .build_shared (); auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) .link (key3.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send2->hash ())) .build_shared (); // Invalid signature bit auto send4 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 4 * nano::Gxrb_ratio) .link (key3.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send3->hash ())) .build_shared (); send4->signature.bytes[32] ^= 0x1; // Invalid signature bit (force) auto send5 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 5 * nano::Gxrb_ratio) .link (key3.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send3->hash ())) .build_shared (); send5->signature.bytes[31] ^= 0x1; @@ -3334,7 +3334,7 @@ TEST (node, block_processor_signatures) auto receive1 = builder.make_block () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -3343,7 +3343,7 @@ TEST (node, block_processor_signatures) auto receive2 = builder.make_block () .account (key2.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send2->hash ()) .sign (key2.prv, key2.pub) @@ -3353,7 +3353,7 @@ TEST (node, block_processor_signatures) auto receive3 = builder.make_block () .account (key3.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send3->hash ()) .sign (key2.prv, key3.pub) @@ -3391,12 +3391,12 @@ TEST (node, block_processor_reject_state) nano::genesis genesis; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); send1->signature.bytes[0] ^= 1; @@ -3406,12 +3406,12 @@ TEST (node, block_processor_reject_state) ASSERT_NE (std::future_status::timeout, flushed.wait_for (5s)); ASSERT_FALSE (node.ledger.block_or_pruned_exists (send1->hash ())); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); node.process_active (send2); @@ -3430,30 +3430,30 @@ TEST (node, block_processor_full) nano::genesis genesis; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) .build_shared (); // The write guard prevents block processor doing any writes @@ -3477,30 +3477,30 @@ TEST (node, block_processor_half_full) nano::genesis genesis; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); auto send3 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) .build_shared (); // The write guard prevents block processor doing any writes @@ -3521,12 +3521,12 @@ TEST (node, confirm_back) nano::keypair key; auto & node (*system.nodes[0]); nano::genesis genesis; - auto genesis_start_balance (node.balance (nano::dev_genesis_key.pub)); + auto genesis_start_balance (node.balance (nano::dev::genesis_key.pub)); auto send1 = nano::send_block_builder () .previous (genesis.hash ()) .destination (key.pub) .balance (genesis_start_balance - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); nano::state_block_builder builder; @@ -3544,7 +3544,7 @@ TEST (node, confirm_back) .previous (open->hash ()) .representative (key.pub) .balance (0) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .sign (key.prv, key.pub) .work (*system.work.generate (open->hash ())) .build_shared (); @@ -3555,7 +3555,7 @@ TEST (node, confirm_back) ASSERT_EQ (3, node.active.size ()); std::vector vote_blocks; vote_blocks.push_back (send2->hash ()); - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), vote_blocks)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), vote_blocks)); node.vote_processor.vote_blocking (vote, std::make_shared (node)); ASSERT_TIMELY (10s, node.active.empty ()); } @@ -3780,19 +3780,19 @@ TEST (node, bidirectional_tcp) nano::keypair key; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (genesis.hash ())) .build_shared (); node1->process_active (send1); node1->block_processor.flush (); ASSERT_TIMELY (10s, node1->ledger.block_or_pruned_exists (send1->hash ()) && node2->ledger.block_or_pruned_exists (send1->hash ())); // Test block confirmation from node 1 (add representative to node 1) - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Wait to find new reresentative ASSERT_TIMELY (10s, node2->rep_crawler.representative_count () != 0); /* Wait for confirmation @@ -3809,24 +3809,24 @@ TEST (node, bidirectional_tcp) // Test block propagation & confirmation from node 2 (remove representative from node 1) { auto transaction (system.wallet (0)->wallets.tx_begin_write ()); - system.wallet (0)->store.erase (transaction, nano::dev_genesis_key.pub); + system.wallet (0)->store.erase (transaction, nano::dev::genesis_key.pub); } /* Test block propagation from node 2 Node 2 has only ephemeral TCP port open. Node 1 cannot establish connection to node 2 listening port */ auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (send1->hash ())) .build_shared (); node2->process_active (send2); node2->block_processor.flush (); ASSERT_TIMELY (10s, node1->ledger.block_or_pruned_exists (send2->hash ()) && node2->ledger.block_or_pruned_exists (send2->hash ())); // Test block confirmation from node 2 (add representative to node 2) - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); // Wait to find changed reresentative ASSERT_TIMELY (10s, node1->rep_crawler.representative_count () != 0); /* Wait for confirmation @@ -3858,7 +3858,7 @@ TEST (node, aggressive_flooding) node_flags.disable_wallet_bootstrap = true; auto & node1 (*system.add_node (node_flags)); auto & wallet1 (*system.wallet (0)); - wallet1.insert_adhoc (nano::dev_genesis_key.prv); + wallet1.insert_adhoc (nano::dev::genesis_key.prv); std::vector, std::shared_ptr>> nodes_wallets; bool const sanitizer_or_valgrind (is_sanitizer_build || nano::running_within_valgrind ()); nodes_wallets.resize (!sanitizer_or_valgrind ? 5 : 3); @@ -3884,7 +3884,7 @@ TEST (node, aggressive_flooding) nano::keypair keypair; node_wallet.second->store.representative_set (node_wallet.first->wallets.tx_begin_write (), keypair.pub); node_wallet.second->insert_adhoc (keypair.prv); - auto block (wallet1.send_action (nano::dev_genesis_key.pub, keypair.pub, large_amount)); + auto block (wallet1.send_action (nano::dev::genesis_key.pub, keypair.pub, large_amount)); ASSERT_NE (nullptr, block); genesis_blocks.push_back (block); } @@ -3897,8 +3897,8 @@ TEST (node, aggressive_flooding) auto process_result (node_wallet.first->process (*block)); ASSERT_TRUE (nano::process_result::progress == process_result.code || nano::process_result::old == process_result.code); } - ASSERT_EQ (node1.latest (nano::dev_genesis_key.pub), node_wallet.first->latest (nano::dev_genesis_key.pub)); - ASSERT_EQ (genesis_blocks.back ()->hash (), node_wallet.first->latest (nano::dev_genesis_key.pub)); + ASSERT_EQ (node1.latest (nano::dev::genesis_key.pub), node_wallet.first->latest (nano::dev::genesis_key.pub)); + ASSERT_EQ (genesis_blocks.back ()->hash (), node_wallet.first->latest (nano::dev::genesis_key.pub)); // Confirm blocks for rep crawler & receiving nano::blocks_confirm (*node_wallet.first, { genesis_blocks.back () }, true); } @@ -3925,13 +3925,13 @@ TEST (node, aggressive_flooding) { auto transaction (node1.store.tx_begin_read ()); block = builder.make_block () - .account (nano::dev_genesis_key.pub) - .representative (nano::dev_genesis_key.pub) - .previous (node1.ledger.latest (transaction, nano::dev_genesis_key.pub)) - .balance (node1.ledger.account_balance (transaction, nano::dev_genesis_key.pub) - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) - .work (*node1.work_generate_blocking (node1.ledger.latest (transaction, nano::dev_genesis_key.pub))) + .account (nano::dev::genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .previous (node1.ledger.latest (transaction, nano::dev::genesis_key.pub)) + .balance (node1.ledger.account_balance (transaction, nano::dev::genesis_key.pub) - 1) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) + .work (*node1.work_generate_blocking (node1.ledger.latest (transaction, nano::dev::genesis_key.pub))) .build (); } // Processing locally goes through the aggressive block flooding path @@ -3946,7 +3946,7 @@ TEST (node, aggressive_flooding) ASSERT_TIMELY (!sanitizer_or_valgrind ? 5s : 25s, all_have_block (block->hash ())); // Do the same for a wallet block - auto wallet_block = wallet1.send_sync (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 10); + auto wallet_block = wallet1.send_sync (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 10); ASSERT_TIMELY (!sanitizer_or_valgrind ? 5s : 25s, all_have_block (wallet_block)); // All blocks: genesis + (send+open) for each representative + 2 local blocks @@ -3973,12 +3973,12 @@ TEST (node, rollback_vote_self) nano::keypair key; auto weight = node.online_reps.delta (); auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - weight) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto open = builder.make_block () @@ -3994,14 +3994,14 @@ TEST (node, rollback_vote_self) .from (*send1) .previous (send1->hash ()) .balance (send1->balance ().number () - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto fork = builder.make_block () .from (*send2) .balance (send2->balance ().number () - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node.process (*open).code); @@ -4022,7 +4022,7 @@ TEST (node, rollback_vote_self) ASSERT_NE (nullptr, election); ASSERT_EQ (2, election->blocks ().size ()); // Insert genesis key in the wallet - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); { // The write guard prevents the block processor from performing the rollback auto write_guard = node.write_database_queue.wait (nano::writer::testing); @@ -4048,7 +4048,7 @@ TEST (node, rollback_vote_self) // A vote is eventually generated from the local representative ASSERT_TIMELY (5s, 3 == election->votes ().size ()); auto votes (election->votes ()); - auto vote (votes.find (nano::dev_genesis_key.pub)); + auto vote (votes.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes.end (), vote); ASSERT_EQ (fork->hash (), vote->second.hash); } @@ -4062,12 +4062,12 @@ TEST (node, rollback_gap_source) nano::state_block_builder builder; nano::keypair key; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto fork = builder.make_block () @@ -4084,7 +4084,7 @@ TEST (node, rollback_gap_source) .previous (send1->hash ()) .balance (send1->balance ().number () - 1) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto open = builder.make_block () @@ -4107,7 +4107,7 @@ TEST (node, rollback_gap_source) ASSERT_EQ (2, election->blocks ().size ()); ASSERT_EQ (1, election->votes ().size ()); // Confirm open - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector (1, open->hash ()))); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector (1, open->hash ()))); node.vote_processor.vote (vote1, std::make_shared (node)); ASSERT_TIMELY (5s, election->votes ().size () == 2); ASSERT_TIMELY (3s, election->confirmed ()); @@ -4134,7 +4134,7 @@ TEST (node, rollback_gap_source) node.block_processor.flush (); ASSERT_EQ (2, election->blocks ().size ()); // Confirm open (again) - auto vote1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, std::numeric_limits::max (), std::vector (1, open->hash ()))); + auto vote1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, std::numeric_limits::max (), std::vector (1, open->hash ()))); node.vote_processor.vote (vote1, std::make_shared (node)); ASSERT_TIMELY (5s, election->votes ().size () == 2); } @@ -4159,12 +4159,12 @@ TEST (node, dependency_graph) // Send to key1 auto gen_send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key1.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); // Receive from genesis @@ -4182,7 +4182,7 @@ TEST (node, dependency_graph) .account (key1.pub) .previous (key1_open->hash ()) .representative (key1.pub) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (0) .sign (key1.prv, key1.pub) .work (*system.work.generate (key1_open->hash ())) @@ -4193,7 +4193,7 @@ TEST (node, dependency_graph) .previous (gen_send1->hash ()) .link (key1_send1->hash ()) .balance (nano::genesis_amount) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_send1->hash ())) .build (); // Send to key2 @@ -4202,7 +4202,7 @@ TEST (node, dependency_graph) .previous (gen_receive->hash ()) .link (key2.pub) .balance (gen_receive->balance ().number () - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_receive->hash ())) .build (); // Receive from genesis @@ -4277,7 +4277,7 @@ TEST (node, dependency_graph) .previous (key3_receive->hash ()) .link (node.ledger.epoch_link (nano::epoch::epoch_1)) .balance (key3_receive->balance ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (key3_receive->hash ())) .build (); @@ -4314,7 +4314,7 @@ TEST (node, dependency_graph) ASSERT_EQ (node.ledger.cache.block_count - 2, dependency_graph.size ()); // Start an election for the first block of the dependency graph, and ensure all blocks are eventually confirmed - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node.block_confirm (gen_send1); ASSERT_NO_ERROR (system.poll_until_true (15s, [&] { @@ -4361,12 +4361,12 @@ TEST (node, dependency_graph_frontier) // Send to key1 auto gen_send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key1.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); // Receive from genesis @@ -4384,7 +4384,7 @@ TEST (node, dependency_graph_frontier) .account (key1.pub) .previous (key1_open->hash ()) .representative (key1.pub) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .balance (0) .sign (key1.prv, key1.pub) .work (*system.work.generate (key1_open->hash ())) @@ -4395,7 +4395,7 @@ TEST (node, dependency_graph_frontier) .previous (gen_send1->hash ()) .link (key1_send1->hash ()) .balance (nano::genesis_amount) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_send1->hash ())) .build (); // Send to key2 @@ -4404,7 +4404,7 @@ TEST (node, dependency_graph_frontier) .previous (gen_receive->hash ()) .link (key2.pub) .balance (gen_receive->balance ().number () - 2) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_receive->hash ())) .build (); // Receive from genesis @@ -4479,7 +4479,7 @@ TEST (node, dependency_graph_frontier) .previous (key3_receive->hash ()) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) .balance (key3_receive->balance ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (key3_receive->hash ())) .build (); @@ -4502,7 +4502,7 @@ TEST (node, dependency_graph_frontier) } // node1 can vote, but only on the first block - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (10s, node2.active.active (gen_send1->qualified_root ())); node1.block_confirm (gen_send1); @@ -4524,12 +4524,12 @@ TEST (node, deferred_dependent_elections) nano::state_block_builder builder; nano::keypair key; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (key.pub) .balance (nano::genesis_amount - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto open = builder.make_block () @@ -4546,7 +4546,7 @@ TEST (node, deferred_dependent_elections) .previous (send1->hash ()) .balance (send1->balance ().number () - 1) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); auto receive = builder.make_block () @@ -4559,7 +4559,7 @@ TEST (node, deferred_dependent_elections) .build_shared (); auto fork = builder.make_block () .from (*receive) - .representative (nano::dev_genesis_key.pub) // was key.pub + .representative (nano::dev::genesis_key.pub) // was key.pub .sign (key.prv, key.pub) .build_shared (); node.process_local (send1); @@ -4662,7 +4662,7 @@ TEST (rep_crawler, recently_confirmed) auto const block = nano::genesis ().open; node1.active.add_recently_confirmed (block->qualified_root (), block->hash ()); auto & node2 (*system.add_node ()); - system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); auto channel = node1.network.find_channel (node2.network.endpoint ()); ASSERT_NE (nullptr, channel); node1.rep_crawler.query (channel); @@ -4678,7 +4678,7 @@ TEST (rep_crawler, local) flags.disable_rep_crawler = true; auto & node = *system.add_node (flags); auto loopback = std::make_shared (node); - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector{ nano::dev::genesis->hash () }); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, std::vector{ nano::dev::genesis->hash () }); { nano::lock_guard guard (node.rep_crawler.probable_reps_mutex); node.rep_crawler.active.insert (nano::dev::genesis->hash ()); @@ -4704,14 +4704,14 @@ TEST (node, pruning_automatic) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = nano::send_block_builder () .previous (send1->hash ()) .destination (key1.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); // Process as local blocks @@ -4757,14 +4757,14 @@ TEST (node, pruning_age) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = nano::send_block_builder () .previous (send1->hash ()) .destination (key1.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); // Process as local blocks @@ -4814,14 +4814,14 @@ TEST (node, pruning_depth) .previous (genesis.hash ()) .destination (key1.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = nano::send_block_builder () .previous (send1->hash ()) .destination (key1.pub) .balance (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); // Process as local blocks diff --git a/nano/core_test/processor_service.cpp b/nano/core_test/processor_service.cpp index 4c26fdec..9d93cddd 100644 --- a/nano/core_test/processor_service.cpp +++ b/nano/core_test/processor_service.cpp @@ -19,9 +19,9 @@ TEST (processor_service, bad_send_signature) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key2; - nano::send_block send (info1.head, nano::dev_genesis_key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send (info1.head, nano::dev::genesis_key.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); send.signature.bytes[32] ^= 0x1; ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, send).code); } @@ -38,13 +38,13 @@ TEST (processor_service, bad_receive_signature) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::account_info info1; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info1)); - nano::send_block send (info1.head, nano::dev_genesis_key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); + nano::send_block send (info1.head, nano::dev::genesis_key.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); nano::block_hash hash1 (send.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::account_info info2; - ASSERT_FALSE (store->account.get (transaction, nano::dev_genesis_key.pub, info2)); - nano::receive_block receive (hash1, hash1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (hash1)); + ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info2)); + nano::receive_block receive (hash1, hash1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); receive.signature.bytes[32] ^= 0x1; ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, receive).code); } diff --git a/nano/core_test/request_aggregator.cpp b/nano/core_test/request_aggregator.cpp index 375003f4..421e8a11 100644 --- a/nano/core_test/request_aggregator.cpp +++ b/nano/core_test/request_aggregator.cpp @@ -14,8 +14,8 @@ TEST (request_aggregator, one) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); auto channel (node.network.udp_channels.create (node.network.endpoint ())); @@ -50,35 +50,35 @@ TEST (request_aggregator, one_update) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; auto send1 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); node.confirmation_height_processor.add (send1); ASSERT_TIMELY (5s, node.ledger.block_confirmed (node.store.tx_begin_read (), send1->hash ())); auto send2 = nano::state_block_builder () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send2).code); auto receive1 = nano::state_block_builder () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::Gxrb_ratio) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -116,34 +116,34 @@ TEST (request_aggregator, two) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) .link (key1.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); node.confirmation_height_processor.add (send1); ASSERT_TIMELY (5s, node.ledger.block_confirmed (node.store.tx_begin_read (), send1->hash ())); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) .build_shared (); auto receive1 = builder.make_block () .account (key1.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (1) .link (send1->hash ()) .sign (key1.prv, key1.pub) @@ -193,8 +193,8 @@ TEST (request_aggregator, two_endpoints) node_config.peering_port = nano::get_available_port (); auto & node2 (*system.add_node (node_config, node_flags)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1.work_generate_blocking (genesis.hash ()))); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (node1.store.tx_begin_write (), *send1).code); @@ -225,7 +225,7 @@ TEST (request_aggregator, split) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); std::vector> request; std::vector> blocks; auto previous = genesis.hash (); @@ -235,12 +235,12 @@ TEST (request_aggregator, split) nano::block_builder builder; blocks.push_back (builder .state () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - (i + 1)) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build ()); auto const & block = blocks.back (); @@ -279,8 +279,8 @@ TEST (request_aggregator, channel_lifetime) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -300,8 +300,8 @@ TEST (request_aggregator, channel_update) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -329,8 +329,8 @@ TEST (request_aggregator, channel_max_queue) node_config.max_queued_requests = 1; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -347,8 +347,8 @@ TEST (request_aggregator, unique) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node (*system.add_node (node_config)); nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -374,24 +374,24 @@ TEST (request_aggregator, cannot_vote) nano::genesis genesis; nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () .from (*send1) .previous (send1->hash ()) .balance (send1->balance ().number () - 1) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node.process (*send2).code); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_FALSE (node.ledger.dependents_confirmed (node.store.tx_begin_read (), *send2)); std::vector> request; diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp index 370efa83..032e0030 100644 --- a/nano/core_test/system.cpp +++ b/nano/core_test/system.cpp @@ -38,16 +38,16 @@ TEST (system, DISABLED_generate_send_existing) nano::system system (1); auto & node1 (*system.nodes[0]); nano::thread_runner runner (system.io_ctx, node1.config.io_threads); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair stake_preserver; auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); nano::account_info info1; { auto transaction (node1.store.tx_begin_read ()); - ASSERT_FALSE (node1.store.account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (node1.store.account.get (transaction, nano::dev::genesis_key.pub, info1)); } std::vector accounts; - accounts.push_back (nano::dev_genesis_key.pub); + accounts.push_back (nano::dev::genesis_key.pub); system.generate_send_existing (node1, accounts); // Have stake_preserver receive funds after generate_send_existing so it isn't chosen as the destination { @@ -60,7 +60,7 @@ TEST (system, DISABLED_generate_send_existing) nano::account_info info2; { auto transaction (node1.store.tx_begin_read ()); - ASSERT_FALSE (node1.store.account.get (transaction, nano::dev_genesis_key.pub, info2)); + ASSERT_FALSE (node1.store.account.get (transaction, nano::dev::genesis_key.pub, info2)); } ASSERT_NE (info1.head, info2.head); system.deadline_set (15s); @@ -68,7 +68,7 @@ TEST (system, DISABLED_generate_send_existing) { ASSERT_NO_ERROR (system.poll ()); auto transaction (node1.store.tx_begin_read ()); - ASSERT_FALSE (node1.store.account.get (transaction, nano::dev_genesis_key.pub, info2)); + ASSERT_FALSE (node1.store.account.get (transaction, nano::dev::genesis_key.pub, info2)); } ASSERT_EQ (info1.block_count + 2, info2.block_count); ASSERT_EQ (info2.balance, nano::genesis_amount / 3); @@ -85,7 +85,7 @@ TEST (system, DISABLED_generate_send_new) nano::system system (1); auto & node1 (*system.nodes[0]); nano::thread_runner runner (system.io_ctx, node1.config.io_threads); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); { auto transaction (node1.store.tx_begin_read ()); auto iterator1 (node1.store.account.begin (transaction)); @@ -103,7 +103,7 @@ TEST (system, DISABLED_generate_send_new) } ASSERT_GT (node1.balance (stake_preserver.pub), node1.balance (nano::dev::genesis->account ())); std::vector accounts; - accounts.push_back (nano::dev_genesis_key.pub); + accounts.push_back (nano::dev::genesis_key.pub); // This indirectly waits for online weight to stabilize, required to prevent intermittent failures ASSERT_TIMELY (5s, node1.wallets.reps ().voting > 0); system.generate_send_new (node1, accounts); @@ -111,13 +111,13 @@ TEST (system, DISABLED_generate_send_new) { auto transaction (node1.wallets.tx_begin_read ()); auto iterator2 (system.wallet (0)->store.begin (transaction)); - if (iterator2->first != nano::dev_genesis_key.pub) + if (iterator2->first != nano::dev::genesis_key.pub) { new_account = iterator2->first; } ++iterator2; ASSERT_NE (system.wallet (0)->store.end (), iterator2); - if (iterator2->first != nano::dev_genesis_key.pub) + if (iterator2->first != nano::dev::genesis_key.pub) { new_account = iterator2->first; } @@ -157,7 +157,7 @@ TEST (system, rep_initialize_one_reserve) system.ledger_initialization_set ({ key }, nano::Gxrb_ratio); auto node = system.add_node (); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, node->balance (key.pub)); - ASSERT_EQ (nano::Gxrb_ratio, node->balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::Gxrb_ratio, node->balance (nano::dev::genesis_key.pub)); } TEST (system, rep_initialize_two_reserve) diff --git a/nano/core_test/telemetry.cpp b/nano/core_test/telemetry.cpp index c20e0887..3f1d7a22 100644 --- a/nano/core_test/telemetry.cpp +++ b/nano/core_test/telemetry.cpp @@ -555,12 +555,12 @@ TEST (telemetry, remove_peer_different_genesis) // Possible TSAN issue in the future if something else uses this, but will only appear in tests. nano::state_block_builder builder; auto junk = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (0) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1->network_params.ledger.genesis = junk; @@ -593,12 +593,12 @@ TEST (telemetry, remove_peer_different_genesis_udp) auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags)); nano::state_block_builder builder; auto junk = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (0) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (0) .link (0) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); node1->network_params.ledger.genesis = junk; diff --git a/nano/core_test/uint256_union.cpp b/nano/core_test/uint256_union.cpp index 8d11b6a2..bde76e3d 100644 --- a/nano/core_test/uint256_union.cpp +++ b/nano/core_test/uint256_union.cpp @@ -375,9 +375,9 @@ TEST (uint256_union, decode_nano_variant) TEST (uint256_union, account_transcode) { nano::account value; - auto text (nano::dev_genesis_key.pub.to_account ()); + auto text (nano::dev::genesis_key.pub.to_account ()); ASSERT_FALSE (value.decode_account (text)); - ASSERT_EQ (nano::dev_genesis_key.pub, value); + ASSERT_EQ (nano::dev::genesis_key.pub, value); /* * Handle different offsets for the underscore separator diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp index c8ca56b6..801029c5 100644 --- a/nano/core_test/vote_processor.cpp +++ b/nano/core_test/vote_processor.cpp @@ -55,7 +55,7 @@ TEST (vote_processor, flush) nano::system system (1); auto & node (*system.nodes[0]); nano::genesis genesis; - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, std::vector{ genesis.open->hash () })); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 1, std::vector{ genesis.open->hash () })); auto channel (std::make_shared (node)); for (unsigned i = 0; i < 2000; ++i) { @@ -148,16 +148,16 @@ TEST (vote_processor, weights) nano::keypair key1; nano::keypair key2; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (key0.prv); system.wallet (2)->insert_adhoc (key1.prv); system.wallet (3)->insert_adhoc (key2.prv); system.wallet (1)->store.representative_set (system.nodes[1]->wallets.tx_begin_write (), key0.pub); system.wallet (2)->store.representative_set (system.nodes[2]->wallets.tx_begin_write (), key1.pub); system.wallet (3)->store.representative_set (system.nodes[3]->wallets.tx_begin_write (), key2.pub); - system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key0.pub, level0); - system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key1.pub, level1); - system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key2.pub, level2); + system.wallet (0)->send_sync (nano::dev::genesis_key.pub, key0.pub, level0); + system.wallet (0)->send_sync (nano::dev::genesis_key.pub, key1.pub, level1); + system.wallet (0)->send_sync (nano::dev::genesis_key.pub, key2.pub, level2); // Wait for representatives ASSERT_TIMELY (10s, node.ledger.cache.rep_weights.get_rep_amounts ().size () == 4); @@ -175,9 +175,9 @@ TEST (vote_processor, weights) ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (key2.pub)); ASSERT_EQ (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (key2.pub)); - ASSERT_NE (node.vote_processor.representatives_1.end (), node.vote_processor.representatives_1.find (nano::dev_genesis_key.pub)); - ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (nano::dev_genesis_key.pub)); - ASSERT_NE (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (nano::dev_genesis_key.pub)); + ASSERT_NE (node.vote_processor.representatives_1.end (), node.vote_processor.representatives_1.find (nano::dev::genesis_key.pub)); + ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (nano::dev::genesis_key.pub)); + ASSERT_NE (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (nano::dev::genesis_key.pub)); } } @@ -193,30 +193,30 @@ TEST (vote_processor, no_broadcast_local) // Reduce the weight of genesis to 2x default min voting weight nano::keypair key; std::shared_ptr send = builder.state () - .account (nano::dev_genesis_key.pub) - .representative (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .balance (2 * node.config.vote_minimum.number ()) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (ec); ASSERT_FALSE (ec); ASSERT_EQ (nano::process_result::progress, node.process_local (send).code); - ASSERT_EQ (2 * node.config.vote_minimum.number (), node.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (2 * node.config.vote_minimum.number (), node.weight (nano::dev::genesis_key.pub)); // Insert account in wallet - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node.wallets.compute_reps (); - ASSERT_TRUE (node.wallets.reps ().exists (nano::dev_genesis_key.pub)); + ASSERT_TRUE (node.wallets.reps ().exists (nano::dev::genesis_key.pub)); ASSERT_FALSE (node.wallets.reps ().have_half_rep ()); // Process a vote - auto vote = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send->hash () }); + auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send->hash () }); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote)); // Make sure the vote was processed auto election (node.active.election (send->qualified_root ())); ASSERT_NE (nullptr, election); auto votes (election->votes ()); - auto existing (votes.find (nano::dev_genesis_key.pub)); + auto existing (votes.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes.end (), existing); ASSERT_EQ (vote->timestamp, existing->second.timestamp); // Ensure the vote, from a local representative, was not broadcast on processing - it should be flooded on generation instead @@ -225,31 +225,31 @@ TEST (vote_processor, no_broadcast_local) // Repeat test with no representative // Erase account from the wallet - system.wallet (0)->store.erase (node.wallets.tx_begin_write (), nano::dev_genesis_key.pub); + system.wallet (0)->store.erase (node.wallets.tx_begin_write (), nano::dev::genesis_key.pub); node.wallets.compute_reps (); - ASSERT_FALSE (node.wallets.reps ().exists (nano::dev_genesis_key.pub)); + ASSERT_FALSE (node.wallets.reps ().exists (nano::dev::genesis_key.pub)); std::shared_ptr send2 = builder.state () - .account (nano::dev_genesis_key.pub) - .representative (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .previous (send->hash ()) .balance (node.config.vote_minimum) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build (ec); ASSERT_FALSE (ec); ASSERT_EQ (nano::process_result::progress, node.process_local (send2).code); - ASSERT_EQ (node.config.vote_minimum, node.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (node.config.vote_minimum, node.weight (nano::dev::genesis_key.pub)); node.block_confirm (send2); // Process a vote - auto vote2 = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send2->hash () }); + auto vote2 = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send2->hash () }); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2)); // Make sure the vote was processed auto election2 (node.active.election (send2->qualified_root ())); ASSERT_NE (nullptr, election2); auto votes2 (election2->votes ()); - auto existing2 (votes2.find (nano::dev_genesis_key.pub)); + auto existing2 (votes2.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes2.end (), existing2); ASSERT_EQ (vote2->timestamp, existing2->second.timestamp); // Ensure the vote was broadcast @@ -260,7 +260,7 @@ TEST (vote_processor, no_broadcast_local) // Increase the genesis weight again std::shared_ptr open = builder.state () .account (key.pub) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .previous (0) .balance (nano::genesis_amount - 2 * node.config.vote_minimum.number ()) .link (send->hash ()) @@ -269,21 +269,21 @@ TEST (vote_processor, no_broadcast_local) .build (ec); ASSERT_FALSE (ec); ASSERT_EQ (nano::process_result::progress, node.process_local (open).code); - ASSERT_EQ (nano::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::dev_genesis_key.pub)); + ASSERT_EQ (nano::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::dev::genesis_key.pub)); node.block_confirm (open); // Insert account in wallet - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node.wallets.compute_reps (); - ASSERT_TRUE (node.wallets.reps ().exists (nano::dev_genesis_key.pub)); + ASSERT_TRUE (node.wallets.reps ().exists (nano::dev::genesis_key.pub)); ASSERT_TRUE (node.wallets.reps ().have_half_rep ()); // Process a vote - auto vote3 = std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ open->hash () }); + auto vote3 = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ open->hash () }); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote3)); // Make sure the vote was processed auto election3 (node.active.election (open->qualified_root ())); ASSERT_NE (nullptr, election3); auto votes3 (election3->votes ()); - auto existing3 (votes3.find (nano::dev_genesis_key.pub)); + auto existing3 (votes3.find (nano::dev::genesis_key.pub)); ASSERT_NE (votes3.end (), existing3); ASSERT_EQ (vote3->timestamp, existing3->second.timestamp); // Ensure the vote wass not broadcasst diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp index 08bd5267..6cb610ba 100644 --- a/nano/core_test/voting.cpp +++ b/nano/core_test/voting.cpp @@ -61,7 +61,7 @@ TEST (vote_generator, cache) nano::system system (1); auto & node (*system.nodes[0]); auto epoch1 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node.active.generator.add (epoch1->root (), epoch1->hash ()); ASSERT_TIMELY (1s, !node.history.votes (epoch1->root (), epoch1->hash ()).empty ()); auto votes (node.history.votes (epoch1->root (), epoch1->hash ())); @@ -75,14 +75,14 @@ TEST (vote_generator, multiple_representatives) auto & node (*system.nodes[0]); nano::keypair key1, key2, key3; auto & wallet (*system.wallet (0)); - wallet.insert_adhoc (nano::dev_genesis_key.prv); + wallet.insert_adhoc (nano::dev::genesis_key.prv); wallet.insert_adhoc (key1.prv); wallet.insert_adhoc (key2.prv); wallet.insert_adhoc (key3.prv); auto const amount = 100 * nano::Gxrb_ratio; - wallet.send_sync (nano::dev_genesis_key.pub, key1.pub, amount); - wallet.send_sync (nano::dev_genesis_key.pub, key2.pub, amount); - wallet.send_sync (nano::dev_genesis_key.pub, key3.pub, amount); + wallet.send_sync (nano::dev::genesis_key.pub, key1.pub, amount); + wallet.send_sync (nano::dev::genesis_key.pub, key2.pub, amount); + wallet.send_sync (nano::dev::genesis_key.pub, key3.pub, amount); ASSERT_TIMELY (3s, node.balance (key1.pub) == amount && node.balance (key2.pub) == amount && node.balance (key3.pub) == amount); wallet.change_sync (key1.pub, key1.pub); wallet.change_sync (key2.pub, key2.pub); @@ -90,12 +90,12 @@ TEST (vote_generator, multiple_representatives) ASSERT_TRUE (node.weight (key1.pub) == amount && node.weight (key2.pub) == amount && node.weight (key3.pub) == amount); node.wallets.compute_reps (); ASSERT_EQ (4, node.wallets.reps ().voting); - auto hash = wallet.send_sync (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 1); + auto hash = wallet.send_sync (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, 1); auto send = node.block (hash); ASSERT_NE (nullptr, send); ASSERT_TIMELY (5s, node.history.votes (send->root (), send->hash ()).size () == 4); auto votes (node.history.votes (send->root (), send->hash ())); - for (auto const & account : { key1.pub, key2.pub, key3.pub, nano::dev_genesis_key.pub }) + for (auto const & account : { key1.pub, key2.pub, key3.pub, nano::dev::genesis_key.pub }) { auto existing (std::find_if (votes.begin (), votes.end (), [&account] (std::shared_ptr const & vote_a) -> bool { return vote_a->account == account; @@ -108,7 +108,7 @@ TEST (vote_generator, session) { nano::system system (1); auto node (system.nodes[0]); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::vote_generator_session generator_session (node->active.generator); boost::thread thread ([node, &generator_session] () { nano::thread_role::set (nano::thread_role::name::request_loop); @@ -162,24 +162,24 @@ TEST (vote_spacing, vote_generator) node_flags.disable_search_pending = true; auto & node = *system.add_node (config, node_flags); auto & wallet = *system.wallet (0); - wallet.insert_adhoc (nano::dev_genesis_key.prv); + wallet.insert_adhoc (nano::dev::genesis_key.prv); nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); @@ -205,24 +205,24 @@ TEST (vote_spacing, rapid) node_flags.disable_search_pending = true; auto & node = *system.add_node (config, node_flags); auto & wallet = *system.wallet (0); - wallet.insert_adhoc (nano::dev_genesis_key.prv); + wallet.insert_adhoc (nano::dev::genesis_key.prv); nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); auto send2 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp index e6d86cad..5188d766 100644 --- a/nano/core_test/wallet.cpp +++ b/nano/core_test/wallet.cpp @@ -166,43 +166,43 @@ TEST (wallet, insufficient_spend_one) { nano::system system (1); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 500)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 500)); ASSERT_NE (nullptr, block); - ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, nano::genesis_amount)); + ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::genesis_amount)); } TEST (wallet, spend_all_one) { nano::system system (1); auto & node1 (*system.nodes[0]); - nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + nano::block_hash latest1 (node1.latest (nano::dev::genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits::max ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, std::numeric_limits::max ())); nano::account_info info2; { auto transaction (node1.store.tx_begin_read ()); - node1.store.account.get (transaction, nano::dev_genesis_key.pub, info2); + node1.store.account.get (transaction, nano::dev::genesis_key.pub, info2); ASSERT_NE (latest1, info2.head); auto block (node1.store.block.get (transaction, info2.head)); ASSERT_NE (nullptr, block); ASSERT_EQ (latest1, block->previous ()); } ASSERT_TRUE (info2.balance.is_zero ()); - ASSERT_EQ (0, node1.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, node1.balance (nano::dev::genesis_key.pub)); } TEST (wallet, send_async) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; std::thread thread ([&system] () { - ASSERT_TIMELY (10s, system.nodes[0]->balance (nano::dev_genesis_key.pub).is_zero ()); + ASSERT_TIMELY (10s, system.nodes[0]->balance (nano::dev::genesis_key.pub).is_zero ()); }); std::atomic success (false); - system.wallet (0)->send_async (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits::max (), [&success] (std::shared_ptr const & block_a) { ASSERT_NE (nullptr, block_a); success = true; }); + system.wallet (0)->send_async (nano::dev::genesis_key.pub, key2.pub, std::numeric_limits::max (), [&success] (std::shared_ptr const & block_a) { ASSERT_NE (nullptr, block_a); success = true; }); thread.join (); ASSERT_TIMELY (2s, success); } @@ -211,34 +211,34 @@ TEST (wallet, spend) { nano::system system (1); auto & node1 (*system.nodes[0]); - nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + nano::block_hash latest1 (node1.latest (nano::dev::genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; // Sending from empty accounts should always be an error. Accounts need to be opened with an open block, not a send block. ASSERT_EQ (nullptr, system.wallet (0)->send_action (0, key2.pub, 0)); - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits::max ())); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, std::numeric_limits::max ())); nano::account_info info2; { auto transaction (node1.store.tx_begin_read ()); - node1.store.account.get (transaction, nano::dev_genesis_key.pub, info2); + node1.store.account.get (transaction, nano::dev::genesis_key.pub, info2); ASSERT_NE (latest1, info2.head); auto block (node1.store.block.get (transaction, info2.head)); ASSERT_NE (nullptr, block); ASSERT_EQ (latest1, block->previous ()); } ASSERT_TRUE (info2.balance.is_zero ()); - ASSERT_EQ (0, node1.balance (nano::dev_genesis_key.pub)); + ASSERT_EQ (0, node1.balance (nano::dev::genesis_key.pub)); } TEST (wallet, change) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; - auto block1 (system.nodes[0]->rep_block (nano::dev_genesis_key.pub)); + auto block1 (system.nodes[0]->rep_block (nano::dev::genesis_key.pub)); ASSERT_FALSE (block1.is_zero ()); - ASSERT_NE (nullptr, system.wallet (0)->change_action (nano::dev_genesis_key.pub, key2.pub)); - auto block2 (system.nodes[0]->rep_block (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->change_action (nano::dev::genesis_key.pub, key2.pub)); + auto block2 (system.nodes[0]->rep_block (nano::dev::genesis_key.pub)); ASSERT_FALSE (block2.is_zero ()); ASSERT_NE (block1, block2); } @@ -246,20 +246,20 @@ TEST (wallet, change) TEST (wallet, partial_spend) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 500)); - ASSERT_EQ (std::numeric_limits::max () - 500, system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 500)); + ASSERT_EQ (std::numeric_limits::max () - 500, system.nodes[0]->balance (nano::dev::genesis_key.pub)); } TEST (wallet, spend_no_previous) { nano::system system (1); { - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto transaction (system.nodes[0]->store.tx_begin_read ()); nano::account_info info1; - ASSERT_FALSE (system.nodes[0]->store.account.get (transaction, nano::dev_genesis_key.pub, info1)); + ASSERT_FALSE (system.nodes[0]->store.account.get (transaction, nano::dev::genesis_key.pub, info1)); for (auto i (0); i < 50; ++i) { nano::keypair key; @@ -267,8 +267,8 @@ TEST (wallet, spend_no_previous) } } nano::keypair key2; - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 500)); - ASSERT_EQ (std::numeric_limits::max () - 500, system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 500)); + ASSERT_EQ (std::numeric_limits::max () - 500, system.nodes[0]->balance (nano::dev::genesis_key.pub)); } TEST (wallet, find_none) @@ -635,7 +635,7 @@ TEST (wallet, work) { nano::system system (1); auto wallet (system.wallet (0)); - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::genesis genesis; auto done (false); system.deadline_set (20s); @@ -643,7 +643,7 @@ TEST (wallet, work) { auto transaction (system.wallet (0)->wallets.tx_begin_read ()); uint64_t work (0); - if (!wallet->store.work_get (transaction, nano::dev_genesis_key.pub, work)) + if (!wallet->store.work_get (transaction, nano::dev::genesis_key.pub, work)) { done = nano::work_difficulty (genesis.open->work_version (), genesis.hash (), work) >= system.nodes[0]->default_difficulty (genesis.open->work_version ()); } @@ -656,18 +656,18 @@ TEST (wallet, work_generate) nano::system system (1); auto & node1 (*system.nodes[0]); auto wallet (system.wallet (0)); - nano::uint128_t amount1 (node1.balance (nano::dev_genesis_key.pub)); + nano::uint128_t amount1 (node1.balance (nano::dev::genesis_key.pub)); uint64_t work1; - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::account account1; { auto transaction (node1.wallets.tx_begin_read ()); account1 = system.account (transaction, 0); } nano::keypair key; - auto block (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100)); + auto block (wallet->send_action (nano::dev::genesis_key.pub, key.pub, 100)); auto transaction (node1.store.tx_begin_read ()); - ASSERT_TIMELY (10s, node1.ledger.account_balance (transaction, nano::dev_genesis_key.pub) != amount1); + ASSERT_TIMELY (10s, node1.ledger.account_balance (transaction, nano::dev::genesis_key.pub) != amount1); system.deadline_set (10s); auto again (true); while (again) @@ -685,18 +685,18 @@ TEST (wallet, work_cache_delayed) auto & node1 (*system.nodes[0]); auto wallet (system.wallet (0)); uint64_t work1; - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::account account1; { auto transaction (node1.wallets.tx_begin_read ()); account1 = system.account (transaction, 0); } nano::keypair key; - auto block1 (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100)); - ASSERT_EQ (block1->hash (), node1.latest (nano::dev_genesis_key.pub)); - auto block2 (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100)); - ASSERT_EQ (block2->hash (), node1.latest (nano::dev_genesis_key.pub)); - ASSERT_EQ (block2->hash (), node1.wallets.delayed_work->operator[] (nano::dev_genesis_key.pub)); + auto block1 (wallet->send_action (nano::dev::genesis_key.pub, key.pub, 100)); + ASSERT_EQ (block1->hash (), node1.latest (nano::dev::genesis_key.pub)); + auto block2 (wallet->send_action (nano::dev::genesis_key.pub, key.pub, 100)); + ASSERT_EQ (block2->hash (), node1.latest (nano::dev::genesis_key.pub)); + ASSERT_EQ (block2->hash (), node1.wallets.delayed_work->operator[] (nano::dev::genesis_key.pub)); auto threshold (node1.default_difficulty (nano::work_version::work_1)); auto again (true); system.deadline_set (10s); @@ -817,27 +817,27 @@ TEST (wallet, insert_deterministic_locked) TEST (wallet, no_work) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv, false); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv, false); nano::keypair key2; - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits::max (), false)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, std::numeric_limits::max (), false)); ASSERT_NE (nullptr, block); ASSERT_NE (0, block->block_work ()); ASSERT_GE (block->difficulty (), nano::work_threshold (block->work_version (), block->sideband ().details)); auto transaction (system.wallet (0)->wallets.tx_begin_read ()); uint64_t cached_work (0); - system.wallet (0)->store.work_get (transaction, nano::dev_genesis_key.pub, cached_work); + system.wallet (0)->store.work_get (transaction, nano::dev::genesis_key.pub, cached_work); ASSERT_EQ (0, cached_work); } TEST (wallet, send_race) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key2; for (auto i (1); i < 60; ++i) { - ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, nano::Gxrb_ratio)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::dev_genesis_key.pub)); + ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, nano::Gxrb_ratio)); + ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::dev::genesis_key.pub)); } } @@ -950,8 +950,8 @@ TEST (wallet, change_seed) uint32_t index (4); auto prv = nano::deterministic_key (seed1, index); pub = nano::pub_key (prv); - wallet->insert_adhoc (nano::dev_genesis_key.prv, false); - auto block (wallet->send_action (nano::dev_genesis_key.pub, pub, 100)); + wallet->insert_adhoc (nano::dev::genesis_key.prv, false); + auto block (wallet->send_action (nano::dev::genesis_key.pub, pub, 100)); ASSERT_NE (nullptr, block); system.nodes[0]->block_processor.flush (); { @@ -984,8 +984,8 @@ TEST (wallet, deterministic_restore) auto prv = nano::deterministic_key (seed1, index); pub = nano::pub_key (prv); } - wallet->insert_adhoc (nano::dev_genesis_key.prv, false); - auto block (wallet->send_action (nano::dev_genesis_key.pub, pub, 100)); + wallet->insert_adhoc (nano::dev::genesis_key.prv, false); + auto block (wallet->send_action (nano::dev::genesis_key.pub, pub, 100)); ASSERT_NE (nullptr, block); system.nodes[0]->block_processor.flush (); { @@ -1006,7 +1006,7 @@ TEST (wallet, epoch_2_validation) ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_2)); - wallet.insert_adhoc (nano::dev_genesis_key.prv, false); + wallet.insert_adhoc (nano::dev::genesis_key.prv, false); // Test send and receive blocks // An epoch 2 receive block should be generated with lower difficulty with high probability @@ -1015,12 +1015,12 @@ TEST (wallet, epoch_2_validation) auto amount = node.config.receive_minimum.number (); while (++tries < max_tries) { - auto send = wallet.send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, amount, 1); + auto send = wallet.send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, amount, 1); ASSERT_NE (nullptr, send); ASSERT_EQ (nano::epoch::epoch_2, send->sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send->sideband ().source_epoch); // Not used for send state blocks - auto receive = wallet.receive_action (send->hash (), nano::dev_genesis_key.pub, amount, send->link ().as_account (), 1); + auto receive = wallet.receive_action (send->hash (), nano::dev::genesis_key.pub, amount, send->link ().as_account (), 1); ASSERT_NE (nullptr, receive); if (receive->difficulty () < node.network_params.network.publish_thresholds.base) { @@ -1033,7 +1033,7 @@ TEST (wallet, epoch_2_validation) ASSERT_LT (tries, max_tries); // Test a change block - ASSERT_NE (nullptr, wallet.change_action (nano::dev_genesis_key.pub, nano::keypair ().pub, 1)); + ASSERT_NE (nullptr, wallet.change_action (nano::dev::genesis_key.pub, nano::keypair ().pub, 1)); } // Receiving from an upgraded account uses the lower threshold and upgrades the receiving account @@ -1057,19 +1057,19 @@ TEST (wallet, epoch_2_receive_propagation) nano::state_block_builder builder; // Send and open the account - wallet.insert_adhoc (nano::dev_genesis_key.prv, false); + wallet.insert_adhoc (nano::dev::genesis_key.prv, false); wallet.insert_adhoc (key.prv, false); auto amount = node.config.receive_minimum.number (); - auto send1 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1); + auto send1 = wallet.send_action (nano::dev::genesis_key.pub, key.pub, amount, 1); ASSERT_NE (nullptr, send1); - ASSERT_NE (nullptr, wallet.receive_action (send1->hash (), nano::dev_genesis_key.pub, amount, send1->link ().as_account (), 1)); + ASSERT_NE (nullptr, wallet.receive_action (send1->hash (), nano::dev::genesis_key.pub, amount, send1->link ().as_account (), 1)); // Upgrade the genesis account to epoch 2 auto epoch2 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_2); ASSERT_NE (nullptr, epoch2); // Send a block - auto send2 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1); + auto send2 = wallet.send_action (nano::dev::genesis_key.pub, key.pub, amount, 1); ASSERT_NE (nullptr, send2); auto receive2 = wallet.receive_action (send2->hash (), key.pub, amount, send2->link ().as_account (), 1); @@ -1107,12 +1107,12 @@ TEST (wallet, epoch_2_receive_unopened) nano::state_block_builder builder; // Send - wallet.insert_adhoc (nano::dev_genesis_key.prv, false); + wallet.insert_adhoc (nano::dev::genesis_key.prv, false); auto amount = node.config.receive_minimum.number (); - auto send1 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1); + auto send1 = wallet.send_action (nano::dev::genesis_key.pub, key.pub, amount, 1); // Upgrade unopened account to epoch_2 - auto epoch2_unopened = nano::state_block (key.pub, 0, 0, 0, node.network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (key.pub, node.network_params.network.publish_thresholds.epoch_2)); + auto epoch2_unopened = nano::state_block (key.pub, 0, 0, 0, node.network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (key.pub, node.network_params.network.publish_thresholds.epoch_2)); ASSERT_EQ (nano::process_result::progress, node.process (epoch2_unopened).code); wallet.insert_adhoc (key.prv, false); @@ -1134,7 +1134,7 @@ TEST (wallet, foreach_representative_deadlock) { nano::system system (1); auto & node (*system.nodes[0]); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node.wallets.compute_reps (); ASSERT_EQ (1, node.wallets.reps ().voting); node.wallets.foreach_representative ([&node] (nano::public_key const & pub, nano::raw_key const & prv) { @@ -1160,7 +1160,7 @@ TEST (wallet, search_pending) auto & node (*system.add_node (config, flags)); auto & wallet (*system.wallet (0)); - wallet.insert_adhoc (nano::dev_genesis_key.prv); + wallet.insert_adhoc (nano::dev::genesis_key.prv); nano::block_builder builder; auto send = builder.state () .account (nano::dev::genesis->account ()) @@ -1168,7 +1168,7 @@ TEST (wallet, search_pending) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) .link (nano::dev::genesis->account ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); @@ -1188,7 +1188,7 @@ TEST (wallet, search_pending) ASSERT_TIMELY (5s, node.block_confirmed (send->hash ()) && node.active.empty ()); // Re-insert the key - wallet.insert_adhoc (nano::dev_genesis_key.prv); + wallet.insert_adhoc (nano::dev::genesis_key.prv); // Pending search should create the receive block ASSERT_EQ (2, node.ledger.cache.block_count); @@ -1219,10 +1219,10 @@ TEST (wallet, receive_pruned) nano::state_block_builder builder; // Send - wallet1.insert_adhoc (nano::dev_genesis_key.prv, false); + wallet1.insert_adhoc (nano::dev::genesis_key.prv, false); auto amount = node2.config.receive_minimum.number (); - auto send1 = wallet1.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1); - auto send2 = wallet1.send_action (nano::dev_genesis_key.pub, key.pub, 1, 1); + auto send1 = wallet1.send_action (nano::dev::genesis_key.pub, key.pub, amount, 1); + auto send2 = wallet1.send_action (nano::dev::genesis_key.pub, key.pub, 1, 1); // Pruning ASSERT_TIMELY (5s, node2.ledger.cache.cemented_count == 3); diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp index e0a9e477..47f205e4 100644 --- a/nano/core_test/wallets.cpp +++ b/nano/core_test/wallets.cpp @@ -98,12 +98,12 @@ TEST (wallets, vote_minimum) nano::keypair key1; nano::keypair key2; nano::genesis genesis; - nano::state_block send1 (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, std::numeric_limits::max () - node1.config.vote_minimum.number (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - node1.config.vote_minimum.number (), key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, node1.process (send1).code); nano::state_block open1 (key1.pub, 0, key1.pub, node1.config.vote_minimum.number (), send1.hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, node1.process (open1).code); // send2 with amount vote_minimum - 1 (not voting representative) - nano::state_block send2 (nano::dev_genesis_key.pub, send1.hash (), nano::dev_genesis_key.pub, std::numeric_limits::max () - 2 * node1.config.vote_minimum.number () + 1, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis_key.pub, send1.hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - 2 * node1.config.vote_minimum.number () + 1, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, node1.process (send2).code); nano::state_block open2 (key2.pub, 0, key2.pub, node1.config.vote_minimum.number () - 1, send2.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, node1.process (open2).code); @@ -111,7 +111,7 @@ TEST (wallets, vote_minimum) nano::unique_lock representatives_lk (wallet->representatives_mutex); ASSERT_EQ (0, wallet->representatives.size ()); representatives_lk.unlock (); - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); wallet->insert_adhoc (key1.prv); wallet->insert_adhoc (key2.prv); node1.wallets.compute_reps (); @@ -163,7 +163,7 @@ TEST (wallets, search_pending) auto wallet_id = wallets.begin ()->first; auto wallet = wallets.begin ()->second; - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::block_builder builder; auto send = builder.state () .account (nano::dev::genesis->account ()) @@ -171,7 +171,7 @@ TEST (wallets, search_pending) .representative (nano::dev::genesis->account ()) .balance (nano::genesis_amount - node.config.receive_minimum.number ()) .link (nano::dev::genesis->account ()) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node.process (*send).code); @@ -198,7 +198,7 @@ TEST (wallets, search_pending) ASSERT_TIMELY (5s, node.block_confirmed (send->hash ()) && node.active.empty ()); // Re-insert the key - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); // Pending search should create the receive block ASSERT_EQ (2, node.ledger.cache.block_count); diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp index 889a9bc6..b76e3487 100644 --- a/nano/core_test/websocket.cpp +++ b/nano/core_test/websocket.cpp @@ -82,14 +82,14 @@ TEST (websocket, confirmation) ASSERT_TIMELY (5s, ack_ready); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto balance = nano::genesis_amount; auto send_amount = node1->online_reps.delta () + 1; // Quick-confirm a block, legacy blocks should work without filtering { - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); balance -= send_amount; - auto send (std::make_shared (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous))); + auto send (std::make_shared (previous, key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous))); node1->process_active (send); } @@ -98,15 +98,15 @@ TEST (websocket, confirmation) // Quick confirm a state block { nano::state_block_builder builder; - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); balance -= send_amount; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -141,7 +141,7 @@ TEST (websocket, stopped_election) // Create election, then erase it, causing a websocket message to be emitted nano::keypair key1; nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send1 (std::make_shared (genesis.hash (), key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); nano::publish publish1 (send1); auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ())); node1->network.inbound (publish1, channel1); @@ -184,21 +184,21 @@ TEST (websocket, confirmation_options) ASSERT_TIMELY (5s, ack_ready); // Confirm a state block for an in-wallet account - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; auto balance = nano::genesis_amount; auto send_amount = node1->online_reps.delta () + 1; - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); { balance -= send_amount; nano::state_block_builder builder; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -226,12 +226,12 @@ TEST (websocket, confirmation_options) balance -= send_amount; nano::state_block_builder builder; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -288,7 +288,7 @@ TEST (websocket, confirmation_options) // When filtering options are enabled, legacy blocks are always filtered { balance -= send_amount; - auto send (std::make_shared (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous))); + auto send (std::make_shared (previous, key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous))); node1->process_active (send); previous = send->hash (); } @@ -318,21 +318,21 @@ TEST (websocket, confirmation_options_votes) ASSERT_TIMELY (10s, ack_ready); // Confirm a state block for an in-wallet account - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; auto balance = nano::genesis_amount; auto send_amount = node1->config.online_weight_minimum.number () + 1; - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); { nano::state_block_builder builder; balance -= send_amount; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -368,13 +368,13 @@ TEST (websocket, confirmation_options_votes) for (auto & vote : votes_l.get ()) { std::string representative (vote.second.get ("representative")); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), representative); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), representative); std::string timestamp (vote.second.get ("timestamp")); ASSERT_NE ("0", timestamp); std::string hash (vote.second.get ("hash")); - ASSERT_EQ (node1->latest (nano::dev_genesis_key.pub).to_string (), hash); + ASSERT_EQ (node1->latest (nano::dev::genesis_key.pub).to_string (), hash); std::string weight (vote.second.get ("weight")); - ASSERT_EQ (node1->balance (nano::dev_genesis_key.pub).convert_to (), weight); + ASSERT_EQ (node1->balance (nano::dev::genesis_key.pub).convert_to (), weight); } } catch (std::runtime_error const & ex) @@ -401,14 +401,14 @@ TEST (websocket, confirmation_options_update) client.await_ack (); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); // Now update filter with an account and wait for a response - std::string add_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_add": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ()); + std::string add_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_add": ["%1%"]}})json") % nano::dev::genesis_key.pub.to_account ()); client.send_message (add_message); client.await_ack (); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); added = true; EXPECT_TRUE (client.get_response ()); // Update the filter again, removing the account - std::string delete_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_del": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ()); + std::string delete_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_del": ["%1%"]}})json") % nano::dev::genesis_key.pub.to_account ()); client.send_message (delete_message); client.await_ack (); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); @@ -421,18 +421,18 @@ TEST (websocket, confirmation_options_update) ASSERT_TIMELY (5s, added); // Confirm a block - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::genesis genesis; nano::keypair key; nano::state_block_builder builder; - auto previous (node1->latest (nano::dev_genesis_key.pub)); + auto previous (node1->latest (nano::dev::genesis_key.pub)); auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -445,12 +445,12 @@ TEST (websocket, confirmation_options_update) previous = send->hash (); auto send2 = builder .make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -484,15 +484,15 @@ TEST (websocket, vote) // Quick-confirm a block nano::keypair key; nano::state_block_builder builder; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - (node1->online_reps.delta () + 1)) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -533,7 +533,7 @@ TEST (websocket, vote_options_type) // Custom made votes for simplicity nano::genesis genesis; - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, genesis.open)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, 0, genesis.open)); nano::websocket::message_builder builder; auto msg (builder.vote_received (vote, nano::vote_code::replay)); node1->websocket_server->broadcast (msg); @@ -563,7 +563,7 @@ TEST (websocket, vote_options_representatives) std::atomic ack_ready{ false }; auto task1 = ([&ack_ready, config, &node1] () { fake_websocket_client client (config.websocket_config.port); - std::string message = boost::str (boost::format (R"json({"action": "subscribe", "topic": "vote", "ack": "true", "options": {"representatives": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ()); + std::string message = boost::str (boost::format (R"json({"action": "subscribe", "topic": "vote", "ack": "true", "options": {"representatives": ["%1%"]}})json") % nano::dev::genesis_key.pub.to_account ()); client.send_message (message); client.await_ack (); ack_ready = true; @@ -583,19 +583,19 @@ TEST (websocket, vote_options_representatives) // Quick-confirm a block nano::keypair key; auto balance = nano::genesis_amount; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto send_amount = node1->online_reps.delta () + 1; auto confirm_block = [&] () { - nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub)); + nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); balance -= send_amount; nano::state_block_builder builder; auto send = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (balance) .link (key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); node1->process_active (send); @@ -915,12 +915,12 @@ TEST (websocket, new_unconfirmed_block) // Process a new block nano::genesis genesis; auto send1 = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); diff --git a/nano/load_test/entry.cpp b/nano/load_test/entry.cpp index 454b2379..b706b207 100644 --- a/nano/load_test/entry.cpp +++ b/nano/load_test/entry.cpp @@ -406,7 +406,7 @@ int main (int argc, char * const * argv) std::string wallet = wallet_create_rpc (ioc, primary_node_results); // Add genesis account to it - wallet_add_rpc (ioc, primary_node_results, wallet, nano::dev_genesis_key.prv.to_string ()); + wallet_add_rpc (ioc, primary_node_results, wallet, nano::dev::genesis_key.prv.to_string ()); // Add destination accounts for (auto & account : destination_accounts) diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp index dd42ec24..0addd89a 100644 --- a/nano/nano_node/entry.cpp +++ b/nano/nano_node/entry.cpp @@ -899,7 +899,7 @@ int main (int argc, char * const * argv) nano::inactive_node inactive_node (nano::unique_path (), data_path, node_flags); auto node = inactive_node.node; - nano::block_hash genesis_latest (node->latest (dev_params.ledger.dev_genesis_key.pub)); + nano::block_hash genesis_latest (node->latest (nano::dev::genesis_key.pub)); nano::uint128_t genesis_balance (std::numeric_limits::max ()); // Generating keys std::vector keys (num_accounts); @@ -912,12 +912,12 @@ int main (int argc, char * const * argv) genesis_balance = genesis_balance - 1000000000; auto send = builder.state () - .account (dev_params.ledger.dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis_latest) - .representative (dev_params.ledger.dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (genesis_balance) .link (keys[i].pub) - .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node->work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .build (); @@ -1016,7 +1016,7 @@ int main (int argc, char * const * argv) nano::node_wrapper node_wrapper (nano::unique_path (), data_path, node_flags); auto node = node_wrapper.node; - nano::block_hash genesis_latest (node->latest (dev_params.ledger.dev_genesis_key.pub)); + nano::block_hash genesis_latest (node->latest (nano::dev::genesis_key.pub)); nano::uint128_t genesis_balance (std::numeric_limits::max ()); // Generating keys std::vector keys (num_representatives); @@ -1027,12 +1027,12 @@ int main (int argc, char * const * argv) genesis_balance = genesis_balance - balance; auto send = builder.state () - .account (dev_params.ledger.dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis_latest) - .representative (dev_params.ledger.dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (genesis_balance) .link (keys[i].pub) - .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node->work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .build (); @@ -1059,12 +1059,12 @@ int main (int argc, char * const * argv) nano::keypair destination; auto send = builder.state () - .account (dev_params.ledger.dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis_latest) - .representative (dev_params.ledger.dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (genesis_balance) .link (destination.pub) - .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node->work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .build (); @@ -1156,7 +1156,7 @@ int main (int argc, char * const * argv) flags.disable_wallet_bootstrap = true; flags.disable_bootstrap_listener = true; auto node1 (std::make_shared (io_ctx1, path1, config1, work, flags, 0)); - nano::block_hash genesis_latest (node1->latest (dev_params.ledger.dev_genesis_key.pub)); + nano::block_hash genesis_latest (node1->latest (nano::dev::genesis_key.pub)); nano::uint128_t genesis_balance (std::numeric_limits::max ()); // Generating blocks std::deque> blocks; @@ -1166,12 +1166,12 @@ int main (int argc, char * const * argv) genesis_balance = genesis_balance - 1; auto send = builder.state () - .account (dev_params.ledger.dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (genesis_latest) - .representative (dev_params.ledger.dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (genesis_balance) .link (key.pub) - .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*work.generate (nano::work_version::work_1, genesis_latest, dev_params.network.publish_thresholds.epoch_1)) .build (); @@ -1264,7 +1264,7 @@ int main (int argc, char * const * argv) // Insert representative std::cout << "Initializing representative\n"; auto wallet (node1->wallets.create (nano::random_wallet_id ())); - wallet->insert_adhoc (dev_params.ledger.dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); node2->network.merge_peer (node1->network.endpoint ()); while (node2->rep_crawler.representative_count () == 0) { diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp index 74dd5d9f..3a5a41e0 100644 --- a/nano/qt_test/qt.cpp +++ b/nano/qt_test/qt.cpp @@ -291,9 +291,9 @@ TEST (wallet, send) { nano_qt::eventloop_processor processor; nano::system system (2); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::public_key key1 (system.wallet (1)->insert_adhoc (nano::keypair ().prv)); - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); ASSERT_NE (wallet->rendering_ratio, nano::raw_ratio); @@ -324,13 +324,13 @@ TEST (wallet, send_locked) { nano_qt::eventloop_processor processor; nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; { auto transaction (system.wallet (0)->wallets.tx_begin_write ()); system.wallet (0)->enter_password (transaction, "0"); } - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); QTest::mouseClick (wallet->send_blocks, Qt::LeftButton); @@ -365,7 +365,7 @@ TEST (wallet, process_block) QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->advanced.enter_block, Qt::LeftButton); ASSERT_EQ (wallet->block_entry.window, wallet->main_stack->currentWidget ()); - nano::send_block send (latest, key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); std::string previous; send.hashables.previous.encode_hex (previous); std::string balance; @@ -394,16 +394,16 @@ TEST (wallet, create_send) nano_qt::eventloop_processor processor; nano::keypair key; nano::system system (1); - 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 (key.prv); - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); wallet->client_window->show (); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); QTest::mouseClick (wallet->block_creation.send, Qt::LeftButton); - QTest::keyClicks (wallet->block_creation.account, nano::dev_genesis_key.pub.to_account ().c_str ()); + QTest::keyClicks (wallet->block_creation.account, nano::dev::genesis_key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.amount, "100000000000000000000"); QTest::keyClicks (wallet->block_creation.destination, key.pub.to_account ().c_str ()); QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton); @@ -424,14 +424,14 @@ TEST (wallet, create_open_receive) nano_qt::eventloop_processor processor; nano::keypair key; nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100); - nano::block_hash latest1 (system.nodes[0]->latest (nano::dev_genesis_key.pub)); - system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100); - nano::block_hash latest2 (system.nodes[0]->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 100); + nano::block_hash latest1 (system.nodes[0]->latest (nano::dev::genesis_key.pub)); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 100); + nano::block_hash latest2 (system.nodes[0]->latest (nano::dev::genesis_key.pub)); ASSERT_NE (latest1, latest2); system.wallet (0)->insert_adhoc (key.prv); - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); wallet->client_window->show (); @@ -439,7 +439,7 @@ TEST (wallet, create_open_receive) QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); wallet->block_creation.open->click (); QTest::keyClicks (wallet->block_creation.source, latest1.to_string ().c_str ()); - QTest::keyClicks (wallet->block_creation.representative, nano::dev_genesis_key.pub.to_account ().c_str ()); + QTest::keyClicks (wallet->block_creation.representative, nano::dev::genesis_key.pub.to_account ().c_str ()); QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton); std::string json1 (wallet->block_creation.block->toPlainText ().toStdString ()); ASSERT_FALSE (json1.empty ()); @@ -473,15 +473,15 @@ TEST (wallet, create_change) nano_qt::eventloop_processor processor; nano::keypair key; nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto account (nano::dev_genesis_key.pub); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); wallet->client_window->show (); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); wallet->block_creation.change->click (); - QTest::keyClicks (wallet->block_creation.account, nano::dev_genesis_key.pub.to_account ().c_str ()); + QTest::keyClicks (wallet->block_creation.account, nano::dev::genesis_key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.representative, key.pub.to_account ().c_str ()); wallet->block_creation.create->click (); std::string json (wallet->block_creation.block->toPlainText ().toStdString ()); @@ -521,15 +521,15 @@ TEST (history, short_text) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::keypair key; - auto latest (ledger.latest (transaction, nano::dev_genesis_key.pub)); - nano::send_block send (latest, nano::dev_genesis_key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); + nano::send_block send (latest, nano::dev::genesis_key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); - nano::change_block change (receive.hash (), key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive.hash ())); + nano::change_block change (receive.hash (), key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); } - nano_qt::history history (ledger, nano::dev_genesis_key.pub, *wallet); + nano_qt::history history (ledger, nano::dev::genesis_key.pub, *wallet); history.refresh (); ASSERT_EQ (4, history.model->rowCount ()); } @@ -561,19 +561,19 @@ TEST (history, pruned_source) { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - auto latest (ledger.latest (transaction, nano::dev_genesis_key.pub)); - nano::send_block send1 (latest, nano::dev_genesis_key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); + nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::send_block send2 (send1.hash (), key.pub, nano::genesis_amount - 200, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key.pub, nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); - nano::receive_block receive (send2.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ())); + nano::receive_block receive (send2.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); nano::open_block open (send2.hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); ASSERT_EQ (1, ledger.pruning_action (transaction, send1.hash (), 2)); next_pruning = send2.hash (); } - nano_qt::history history1 (ledger, nano::dev_genesis_key.pub, *wallet); + nano_qt::history history1 (ledger, nano::dev::genesis_key.pub, *wallet); history1.refresh (); ASSERT_EQ (2, history1.model->rowCount ()); nano_qt::history history2 (ledger, key.pub, *wallet); @@ -591,8 +591,8 @@ TEST (history, pruned_source) // Pruning for state blocks. Previous block is pruned, source is pruned { auto transaction (store->tx_begin_write ()); - auto latest (ledger.latest (transaction, nano::dev_genesis_key.pub)); - nano::state_block send (nano::dev_genesis_key.pub, latest, nano::dev_genesis_key.pub, nano::genesis_amount - 200, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); + nano::state_block send (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::genesis_amount - 200, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); auto latest_key (ledger.latest (transaction, key.pub)); nano::state_block receive (key.pub, latest_key, key.pub, 200, send.hash (), key.prv, key.pub, *system.work.generate (latest_key)); @@ -623,7 +623,7 @@ TEST (wallet, startup_work) uint64_t work1; { auto transaction (system.nodes[0]->wallets.tx_begin_read ()); - ASSERT_TRUE (wallet->wallet_m->store.work_get (transaction, nano::dev_genesis_key.pub, work1)); + ASSERT_TRUE (wallet->wallet_m->store.work_get (transaction, nano::dev::genesis_key.pub, work1)); } QTest::mouseClick (wallet->accounts_button, Qt::LeftButton); QTest::keyClicks (wallet->accounts.account_key_line, "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4"); @@ -634,7 +634,7 @@ TEST (wallet, startup_work) { ASSERT_NO_ERROR (system.poll ()); auto transaction (system.nodes[0]->wallets.tx_begin_read ()); - again = wallet->wallet_m->store.work_get (transaction, nano::dev_genesis_key.pub, work1); + again = wallet->wallet_m->store.work_get (transaction, nano::dev::genesis_key.pub, work1); } } @@ -701,17 +701,17 @@ TEST (wallet, republish) { nano_qt::eventloop_processor processor; nano::system system (2); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; nano::block_hash hash; { auto transaction (system.nodes[0]->store.tx_begin_write ()); - auto latest (system.nodes[0]->ledger.latest (transaction, nano::dev_genesis_key.pub)); - nano::send_block block (latest, key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto latest (system.nodes[0]->ledger.latest (transaction, nano::dev::genesis_key.pub)); + nano::send_block block (latest, key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); hash = block.hash (); ASSERT_EQ (nano::process_result::progress, system.nodes[0]->ledger.process (transaction, block).code); } - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *system.nodes[0], system.wallet (0), account)); wallet->start (); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); @@ -720,9 +720,9 @@ TEST (wallet, republish) ASSERT_EQ (wallet->block_viewer.window, wallet->main_stack->currentWidget ()); QTest::keyClicks (wallet->block_viewer.hash, hash.to_string ().c_str ()); QTest::mouseClick (wallet->block_viewer.rebroadcast, Qt::LeftButton); - ASSERT_FALSE (system.nodes[1]->balance (nano::dev_genesis_key.pub).is_zero ()); + ASSERT_FALSE (system.nodes[1]->balance (nano::dev::genesis_key.pub).is_zero ()); system.deadline_set (10s); - while (system.nodes[1]->balance (nano::dev_genesis_key.pub).is_zero ()) + while (system.nodes[1]->balance (nano::dev::genesis_key.pub).is_zero ()) { ASSERT_NO_ERROR (system.poll ()); } @@ -740,7 +740,7 @@ TEST (wallet, ignore_empty_adhoc) ASSERT_EQ (wallet->advanced.window, wallet->main_stack->currentWidget ()); QTest::mouseClick (wallet->accounts_button, Qt::LeftButton); ASSERT_EQ (wallet->accounts.window, wallet->main_stack->currentWidget ()); - QTest::keyClicks (wallet->accounts.account_key_line, nano::dev_genesis_key.prv.to_string ().c_str ()); + QTest::keyClicks (wallet->accounts.account_key_line, nano::dev::genesis_key.prv.to_string ().c_str ()); QTest::mouseClick (wallet->accounts.account_key_button, Qt::LeftButton); ASSERT_EQ (1, wallet->accounts.model->rowCount ()); ASSERT_EQ (0, wallet->accounts.account_key_line->text ().length ()); @@ -907,7 +907,7 @@ TEST (wallet, DISABLED_synchronizing) { auto transaction (system1.nodes[0]->store.tx_begin_write ()); auto latest (system1.nodes[0]->ledger.latest (transaction, nano::dev::genesis->account ())); - nano::send_block send (latest, key1, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.work.generate (latest)); + nano::send_block send (latest, key1, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system1.work.generate (latest)); system1.nodes[0]->ledger.process (transaction, send); } ASSERT_EQ (0, wallet->active_status.active.count (nano_qt::status_types::synchronizing)); @@ -938,9 +938,9 @@ TEST (wallet, epoch_2_validation) ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto account (nano::dev_genesis_key.pub); + auto account (nano::dev::genesis_key.pub); auto wallet (std::make_shared (*test_application, processor, *node, system.wallet (0), account)); wallet->start (); wallet->client_window->show (); @@ -964,7 +964,7 @@ TEST (wallet, epoch_2_validation) auto do_send = [&] (nano::public_key const & destination) -> nano::block_hash { wallet->block_creation.send->click (); - wallet->block_creation.account->setText (nano::dev_genesis_key.pub.to_account ().c_str ()); + wallet->block_creation.account->setText (nano::dev::genesis_key.pub.to_account ().c_str ()); wallet->block_creation.amount->setText ("1"); wallet->block_creation.destination->setText (destination.to_account ().c_str ()); return create_and_process (); @@ -1002,6 +1002,6 @@ TEST (wallet, epoch_2_validation) do_open (send1, key.pub); auto send2 = do_send (key.pub); do_receive (send2); - do_change (key.pub, nano::dev_genesis_key.pub); + do_change (key.pub, nano::dev::genesis_key.pub); } } diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 15ec7358..1ea83c1f 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -233,12 +233,12 @@ TEST (rpc, account_balance) nano::state_block_builder builder; auto send1 = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .balance (nano::genesis_amount - 1) - .link (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .link (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); @@ -248,7 +248,7 @@ TEST (rpc, account_balance) boost::property_tree::ptree request; request.put ("action", "account_balance"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); // The send and pending should be unconfirmed { @@ -276,7 +276,7 @@ TEST (rpc, account_block_count) auto [rpc, context] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "account_block_count"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string block_count_text (response.get ("block_count")); ASSERT_EQ ("1", block_count_text); @@ -312,8 +312,8 @@ TEST (rpc, account_weight) nano::keypair key; nano::system system; auto node1 = add_ipc_enabled_node (system); - nano::block_hash latest (node1->latest (nano::dev_genesis_key.pub)); - nano::change_block block (latest, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + nano::block_hash latest (node1->latest (nano::dev::genesis_key.pub)); + nano::change_block block (latest, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (block).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; @@ -328,14 +328,14 @@ TEST (rpc, wallet_contains) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "wallet_contains"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string exists_text (response.get ("exists")); ASSERT_EQ ("1", exists_text); @@ -351,7 +351,7 @@ TEST (rpc, wallet_doesnt_contain) node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "wallet_contains"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string exists_text (response.get ("exists")); ASSERT_EQ ("0", exists_text); @@ -364,7 +364,7 @@ TEST (rpc, validate_account_number) auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "validate_account_number"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string exists_text (response.get ("valid")); ASSERT_EQ ("1", exists_text); @@ -376,7 +376,7 @@ TEST (rpc, validate_account_invalid) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); std::string account; - nano::dev_genesis_key.pub.encode_account (account); + nano::dev::genesis_key.pub.encode_account (account); account[0] ^= 0x1; boost::property_tree::ptree request; request.put ("action", "validate_account_number"); @@ -390,24 +390,24 @@ TEST (rpc, send) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); - request.put ("destination", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); + request.put ("destination", nano::dev::genesis_key.pub.to_account ()); request.put ("amount", "100"); - ASSERT_EQ (node->balance (nano::dev_genesis_key.pub), nano::genesis_amount); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount); auto response (wait_response (system, rpc, request, 10s)); std::string block_text (response.get ("block")); nano::block_hash block; ASSERT_FALSE (block.decode_hex (block_text)); ASSERT_TRUE (node->ledger.block_or_pruned_exists (block)); - ASSERT_EQ (node->latest (nano::dev_genesis_key.pub), block); - ASSERT_NE (node->balance (nano::dev_genesis_key.pub), nano::genesis_amount); + ASSERT_EQ (node->latest (nano::dev::genesis_key.pub), block); + ASSERT_NE (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount); } TEST (rpc, send_fail) @@ -420,8 +420,8 @@ TEST (rpc, send_fail) node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); - request.put ("destination", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); + request.put ("destination", nano::dev::genesis_key.pub.to_account ()); request.put ("amount", "100"); auto response (wait_response (system, rpc, request, 10s)); ASSERT_EQ (std::error_code (nano::error_common::account_not_found_wallet).message (), response.get ("error")); @@ -431,27 +431,27 @@ TEST (rpc, send_work) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); - request.put ("destination", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); + request.put ("destination", nano::dev::genesis_key.pub.to_account ()); request.put ("amount", "100"); request.put ("work", "1"); auto response (wait_response (system, rpc, request, 10s)); ASSERT_EQ (std::error_code (nano::error_common::invalid_work).message (), response.get ("error")); request.erase ("work"); - request.put ("work", nano::to_string_hex (*node->work_generate_blocking (node->latest (nano::dev_genesis_key.pub)))); + request.put ("work", nano::to_string_hex (*node->work_generate_blocking (node->latest (nano::dev::genesis_key.pub)))); auto response2 (wait_response (system, rpc, request, 10s)); std::string block_text (response2.get ("block")); nano::block_hash block; ASSERT_FALSE (block.decode_hex (block_text)); ASSERT_TRUE (node->ledger.block_or_pruned_exists (block)); - ASSERT_EQ (node->latest (nano::dev_genesis_key.pub), block); + ASSERT_EQ (node->latest (nano::dev::genesis_key.pub), block); } TEST (rpc, send_work_disabled) @@ -460,15 +460,15 @@ TEST (rpc, send_work_disabled) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.work_threads = 0; auto node = add_ipc_enabled_node (system, node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); - request.put ("destination", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); + request.put ("destination", nano::dev::genesis_key.pub.to_account ()); request.put ("amount", "100"); auto response (wait_response (system, rpc, request, 10s)); ASSERT_EQ (std::error_code (nano::error_common::disabled_work_generation).message (), response.get ("error")); @@ -478,14 +478,14 @@ TEST (rpc, send_idempotent) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); request.put ("destination", nano::account (0).to_account ()); request.put ("amount", (nano::genesis_amount - (nano::genesis_amount / 4)).convert_to ()); request.put ("id", "123abc"); @@ -494,11 +494,11 @@ TEST (rpc, send_idempotent) nano::block_hash block; ASSERT_FALSE (block.decode_hex (block_text)); ASSERT_TRUE (node->ledger.block_or_pruned_exists (block)); - ASSERT_EQ (node->balance (nano::dev_genesis_key.pub), nano::genesis_amount / 4); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount / 4); auto response2 (wait_response (system, rpc, request)); ASSERT_EQ ("", response2.get ("error", "")); ASSERT_EQ (block_text, response2.get ("block")); - ASSERT_EQ (node->balance (nano::dev_genesis_key.pub), nano::genesis_amount / 4); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount / 4); request.erase ("id"); request.put ("id", "456def"); auto response3 (wait_response (system, rpc, request)); @@ -514,7 +514,7 @@ TEST (rpc, send_epoch_2) ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv, false); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv, false); auto target_difficulty = nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_2, true, false, false)); ASSERT_LT (node->network_params.network.publish_thresholds.entry, target_difficulty); @@ -526,7 +526,7 @@ TEST (rpc, send_epoch_2) node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "send"); - request.put ("source", nano::dev_genesis_key.pub.to_account ()); + request.put ("source", nano::dev::genesis_key.pub.to_account ()); request.put ("destination", nano::keypair ().pub.to_account ()); request.put ("amount", "1"); @@ -687,7 +687,7 @@ TEST (rpc, wallet_representative_set_force) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; @@ -707,7 +707,7 @@ TEST (rpc, wallet_representative_set_force) { auto transaction (node->store.tx_begin_read ()); nano::account_info info; - if (!node->store.account.get (transaction, nano::dev_genesis_key.pub, info)) + if (!node->store.account.get (transaction, nano::dev::genesis_key.pub, info)) { representative = info.representative; } @@ -720,7 +720,7 @@ TEST (rpc, account_list) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key2; - 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); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -749,7 +749,7 @@ TEST (rpc, wallet_key_valid) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; std::string wallet; @@ -811,7 +811,7 @@ TEST (rpc, wallet_export) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "wallet_export"); @@ -824,14 +824,14 @@ TEST (rpc, wallet_export) nano::kdf kdf; nano::wallet_store store (error, kdf, transaction, nano::dev::genesis->account (), 1, "0", wallet_json); ASSERT_FALSE (error); - ASSERT_TRUE (store.exists (transaction, nano::dev_genesis_key.pub)); + ASSERT_TRUE (store.exists (transaction, nano::dev::genesis_key.pub)); } TEST (rpc, wallet_destroy) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); auto wallet_id (node->wallets.items.begin ()->first); boost::property_tree::ptree request; @@ -847,7 +847,7 @@ TEST (rpc, account_move) auto node = add_ipc_enabled_node (system); auto wallet_id (node->wallets.items.begin ()->first); auto destination (system.wallet (0)); - destination->insert_adhoc (nano::dev_genesis_key.prv); + destination->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; auto source_id = nano::random_wallet_id (); auto source (node->wallets.create (source_id)); @@ -865,7 +865,7 @@ TEST (rpc, account_move) auto response (wait_response (system, rpc, request)); ASSERT_EQ ("1", response.get ("moved")); ASSERT_TRUE (destination->exists (key.pub)); - ASSERT_TRUE (destination->exists (nano::dev_genesis_key.pub)); + ASSERT_TRUE (destination->exists (nano::dev::genesis_key.pub)); auto transaction (node->wallets.tx_begin_read ()); ASSERT_EQ (source->store.end (), source->store.begin (transaction)); } @@ -903,11 +903,11 @@ TEST (rpc, chain) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto genesis (node->latest (nano::dev_genesis_key.pub)); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_NE (nullptr, block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -930,11 +930,11 @@ TEST (rpc, chain_limit) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto genesis (node->latest (nano::dev_genesis_key.pub)); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_NE (nullptr, block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -956,11 +956,11 @@ TEST (rpc, chain_offset) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto genesis (node->latest (nano::dev_genesis_key.pub)); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_NE (nullptr, block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -1013,7 +1013,7 @@ TEST (rpc, frontier) frontier.decode_hex (i->second.get ("")); frontiers[account] = frontier; } - ASSERT_EQ (1, frontiers.erase (nano::dev_genesis_key.pub)); + ASSERT_EQ (1, frontiers.erase (nano::dev::genesis_key.pub)); ASSERT_EQ (source, frontiers); } @@ -1078,17 +1078,17 @@ TEST (rpc, history) { nano::system system; auto node0 = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto change (system.wallet (0)->change_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto change (system.wallet (0)->change_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub)); ASSERT_NE (nullptr, change); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, node0->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, node0->config.receive_minimum.number ())); ASSERT_NE (nullptr, send); - auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); + auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); - nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1110,23 +1110,23 @@ TEST (rpc, history) ASSERT_EQ (5, history_l.size ()); ASSERT_EQ ("receive", std::get<0> (history_l[0])); ASSERT_EQ (ureceive.hash ().to_string (), std::get<3> (history_l[0])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[0])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[0])); ASSERT_EQ (nano::Gxrb_ratio.convert_to (), std::get<2> (history_l[0])); ASSERT_EQ (5, history_l.size ()); ASSERT_EQ ("send", std::get<0> (history_l[1])); ASSERT_EQ (usend.hash ().to_string (), std::get<3> (history_l[1])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[1])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[1])); ASSERT_EQ (nano::Gxrb_ratio.convert_to (), std::get<2> (history_l[1])); ASSERT_EQ ("receive", std::get<0> (history_l[2])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[2])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[2])); ASSERT_EQ (node0->config.receive_minimum.to_string_dec (), std::get<2> (history_l[2])); ASSERT_EQ (receive->hash ().to_string (), std::get<3> (history_l[2])); ASSERT_EQ ("send", std::get<0> (history_l[3])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[3])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[3])); ASSERT_EQ (node0->config.receive_minimum.to_string_dec (), std::get<2> (history_l[3])); ASSERT_EQ (send->hash ().to_string (), std::get<3> (history_l[3])); ASSERT_EQ ("receive", std::get<0> (history_l[4])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[4])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[4])); ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[4])); ASSERT_EQ (genesis.hash ().to_string (), std::get<3> (history_l[4])); } @@ -1135,17 +1135,17 @@ TEST (rpc, account_history) { nano::system system; auto node0 = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto change (system.wallet (0)->change_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto change (system.wallet (0)->change_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub)); ASSERT_NE (nullptr, change); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, node0->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, node0->config.receive_minimum.number ())); ASSERT_NE (nullptr, send); - auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); + auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); - nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1169,26 +1169,26 @@ TEST (rpc, account_history) ASSERT_EQ (5, history_l.size ()); ASSERT_EQ ("receive", std::get<0> (history_l[0])); ASSERT_EQ (ureceive.hash ().to_string (), std::get<3> (history_l[0])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[0])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[0])); ASSERT_EQ (nano::Gxrb_ratio.convert_to (), std::get<2> (history_l[0])); ASSERT_EQ ("6", std::get<4> (history_l[0])); // change block (height 7) is skipped by account_history since "raw" is not set ASSERT_EQ ("send", std::get<0> (history_l[1])); ASSERT_EQ (usend.hash ().to_string (), std::get<3> (history_l[1])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[1])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[1])); ASSERT_EQ (nano::Gxrb_ratio.convert_to (), std::get<2> (history_l[1])); ASSERT_EQ ("5", std::get<4> (history_l[1])); ASSERT_EQ ("receive", std::get<0> (history_l[2])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[2])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[2])); ASSERT_EQ (node0->config.receive_minimum.to_string_dec (), std::get<2> (history_l[2])); ASSERT_EQ (receive->hash ().to_string (), std::get<3> (history_l[2])); ASSERT_EQ ("4", std::get<4> (history_l[2])); ASSERT_EQ ("send", std::get<0> (history_l[3])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[3])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[3])); ASSERT_EQ (node0->config.receive_minimum.to_string_dec (), std::get<2> (history_l[3])); ASSERT_EQ (send->hash ().to_string (), std::get<3> (history_l[3])); ASSERT_EQ ("3", std::get<4> (history_l[3])); ASSERT_EQ ("receive", std::get<0> (history_l[4])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[4])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[4])); ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[4])); ASSERT_EQ (genesis.hash ().to_string (), std::get<3> (history_l[4])); ASSERT_EQ ("1", std::get<4> (history_l[4])); // change block (height 2) is skipped @@ -1210,7 +1210,7 @@ TEST (rpc, account_history) // Test filtering rpc_ctx->io_scope->reset (); auto account2 (system.wallet (0)->deterministic_insert ()); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, account2, node0->config.receive_minimum.number ())); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, account2, node0->config.receive_minimum.number ())); ASSERT_NE (nullptr, send2); auto receive2 (system.wallet (0)->receive_action (send2->hash (), account2, node0->config.receive_minimum.number (), send2->link ().as_account ())); rpc_ctx->io_scope->renew (); @@ -1219,7 +1219,7 @@ TEST (rpc, account_history) { boost::property_tree::ptree request; request.put ("action", "account_history"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); boost::property_tree::ptree other_account; other_account.put ("", account2.to_account ()); boost::property_tree::ptree filtered_accounts; @@ -1236,7 +1236,7 @@ TEST (rpc, account_history) request.put ("action", "account_history"); request.put ("account", account2.to_account ()); boost::property_tree::ptree other_account; - other_account.put ("", nano::dev_genesis_key.pub.to_account ()); + other_account.put ("", nano::dev::genesis_key.pub.to_account ()); boost::property_tree::ptree filtered_accounts; filtered_accounts.push_back (std::make_pair ("", other_account)); request.add_child ("account_filter", filtered_accounts); @@ -1251,12 +1251,12 @@ TEST (rpc, history_count) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto change (system.wallet (0)->change_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto change (system.wallet (0)->change_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub)); ASSERT_NE (nullptr, change); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, node->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, send); - auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node->config.receive_minimum.number (), send->link ().as_account ())); + auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -1277,20 +1277,20 @@ TEST (rpc, history_pruning) node_flags.enable_pruning = true; auto node0 = add_ipc_enabled_node (system, node_config, node_flags); nano::genesis genesis; - auto change (std::make_shared (genesis.hash (), nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work.generate (genesis.hash ()))); + auto change (std::make_shared (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (genesis.hash ()))); node0->process_active (change); - auto send (std::make_shared (change->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - node0->config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work.generate (change->hash ()))); + auto send (std::make_shared (change->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - node0->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (change->hash ()))); node0->process_active (send); - auto receive (std::make_shared (send->hash (), send->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work.generate (send->hash ()))); + auto receive (std::make_shared (send->hash (), send->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (send->hash ()))); node0->process_active (receive); - auto usend (std::make_shared (nano::dev::genesis->account (), receive->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); - auto ureceive (std::make_shared (nano::dev::genesis->account (), usend->hash (), nano::dev::genesis->account (), nano::genesis_amount, usend->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); - auto uchange (std::make_shared (nano::dev::genesis->account (), ureceive->hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); + auto usend (std::make_shared (nano::dev::genesis->account (), receive->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); + auto ureceive (std::make_shared (nano::dev::genesis->account (), usend->hash (), nano::dev::genesis->account (), nano::genesis_amount, usend->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); + auto uchange (std::make_shared (nano::dev::genesis->account (), ureceive->hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); node0->process_active (usend); node0->process_active (ureceive); node0->process_active (uchange); node0->block_processor.flush (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // Confirm last block to prune previous { auto election = node0->active.election (change->qualified_root ()); @@ -1350,7 +1350,7 @@ TEST (rpc, history_pruning) } ASSERT_EQ (1, history_l.size ()); ASSERT_EQ ("send", std::get<0> (history_l[0])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[0])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[0])); ASSERT_EQ ("-1", std::get<2> (history_l[0])); ASSERT_EQ (send->hash ().to_string (), std::get<3> (history_l[0])); // Pruning action @@ -1401,7 +1401,7 @@ TEST (rpc, history_pruning) ASSERT_EQ (2, history_l.size ()); ASSERT_EQ ("receive", std::get<0> (history_l[0])); ASSERT_EQ (ureceive->hash ().to_string (), std::get<3> (history_l[0])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[0])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[0])); ASSERT_EQ (nano::Gxrb_ratio.convert_to (), std::get<2> (history_l[0])); ASSERT_EQ ("unknown", std::get<0> (history_l[1])); ASSERT_EQ ("-1", std::get<1> (history_l[1])); @@ -1415,8 +1415,8 @@ TEST (rpc, process_block) auto node1 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1424,7 +1424,7 @@ TEST (rpc, process_block) request.put ("block", json); { auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == send.hash ()); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == send.hash ()); std::string send_hash (response.get ("hash")); ASSERT_EQ (send.hash ().to_string (), send_hash); } @@ -1442,8 +1442,8 @@ TEST (rpc, process_json_block) auto node1 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); boost::property_tree::ptree block_node; @@ -1457,7 +1457,7 @@ TEST (rpc, process_json_block) request.put ("json_block", true); { auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == send.hash ()); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == send.hash ()); std::string send_hash (response.get ("hash")); ASSERT_EQ (send.hash ().to_string (), send_hash); } @@ -1469,8 +1469,8 @@ TEST (rpc, process_block_async) auto node1 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); request.put ("async", "true"); @@ -1490,14 +1490,14 @@ TEST (rpc, process_block_async) ASSERT_EQ (ec.message (), response.get ("error")); } - auto state_send (std::make_shared (nano::dev_genesis_key.pub, latest, nano::dev_genesis_key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest))); + auto state_send (std::make_shared (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); std::string json1; state_send->serialize_json (json1); request.put ("block", json1); { auto response (wait_response (system, rpc, request)); ASSERT_EQ ("1", response.get ("started")); - ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == state_send->hash ()); + ASSERT_TIMELY (10s, node1->latest (nano::dev::genesis_key.pub) == state_send->hash ()); } } @@ -1507,8 +1507,8 @@ TEST (rpc, process_block_no_work) auto node1 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); send.block_work_set (0); boost::property_tree::ptree request; request.put ("action", "process"); @@ -1527,15 +1527,15 @@ TEST (rpc, process_republish) auto node3 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node3); nano::keypair key; - auto latest (node1.latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node3->work_generate_blocking (latest)); + auto latest (node1.latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node3->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; send.serialize_json (json); request.put ("block", json); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) == send.hash ()); + ASSERT_TIMELY (10s, node2.latest (nano::dev::genesis_key.pub) == send.hash ()); } TEST (rpc, process_subtype_send) @@ -1545,8 +1545,8 @@ TEST (rpc, process_subtype_send) system.add_node (); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1562,7 +1562,7 @@ TEST (rpc, process_subtype_send) request.put ("subtype", "send"); auto response3 (wait_response (system, rpc, request)); ASSERT_EQ (send.hash ().to_string (), response3.get ("hash")); - ASSERT_TIMELY (10s, system.nodes[1]->latest (nano::dev_genesis_key.pub) == send.hash ()); + ASSERT_TIMELY (10s, system.nodes[1]->latest (nano::dev::genesis_key.pub) == send.hash ()); } TEST (rpc, process_subtype_open) @@ -1571,8 +1571,8 @@ TEST (rpc, process_subtype_open) auto node1 = add_ipc_enabled_node (system); auto & node2 = *system.add_node (); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -1601,13 +1601,13 @@ TEST (rpc, process_subtype_receive) nano::system system; auto node1 = add_ipc_enabled_node (system); auto & node2 = *system.add_node (); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); node1->scheduler.manual (send); - nano::state_block receive (nano::dev_genesis_key.pub, send->hash (), nano::dev_genesis_key.pub, nano::genesis_amount, send->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send->hash ())); + nano::state_block receive (nano::dev::genesis_key.pub, send->hash (), nano::dev::genesis_key.pub, nano::genesis_amount, send->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send->hash ())); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1624,7 +1624,7 @@ TEST (rpc, process_subtype_receive) request.put ("subtype", "receive"); auto response3 (wait_response (system, rpc, request)); ASSERT_EQ (receive.hash ().to_string (), response3.get ("hash")); - ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) == receive.hash ()); + ASSERT_TIMELY (10s, node2.latest (nano::dev::genesis_key.pub) == receive.hash ()); } TEST (rpc, process_ledger_insufficient_work) @@ -1633,10 +1633,10 @@ TEST (rpc, process_ledger_insufficient_work) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); ASSERT_LT (node->network_params.network.publish_thresholds.entry, node->network_params.network.publish_thresholds.epoch_1); - auto latest (node->latest (nano::dev_genesis_key.pub)); + auto latest (node->latest (nano::dev::genesis_key.pub)); auto min_difficulty = node->network_params.network.publish_thresholds.entry; auto max_difficulty = node->network_params.network.publish_thresholds.epoch_1; - nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); ASSERT_LT (send.difficulty (), max_difficulty); ASSERT_GE (send.difficulty (), min_difficulty); boost::property_tree::ptree request; @@ -1728,8 +1728,8 @@ TEST (rpc, pending) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 100)); node->scheduler.flush (); ASSERT_TIMELY (5s, !node->active.active (*block1)); ASSERT_TIMELY (5s, node->ledger.cache.cemented_count == 2 && node->confirmation_height_processor.current ().is_zero () && node->confirmation_height_processor.awaiting_processing_size () == 0); @@ -1799,7 +1799,7 @@ TEST (rpc, pending) ASSERT_EQ (i->second.get ("min_version"), 0); } ASSERT_EQ (amounts[block1->hash ()], 100); - ASSERT_EQ (sources[block1->hash ()], nano::dev_genesis_key.pub); + ASSERT_EQ (sources[block1->hash ()], nano::dev::genesis_key.pub); } request.put ("account", key1.pub.to_account ()); @@ -1823,10 +1823,10 @@ TEST (rpc, pending) // Sorting with a smaller count than total should give absolute sorted amounts rpc_ctx->io_scope->reset (); - node->store.confirmation_height.put (node->store.tx_begin_write (), nano::dev_genesis_key.pub, { 2, block1->hash () }); - auto block2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 200)); - auto block3 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 300)); - auto block4 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 400)); + node->store.confirmation_height.put (node->store.tx_begin_write (), nano::dev::genesis_key.pub, { 2, block1->hash () }); + auto block2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 200)); + auto block3 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 300)); + auto block4 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 400)); rpc_ctx->io_scope->renew (); ASSERT_TIMELY (10s, node->ledger.account_pending (node->store.tx_begin_read (), key1.pub) == 1000); @@ -1851,8 +1851,8 @@ TEST (rpc, pending_burn) nano::system system; auto node = add_ipc_enabled_node (system); nano::account burn (0); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, burn, 100)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, burn, 100)); auto [rpc, rpc_ctx] = add_rpc (system, node); node->scheduler.flush (); ASSERT_TIMELY (5s, !node->active.active (*block1)); @@ -1874,10 +1874,10 @@ TEST (rpc, search_pending) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto wallet (node->wallets.items.begin ()->first.to_string ()); - auto latest (node->latest (nano::dev_genesis_key.pub)); - nano::send_block block (latest, nano::dev_genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (latest)); + auto latest (node->latest (nano::dev::genesis_key.pub)); + nano::send_block block (latest, nano::dev::genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, block).code); @@ -1887,7 +1887,7 @@ TEST (rpc, search_pending) request.put ("action", "search_pending"); request.put ("wallet", wallet); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node->balance (nano::dev_genesis_key.pub) == nano::genesis_amount); + ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::genesis_amount); } TEST (rpc, version) @@ -1910,7 +1910,7 @@ TEST (rpc, version) ASSERT_EQ (node1->store.vendor_get (), response1.json.get ("store_vendor")); auto network_label (node1->network_params.network.get_current_network_as_string ()); ASSERT_EQ (network_label, response1.json.get ("network")); - auto genesis_open (node1->latest (nano::dev_genesis_key.pub)); + auto genesis_open (node1->latest (nano::dev::genesis_key.pub)); ASSERT_EQ (genesis_open.to_string (), response1.json.get ("network_identifier")); ASSERT_EQ (BUILD_INFO, response1.json.get ("build_info")); auto headers (response1.resp.base ()); @@ -2056,7 +2056,7 @@ TEST (rpc, work_generate_block_high) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); nano::keypair key; - nano::state_block block (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, *node->work_generate_blocking (key.pub)); + nano::state_block block (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, *node->work_generate_blocking (key.pub)); nano::block_hash hash (block.root ().as_block_hash ()); auto block_difficulty (nano::work_difficulty (nano::work_version::work_1, hash, block.block_work ())); boost::property_tree::ptree request; @@ -2079,7 +2079,7 @@ TEST (rpc, work_generate_block_low) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); nano::keypair key; - nano::state_block block (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, 0); + nano::state_block block (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, 0); auto threshold (node->default_difficulty (block.work_version ())); block.block_work_set (system.work_generate_limited (block.root ().as_block_hash (), threshold, nano::difficulty::from_multiplier (node->config.max_work_generate_multiplier / 10, threshold))); nano::block_hash hash (block.root ().as_block_hash ()); @@ -2114,7 +2114,7 @@ TEST (rpc, work_generate_block_root_mismatch) auto node = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node); nano::keypair key; - nano::state_block block (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, *node->work_generate_blocking (key.pub)); + nano::state_block block (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, 123, key.prv, key.pub, *node->work_generate_blocking (key.pub)); nano::block_hash hash (1); boost::property_tree::ptree request; request.put ("action", "work_generate"); @@ -2139,10 +2139,10 @@ TEST (rpc, work_generate_block_ledger_epoch_2) auto epoch2 = system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2); ASSERT_NE (nullptr, epoch2); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); - nano::state_block block (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, 0); + nano::state_block block (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, 0); auto threshold (nano::work_threshold (block.work_version (), nano::block_details (nano::epoch::epoch_2, false, true, false))); block.block_work_set (system.work_generate_limited (block.root ().as_block_hash (), 1, threshold - 1)); nano::block_hash hash (block.root ().as_block_hash ()); @@ -2329,13 +2329,13 @@ TEST (rpc, block_count_pruning) nano::node_flags node_flags; node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config, node_flags); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest))); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); - auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); + auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); node1->block_processor.flush (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (5s, node1->ledger.cache.cemented_count == 3 && node1->confirmation_height_processor.current ().is_zero () && node1->confirmation_height_processor.awaiting_processing_size () == 0); // Pruning action { @@ -2387,14 +2387,14 @@ TEST (rpc, available_supply) auto response1 (wait_response (system, rpc, request1)); ASSERT_EQ ("0", response1.get ("available")); rpc_ctx->io_scope->reset (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); rpc_ctx->io_scope->renew (); auto response2 (wait_response (system, rpc, request1)); ASSERT_EQ ("1", response2.get ("available")); rpc_ctx->io_scope->reset (); - auto block2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, 0, 100)); // Sending to burning 0 account + auto block2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, 0, 100)); // Sending to burning 0 account rpc_ctx->io_scope->renew (); auto response3 (wait_response (system, rpc, request1, 10s)); ASSERT_EQ ("1", response3.get ("available")); @@ -2489,7 +2489,7 @@ TEST (rpc, account_representative_set) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; nano::keypair rep; @@ -2513,7 +2513,7 @@ TEST (rpc, account_representative_set_work_disabled) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.work_threads = 0; auto node = add_ipc_enabled_node (system, node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; nano::keypair rep; @@ -2536,7 +2536,7 @@ TEST (rpc, account_representative_set_epoch_2) ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv, false); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv, false); auto target_difficulty = nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_2, false, false, false)); ASSERT_LT (node->network_params.network.publish_thresholds.entry, target_difficulty); @@ -2548,7 +2548,7 @@ TEST (rpc, account_representative_set_epoch_2) node->wallets.items.begin ()->first.encode_hex (wallet); request.put ("wallet", wallet); request.put ("action", "account_representative_set"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("representative", nano::keypair ().pub.to_account ()); // Test that the correct error is given if there is insufficient work @@ -2568,8 +2568,8 @@ TEST (rpc, bootstrap) auto node = add_ipc_enabled_node (system0); nano::system system1 (1); auto node1 = system1.nodes[0]; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); { auto transaction (node1->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1->ledger.process (transaction, send).code); @@ -2687,7 +2687,7 @@ TEST (rpc, wallet_frontiers) { nano::system system0; auto node = add_ipc_enabled_node (system0); - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system0, node); boost::property_tree::ptree request; request.put ("action", "wallet_frontiers"); @@ -2814,11 +2814,11 @@ TEST (rpc, successors) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto genesis (node->latest (nano::dev_genesis_key.pub)); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_NE (nullptr, block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -2847,8 +2847,8 @@ TEST (rpc, bootstrap_any) nano::system system0; auto node = add_ipc_enabled_node (system0); nano::system system1 (1); - auto latest (system1.nodes[0]->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.nodes[0]->work_generate_blocking (latest)); + auto latest (system1.nodes[0]->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, nano::dev::genesis->account (), 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system1.nodes[0]->work_generate_blocking (latest)); { auto transaction (system1.nodes[0]->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, system1.nodes[0]->ledger.process (transaction, send).code); @@ -2868,8 +2868,8 @@ TEST (rpc, republish) nano::genesis genesis; auto node1 = add_ipc_enabled_node (system); system.add_node (); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); nano::open_block open (send.hash (), key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); @@ -2878,7 +2878,7 @@ TEST (rpc, republish) request.put ("action", "republish"); request.put ("hash", send.hash ().to_string ()); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, system.nodes[1]->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (10s, system.nodes[1]->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); auto & blocks_node (response.get_child ("blocks")); std::vector blocks; for (auto i (blocks_node.begin ()), n (blocks_node.end ()); i != n; ++i) @@ -2951,14 +2951,14 @@ TEST (rpc, accounts_balances) request.put ("action", "accounts_balances"); boost::property_tree::ptree entry; boost::property_tree::ptree peers_l; - entry.put ("", nano::dev_genesis_key.pub.to_account ()); + entry.put ("", nano::dev::genesis_key.pub.to_account ()); peers_l.push_back (std::make_pair ("", entry)); request.add_child ("accounts", peers_l); auto response (wait_response (system, rpc, request)); for (auto & balances : response.get_child ("balances")) { std::string account_text (balances.first); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string balance_text (balances.second.get ("balance")); ASSERT_EQ ("340282366920938463463374607431768211455", balance_text); std::string pending_text (balances.second.get ("pending")); @@ -2970,20 +2970,20 @@ TEST (rpc, accounts_frontiers) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "accounts_frontiers"); boost::property_tree::ptree entry; boost::property_tree::ptree peers_l; - entry.put ("", nano::dev_genesis_key.pub.to_account ()); + entry.put ("", nano::dev::genesis_key.pub.to_account ()); peers_l.push_back (std::make_pair ("", entry)); request.add_child ("accounts", peers_l); auto response (wait_response (system, rpc, request)); for (auto & frontiers : response.get_child ("frontiers")) { std::string account_text (frontiers.first); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string frontier_text (frontiers.second.get ("")); ASSERT_EQ (node->latest (nano::dev::genesis->account ()), nano::block_hash{ frontier_text }); } @@ -2994,8 +2994,8 @@ TEST (rpc, accounts_pending) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 100)); node->scheduler.flush (); ASSERT_TIMELY (5s, !node->active.active (*block1)); ASSERT_TIMELY (5s, node->ledger.cache.cemented_count == 2 && node->confirmation_height_processor.current ().is_zero () && node->confirmation_height_processor.awaiting_processing_size () == 0); @@ -3071,7 +3071,7 @@ TEST (rpc, accounts_pending) } } ASSERT_EQ (amounts[block1->hash ()], 100); - ASSERT_EQ (sources[block1->hash ()], nano::dev_genesis_key.pub); + ASSERT_EQ (sources[block1->hash ()], nano::dev::genesis_key.pub); } check_block_response_count (system, rpc, request, 1); @@ -3112,7 +3112,7 @@ TEST (rpc, wallet_info) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.enable_voting = true; auto node = add_ipc_enabled_node (system, node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); @@ -3120,7 +3120,7 @@ TEST (rpc, wallet_info) ASSERT_EQ (1, node->ledger.cache.block_count); ASSERT_EQ (1, node->ledger.cache.cemented_count); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); // after the send, expect 2 blocks immediately, then 2 confirmed in a timely manner, // and finally 3 blocks and 3 confirmed after the wallet generates the receive block for this send ASSERT_EQ (2, node->ledger.cache.block_count); @@ -3128,7 +3128,7 @@ TEST (rpc, wallet_info) ASSERT_TIMELY (5s, 3 == node->ledger.cache.block_count && 3 == node->ledger.cache.cemented_count); // do another send to be able to expect some "pending" down below - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); ASSERT_EQ (4, node->ledger.cache.block_count); nano::account account (system.wallet (0)->deterministic_insert ()); @@ -3164,7 +3164,7 @@ TEST (rpc, wallet_balances) { nano::system system0; auto node = add_ipc_enabled_node (system0); - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system0, node); boost::property_tree::ptree request; request.put ("action", "wallet_balances"); @@ -3173,7 +3173,7 @@ TEST (rpc, wallet_balances) for (auto & balances : response.get_child ("balances")) { std::string account_text (balances.first); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string balance_text (balances.second.get ("balance")); ASSERT_EQ ("340282366920938463463374607431768211455", balance_text); std::string pending_text (balances.second.get ("pending")); @@ -3182,14 +3182,14 @@ TEST (rpc, wallet_balances) nano::keypair key; rpc_ctx->io_scope->reset (); system0.wallet (0)->insert_adhoc (key.prv); - auto send (system0.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 1)); + auto send (system0.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 1)); rpc_ctx->io_scope->renew (); request.put ("threshold", "2"); auto response1 (wait_response (system0, rpc, request)); for (auto & balances : response1.get_child ("balances")) { std::string account_text (balances.first); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string balance_text (balances.second.get ("balance")); ASSERT_EQ ("340282366920938463463374607431768211454", balance_text); std::string pending_text (balances.second.get ("pending")); @@ -3202,9 +3202,9 @@ TEST (rpc, pending_exists) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto hash0 (node->latest (nano::dev::genesis->account ())); - auto block1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 100)); node->scheduler.flush (); ASSERT_TIMELY (5s, !node->active.active (*block1)); ASSERT_TIMELY (5s, node->ledger.cache.cemented_count == 2 && node->confirmation_height_processor.current ().is_zero () && node->confirmation_height_processor.awaiting_processing_size () == 0); @@ -3222,7 +3222,7 @@ TEST (rpc, pending_exists) request.put ("hash", hash0.to_string ()); pending_exists ("0"); - node->store.pending.exists (node->store.tx_begin_read (), nano::pending_key (nano::dev_genesis_key.pub, block1->hash ())); + node->store.pending.exists (node->store.tx_begin_read (), nano::pending_key (nano::dev::genesis_key.pub, block1->hash ())); request.put ("hash", block1->hash ().to_string ()); pending_exists ("1"); @@ -3241,10 +3241,10 @@ TEST (rpc, wallet_pending) nano::system system0; auto node = add_ipc_enabled_node (system0); nano::keypair key1; - system0.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system0.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system0.wallet (0)->insert_adhoc (key1.prv); auto iterations (0); - auto block1 (system0.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 100)); + auto block1 (system0.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 100)); node->scheduler.flush (); while (node->active.active (*block1) || node->ledger.cache.cemented_count < 2 || !node->confirmation_height_processor.current ().is_zero () || node->confirmation_height_processor.awaiting_processing_size () != 0) { @@ -3314,7 +3314,7 @@ TEST (rpc, wallet_pending) } } ASSERT_EQ (amounts[block1->hash ()], 100); - ASSERT_EQ (sources[block1->hash ()], nano::dev_genesis_key.pub); + ASSERT_EQ (sources[block1->hash ()], nano::dev::genesis_key.pub); check_block_response_count (system0, rpc, request, 1); rpc_ctx->io_scope->reset (); @@ -3357,13 +3357,13 @@ TEST (rpc, work_get) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - system.wallet (0)->work_cache_blocking (nano::dev_genesis_key.pub, node->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + system.wallet (0)->work_cache_blocking (nano::dev::genesis_key.pub, node->latest (nano::dev::genesis_key.pub)); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "work_get"); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string work_text (response.get ("work")); uint64_t work (1); @@ -3376,8 +3376,8 @@ TEST (rpc, wallet_work_get) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - system.wallet (0)->work_cache_blocking (nano::dev_genesis_key.pub, node->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + system.wallet (0)->work_cache_blocking (nano::dev::genesis_key.pub, node->latest (nano::dev::genesis_key.pub)); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "wallet_work_get"); @@ -3387,7 +3387,7 @@ TEST (rpc, wallet_work_get) for (auto & works : response.get_child ("works")) { std::string account_text (works.first); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string work_text (works.second.get ("")); uint64_t work (1); node->wallets.items.begin ()->second->store.work_get (transaction, nano::dev::genesis->account (), work); @@ -3399,13 +3399,13 @@ TEST (rpc, work_set) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); uint64_t work0 (100); boost::property_tree::ptree request; request.put ("action", "work_set"); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("work", nano::to_string_hex (work0)); auto response (wait_response (system, rpc, request)); std::string success (response.get ("success")); @@ -3420,9 +3420,9 @@ TEST (rpc, search_pending_all) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto latest (node->latest (nano::dev_genesis_key.pub)); - nano::send_block block (latest, nano::dev_genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (latest)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto latest (node->latest (nano::dev::genesis_key.pub)); + nano::send_block block (latest, nano::dev::genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, block).code); @@ -3431,7 +3431,7 @@ TEST (rpc, search_pending_all) boost::property_tree::ptree request; request.put ("action", "search_pending_all"); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node->balance (nano::dev_genesis_key.pub) == nano::genesis_amount); + ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::genesis_amount); } TEST (rpc, wallet_republish) @@ -3440,16 +3440,16 @@ TEST (rpc, wallet_republish) auto node1 = add_ipc_enabled_node (system); nano::genesis genesis; nano::keypair key; - while (key.pub < nano::dev_genesis_key.pub) + while (key.pub < nano::dev::genesis_key.pub) { nano::keypair key1; key.pub = key1.pub; key.prv = key1.prv; } - 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 (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); nano::open_block open (send.hash (), key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); @@ -3475,17 +3475,17 @@ TEST (rpc, delegators) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - 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 (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "delegators"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); auto & delegators_node (response.get_child ("delegators")); boost::property_tree::ptree delegators; @@ -3494,7 +3494,7 @@ TEST (rpc, delegators) delegators.put ((i->first), (i->second.get (""))); } ASSERT_EQ (2, delegators.size ()); - ASSERT_EQ ("100", delegators.get (nano::dev_genesis_key.pub.to_account ())); + ASSERT_EQ ("100", delegators.get (nano::dev::genesis_key.pub.to_account ())); ASSERT_EQ ("340282366920938463463374607431768211355", delegators.get (key.pub.to_account ())); } @@ -3503,17 +3503,17 @@ TEST (rpc, delegators_parameters) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); // Test with "count" = 2 boost::property_tree::ptree request; request.put ("action", "delegators"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("count", 2); auto response (wait_response (system, rpc, request)); auto & delegators_node (response.get_child ("delegators")); @@ -3523,7 +3523,7 @@ TEST (rpc, delegators_parameters) delegators.put ((i->first), (i->second.get (""))); } ASSERT_EQ (2, delegators.size ()); - ASSERT_EQ ("100", delegators.get (nano::dev_genesis_key.pub.to_account ())); + ASSERT_EQ ("100", delegators.get (nano::dev::genesis_key.pub.to_account ())); ASSERT_EQ ("340282366920938463463374607431768211355", delegators.get (key.pub.to_account ())); // Test with "count" = 1 @@ -3537,9 +3537,9 @@ TEST (rpc, delegators_parameters) } ASSERT_EQ (1, delegators2.size ()); // What is first in ledger by public key? - if (nano::dev_genesis_key.pub.number () < key.pub.number ()) + if (nano::dev::genesis_key.pub.number () < key.pub.number ()) { - ASSERT_EQ ("100", delegators2.get (nano::dev_genesis_key.pub.to_account ())); + ASSERT_EQ ("100", delegators2.get (nano::dev::genesis_key.pub.to_account ())); } else { @@ -3562,9 +3562,9 @@ TEST (rpc, delegators_parameters) // Test with "start" before last account request.put ("threshold", 0); auto last_account (key.pub); - if (nano::dev_genesis_key.pub.number () > key.pub.number ()) + if (nano::dev::genesis_key.pub.number () > key.pub.number ()) { - last_account = nano::dev_genesis_key.pub; + last_account = nano::dev::genesis_key.pub; } request.put ("start", nano::account (last_account.number () - 1).to_account ()); @@ -3596,17 +3596,17 @@ TEST (rpc, delegators_count) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - 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 (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "delegators_count"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string count (response.get ("count")); ASSERT_EQ ("2", count); @@ -3635,19 +3635,19 @@ TEST (rpc, account_info) } rpc_ctx->io_scope->reset (); - 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 (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); auto time (nano::seconds_since_epoch ()); { auto transaction = node1->store.tx_begin_write (); - node1->store.confirmation_height.put (transaction, nano::dev_genesis_key.pub, { 1, genesis.hash () }); + node1->store.confirmation_height.put (transaction, nano::dev::genesis_key.pub, { 1, genesis.hash () }); } rpc_ctx->io_scope->renew (); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); { auto response (wait_response (system, rpc, request)); std::string frontier (response.get ("frontier")); @@ -3686,23 +3686,23 @@ TEST (rpc, account_info) std::string pending2 (response.get ("pending")); ASSERT_EQ ("0", pending2); std::string representative2 (response.get ("representative")); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), representative2); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), representative2); } // Test for confirmed only blocks rpc_ctx->io_scope->reset (); nano::keypair key1; { - latest = node1->latest (nano::dev_genesis_key.pub); - nano::send_block send1 (latest, key1.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + latest = node1->latest (nano::dev::genesis_key.pub); + nano::send_block send1 (latest, key1.pub, 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send1); - nano::send_block send2 (send1.hash (), key1.pub, 25, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send1.hash ())); + nano::send_block send2 (send1.hash (), key1.pub, 25, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1.hash ())); node1->process (send2); - nano::state_block state_change (nano::dev_genesis_key.pub, send2.hash (), key1.pub, 25, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send2.hash ())); + nano::state_block state_change (nano::dev::genesis_key.pub, send2.hash (), key1.pub, 25, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send2.hash ())); node1->process (state_change); - nano::open_block open (send1.hash (), nano::dev_genesis_key.pub, key1.pub, key1.prv, key1.pub, *node1->work_generate_blocking (key1.pub)); + nano::open_block open (send1.hash (), nano::dev::genesis_key.pub, key1.pub, key1.prv, key1.pub, *node1->work_generate_blocking (key1.pub)); node1->process (open); } @@ -3726,7 +3726,7 @@ TEST (rpc, account_info) ASSERT_EQ (representative, key1.pub.to_account ()); auto confirmed_representative (response.get ("confirmed_representative")); - ASSERT_EQ (confirmed_representative, nano::dev_genesis_key.pub.to_account ()); + ASSERT_EQ (confirmed_representative, nano::dev::genesis_key.pub.to_account ()); auto confirmed_frontier (response.get ("confirmed_frontier")); ASSERT_EQ (nano::dev::genesis->hash ().to_string (), confirmed_frontier); @@ -3775,7 +3775,7 @@ TEST (rpc, json_block_input) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -3804,8 +3804,8 @@ TEST (rpc, json_block_output) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; @@ -3831,7 +3831,7 @@ TEST (rpc, blocks_info) std::string hash_text (blocks.first); ASSERT_EQ (node->latest (nano::dev::genesis->account ()).to_string (), hash_text); std::string account_text (blocks.second.get ("block_account")); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string amount_text (blocks.second.get ("amount")); ASSERT_EQ (nano::genesis_amount.convert_to (), amount_text); std::string blocks_text (blocks.second.get ("contents")); @@ -3894,13 +3894,13 @@ TEST (rpc, blocks_info_subtype) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - 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 (key.prv); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, nano::Gxrb_ratio)); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send); auto receive (system.wallet (0)->receive_action (send->hash (), key.pub, nano::Gxrb_ratio, send->link ().as_account ())); ASSERT_NE (nullptr, receive); - auto change (system.wallet (0)->change_action (nano::dev_genesis_key.pub, key.pub)); + auto change (system.wallet (0)->change_action (nano::dev::genesis_key.pub, key.pub)); ASSERT_NE (nullptr, change); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; @@ -3937,8 +3937,8 @@ TEST (rpc, block_info_successor) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; @@ -3950,7 +3950,7 @@ TEST (rpc, block_info_successor) std::string successor_text (response.get ("successor")); ASSERT_EQ (successor_text, send.hash ().to_string ()); std::string account_text (response.get ("block_account")); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string amount_text (response.get ("amount")); ASSERT_EQ (nano::genesis_amount.convert_to (), amount_text); } @@ -3966,13 +3966,13 @@ TEST (rpc, block_info_pruning) nano::node_flags node_flags; node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config1, node_flags); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest))); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); - auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); + auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); node1->block_processor.flush (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (5s, node1->ledger.cache.cemented_count == 3 && node1->confirmation_height_processor.current ().is_zero () && node1->confirmation_height_processor.awaiting_processing_size () == 0); // Pruning action { @@ -3994,7 +3994,7 @@ TEST (rpc, block_info_pruning) request2.put ("hash", receive1->hash ().to_string ()); auto response2 (wait_response (system, rpc, request2)); std::string account_text (response2.get ("block_account")); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), account_text); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); boost::optional amount (response2.get_optional ("amount")); ASSERT_FALSE (amount.is_initialized ()); // Cannot calculate amount bool json_error{ false }; @@ -4019,13 +4019,13 @@ TEST (rpc, pruned_exists) nano::node_flags node_flags; node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config1, node_flags); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest))); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); - auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); + auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); node1->block_processor.flush (); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TIMELY (5s, node1->ledger.cache.cemented_count == 3 && node1->confirmation_height_processor.current ().is_zero () && node1->confirmation_height_processor.awaiting_processing_size () == 0); // Pruning action { @@ -4086,13 +4086,13 @@ TEST (rpc, ledger) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - auto latest (node->latest (nano::dev_genesis_key.pub)); + auto latest (node->latest (nano::dev::genesis_key.pub)); auto genesis_balance (nano::genesis_amount); auto send_amount (genesis_balance - 100); genesis_balance -= send_amount; - nano::send_block send (latest, key.pub, genesis_balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (latest)); + nano::send_block send (latest, key.pub, genesis_balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); node->process (send); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *node->work_generate_blocking (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node->process (open).code); auto time (nano::seconds_since_epoch ()); auto [rpc, rpc_ctx] = add_rpc (system, node); @@ -4142,7 +4142,7 @@ TEST (rpc, ledger) ASSERT_EQ ("0", pending.get ()); boost::optional representative (account.second.get_optional ("representative")); ASSERT_TRUE (representative.is_initialized ()); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), representative.get ()); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), representative.get ()); } } // Test threshold @@ -4159,7 +4159,7 @@ TEST (rpc, ledger) } auto send2_amount (50); genesis_balance -= send2_amount; - nano::send_block send2 (send.hash (), key.pub, genesis_balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (send.hash ())); + nano::send_block send2 (send.hash (), key.pub, genesis_balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (send.hash ())); rpc_ctx->io_scope->reset (); node->process (send2); rpc_ctx->io_scope->renew (); @@ -4206,19 +4206,19 @@ TEST (rpc, block_create) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - 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 (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); auto send_work = *node1->work_generate_blocking (latest); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, send_work); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, send_work); auto open_work = *node1->work_generate_blocking (key.pub); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, open_work); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, open_work); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "block_create"); request.put ("type", "send"); request.put ("wallet", node1->wallets.items.begin ()->first.to_string ()); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("previous", latest.to_string ()); request.put ("amount", "340282366920938463463374607431768211355"); request.put ("destination", key.pub.to_account ()); @@ -4243,7 +4243,7 @@ TEST (rpc, block_create) std::string key_text; key.prv.encode_hex (key_text); request1.put ("key", key_text); - request1.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request1.put ("representative", nano::dev::genesis_key.pub.to_account ()); request1.put ("source", send.hash ().to_string ()); request1.put ("work", nano::to_string_hex (open_work)); auto response1 (wait_response (system, rpc, request1)); @@ -4275,7 +4275,7 @@ TEST (rpc, block_create) ASSERT_EQ (change.hash (), change_block->hash ()); rpc_ctx->io_scope->reset (); ASSERT_EQ (nano::process_result::progress, node1->process (change).code); - nano::send_block send2 (send.hash (), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (send.hash ())); + nano::send_block send2 (send.hash (), key.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send.hash ())); ASSERT_EQ (nano::process_result::progress, node1->process (send2).code); rpc_ctx->io_scope->renew (); boost::property_tree::ptree request2; @@ -4304,15 +4304,15 @@ TEST (rpc, block_create_state) auto node = add_ipc_enabled_node (system); nano::keypair key; nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "block_create"); request.put ("type", "state"); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("previous", genesis.hash ().to_string ()); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", (nano::genesis_amount - nano::Gxrb_ratio).convert_to ()); request.put ("link", key.pub.to_account ()); request.put ("work", nano::to_string_hex (*node->work_generate_blocking (genesis.hash ()))); @@ -4337,8 +4337,8 @@ TEST (rpc, block_create_state_open) auto node = add_ipc_enabled_node (system); nano::keypair key; nano::genesis genesis; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -4347,7 +4347,7 @@ TEST (rpc, block_create_state_open) request.put ("key", key.prv.to_string ()); request.put ("account", key.pub.to_account ()); request.put ("previous", 0); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", nano::Gxrb_ratio.convert_to ()); request.put ("link", send_block->hash ().to_string ()); request.put ("work", nano::to_string_hex (*node->work_generate_blocking (key.pub))); @@ -4390,14 +4390,14 @@ TEST (rpc, block_create_state_request_work) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "block_create"); request.put ("type", "state"); request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", (nano::genesis_amount - nano::Gxrb_ratio).convert_to ()); request.put ("link", key.pub.to_account ()); request.put ("previous", previous); @@ -4416,10 +4416,10 @@ TEST (rpc, block_create_open_epoch_v2) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -4428,7 +4428,7 @@ TEST (rpc, block_create_open_epoch_v2) request.put ("key", key.prv.to_string ()); request.put ("account", key.pub.to_account ()); request.put ("previous", 0); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", nano::Gxrb_ratio.convert_to ()); request.put ("link", send_block->hash ().to_string ()); auto response (wait_response (system, rpc, request)); @@ -4457,14 +4457,14 @@ TEST (rpc, block_create_receive_epoch_v2) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); - nano::state_block open (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, *node->work_generate_blocking (key.pub)); + nano::state_block open (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, *node->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node->process (open).code); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - auto send_block_2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send_block_2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "block_create"); @@ -4472,7 +4472,7 @@ TEST (rpc, block_create_receive_epoch_v2) request.put ("key", key.prv.to_string ()); request.put ("account", key.pub.to_account ()); request.put ("previous", open.hash ().to_string ()); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", (2 * nano::Gxrb_ratio).convert_to ()); request.put ("link", send_block_2->hash ().to_string ()); auto response (wait_response (system, rpc, request)); @@ -4500,12 +4500,12 @@ TEST (rpc, block_create_send_epoch_v2) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (*node, nano::epoch::epoch_2)); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); - nano::state_block open (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, *node->work_generate_blocking (key.pub)); + nano::state_block open (key.pub, 0, nano::dev::genesis_key.pub, nano::Gxrb_ratio, send_block->hash (), key.prv, key.pub, *node->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node->process (open).code); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -4514,9 +4514,9 @@ TEST (rpc, block_create_send_epoch_v2) request.put ("key", key.prv.to_string ()); request.put ("account", key.pub.to_account ()); request.put ("previous", open.hash ().to_string ()); - request.put ("representative", nano::dev_genesis_key.pub.to_account ()); + request.put ("representative", nano::dev::genesis_key.pub.to_account ()); request.put ("balance", 0); - request.put ("link", nano::dev_genesis_key.pub.to_string ()); + request.put ("link", nano::dev::genesis_key.pub.to_string ()); auto response (wait_response (system, rpc, request)); std::string state_hash (response.get ("hash")); auto state_text (response.get ("block")); @@ -4543,8 +4543,8 @@ TEST (rpc, block_hash) auto node1 = add_ipc_enabled_node (system); auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "block_hash"); std::string json; @@ -4613,10 +4613,10 @@ TEST (rpc, wallet_ledger) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - auto latest (node1->latest (nano::dev_genesis_key.pub)); - nano::send_block send (latest, key.pub, 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (latest)); + auto latest (node1->latest (nano::dev::genesis_key.pub)); + nano::send_block send (latest, key.pub, 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); node1->process (send); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *node1->work_generate_blocking (key.pub)); ASSERT_EQ (nano::process_result::progress, node1->process (open).code); auto time (nano::seconds_since_epoch ()); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -4679,13 +4679,13 @@ TEST (rpc, wallet_add_watch) request.put ("action", "wallet_add_watch"); boost::property_tree::ptree entry; boost::property_tree::ptree peers_l; - entry.put ("", nano::dev_genesis_key.pub.to_account ()); + entry.put ("", nano::dev::genesis_key.pub.to_account ()); peers_l.push_back (std::make_pair ("", entry)); request.add_child ("accounts", peers_l); auto response (wait_response (system, rpc, request)); std::string success (response.get ("success")); ASSERT_TRUE (success.empty ()); - ASSERT_TRUE (system.wallet (0)->exists (nano::dev_genesis_key.pub)); + ASSERT_TRUE (system.wallet (0)->exists (nano::dev::genesis_key.pub)); // Make sure using special wallet key as pubkey fails nano::public_key bad_key (1); @@ -4705,9 +4705,9 @@ TEST (rpc, online_reps) auto node1 (system.nodes[0]); auto node2 = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_EQ (node2->online_reps.online (), 0); - auto send_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); ASSERT_TIMELY (10s, !node2->online_reps.list ().empty ()); ASSERT_EQ (node2->online_reps.online (), nano::genesis_amount - nano::Gxrb_ratio); @@ -4718,7 +4718,7 @@ TEST (rpc, online_reps) auto representatives (response.get_child ("representatives")); auto item (representatives.begin ()); ASSERT_NE (representatives.end (), item); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), item->second.get ("")); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), item->second.get ("")); boost::optional weight (item->second.get_optional ("weight")); ASSERT_FALSE (weight.is_initialized ()); ASSERT_TIMELY (5s, node2->block (send_block->hash ())); @@ -4728,13 +4728,13 @@ TEST (rpc, online_reps) auto representatives2 (response2.get_child ("representatives")); auto item2 (representatives2.begin ()); ASSERT_NE (representatives2.end (), item2); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), item2->first); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), item2->first); auto weight2 (item2->second.get ("weight")); - ASSERT_EQ (node2->weight (nano::dev_genesis_key.pub).convert_to (), weight2); + ASSERT_EQ (node2->weight (nano::dev::genesis_key.pub).convert_to (), weight2); //Test accounts filter rpc_ctx->io_scope->reset (); auto new_rep (system.wallet (1)->deterministic_insert ()); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, new_rep, node1->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, new_rep, node1->config.receive_minimum.number ())); rpc_ctx->io_scope->renew (); ASSERT_NE (nullptr, send); ASSERT_TIMELY (10s, node2->block (send->hash ())); @@ -4744,7 +4744,7 @@ TEST (rpc, online_reps) ASSERT_NE (nullptr, receive); ASSERT_TIMELY (5s, node2->block (receive->hash ())); rpc_ctx->io_scope->reset (); - auto change (system.wallet (0)->change_action (nano::dev_genesis_key.pub, new_rep)); + auto change (system.wallet (0)->change_action (nano::dev::genesis_key.pub, new_rep)); rpc_ctx->io_scope->renew (); ASSERT_NE (nullptr, change); ASSERT_TIMELY (5s, node2->block (change->hash ())); @@ -4772,13 +4772,13 @@ TEST (rpc, confirmation_height_currently_processing) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = add_ipc_enabled_node (system, node_config, node_flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto previous_genesis_chain_hash = node->latest (nano::dev_genesis_key.pub); + auto previous_genesis_chain_hash = node->latest (nano::dev::genesis_key.pub); { auto transaction = node->store.tx_begin_write (); nano::keypair key1; - nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); + nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); previous_genesis_chain_hash = send.hash (); } @@ -4826,9 +4826,9 @@ TEST (rpc, confirmation_history) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TRUE (node->active.list_recently_cemented ().empty ()); - auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_TIMELY (10s, !node->active.list_recently_cemented ().empty ()); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -4857,11 +4857,11 @@ TEST (rpc, confirmation_history_hash) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); ASSERT_TRUE (node->active.list_recently_cemented ().empty ()); - auto send1 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); - auto send3 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); + auto send3 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_TIMELY (10s, node->active.list_recently_cemented ().size () == 3); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -4887,9 +4887,9 @@ TEST (rpc, block_confirm) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::genesis genesis; - auto send1 (std::make_shared (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ()))); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send1).code); @@ -4906,7 +4906,7 @@ TEST (rpc, block_confirm_absent) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "block_confirm"); @@ -5061,13 +5061,13 @@ TEST (rpc, unopened) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::account account1 (1), account2 (account1.number () + 1); - auto genesis (node->latest (nano::dev_genesis_key.pub)); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, account1, 1)); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, account1, 1)); ASSERT_NE (nullptr, send); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, account2, 10)); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, account2, 10)); ASSERT_NE (nullptr, send2); auto [rpc, rpc_ctx] = add_rpc (system, node); { @@ -5124,10 +5124,10 @@ TEST (rpc, unopened_burn) { nano::system system; auto node = add_ipc_enabled_node (system); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto genesis (node->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto genesis (node->latest (nano::dev::genesis_key.pub)); ASSERT_FALSE (genesis.is_zero ()); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev::constants.burn_account, 1)); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::constants.burn_account, 1)); ASSERT_NE (nullptr, send); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; @@ -5167,16 +5167,16 @@ TEST (rpc, wallet_history) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.enable_voting = false; auto node = add_ipc_enabled_node (system, node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto timestamp1 (nano::seconds_since_epoch ()); - auto send (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, node->config.receive_minimum.number ())); + auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, nano::dev::genesis_key.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, send); auto timestamp2 (nano::seconds_since_epoch ()); - auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev_genesis_key.pub, node->config.receive_minimum.number (), send->link ().as_account ())); + auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::keypair key; auto timestamp3 (nano::seconds_since_epoch ()); - auto send2 (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, node->config.receive_minimum.number ())); + auto send2 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, node->config.receive_minimum.number ())); ASSERT_NE (nullptr, send2); system.deadline_set (10s); auto [rpc, rpc_ctx] = add_rpc (system, node); @@ -5195,26 +5195,26 @@ TEST (rpc, wallet_history) ASSERT_EQ (key.pub.to_account (), std::get<1> (history_l[0])); ASSERT_EQ (node->config.receive_minimum.to_string_dec (), std::get<2> (history_l[0])); ASSERT_EQ (send2->hash ().to_string (), std::get<3> (history_l[0])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<4> (history_l[0])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<4> (history_l[0])); ASSERT_EQ (std::to_string (timestamp3), std::get<5> (history_l[0])); ASSERT_EQ ("receive", std::get<0> (history_l[1])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[1])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[1])); ASSERT_EQ (node->config.receive_minimum.to_string_dec (), std::get<2> (history_l[1])); ASSERT_EQ (receive->hash ().to_string (), std::get<3> (history_l[1])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<4> (history_l[1])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<4> (history_l[1])); ASSERT_EQ (std::to_string (timestamp2), std::get<5> (history_l[1])); ASSERT_EQ ("send", std::get<0> (history_l[2])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[2])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[2])); ASSERT_EQ (node->config.receive_minimum.to_string_dec (), std::get<2> (history_l[2])); ASSERT_EQ (send->hash ().to_string (), std::get<3> (history_l[2])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<4> (history_l[2])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<4> (history_l[2])); ASSERT_EQ (std::to_string (timestamp1), std::get<5> (history_l[2])); // Genesis block ASSERT_EQ ("receive", std::get<0> (history_l[3])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<1> (history_l[3])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[3])); ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[3])); ASSERT_EQ (nano::dev::genesis->hash ().to_string (), std::get<3> (history_l[3])); - ASSERT_EQ (nano::dev_genesis_key.pub.to_account (), std::get<4> (history_l[3])); + ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<4> (history_l[3])); } TEST (rpc, sign_hash) @@ -5222,7 +5222,7 @@ TEST (rpc, sign_hash) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5245,7 +5245,7 @@ TEST (rpc, sign_block) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev_genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5317,8 +5317,8 @@ TEST (rpc, block_confirmed) // Open an account directly in the ledger { auto transaction = node->store.tx_begin_write (); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); - nano::send_block send1 (latest, key.pub, 300, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); + nano::send_block send1 (latest, key.pub, 300, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), key.pub, key.prv, key.pub, *system.work.generate (key.pub)); @@ -5327,13 +5327,13 @@ TEST (rpc, block_confirmed) rpc_ctx->io_scope->renew (); // This should not be confirmed - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); request.put ("hash", latest.to_string ()); auto response2 (wait_response (system, rpc, request)); ASSERT_FALSE (response2.get ("confirmed")); // Create and process a new send block - auto send = std::make_shared (latest, key.pub, 10, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + auto send = std::make_shared (latest, key.pub, 10, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); node->process_active (send); node->block_processor.flush (); node->block_confirm (send); @@ -5510,7 +5510,7 @@ TEST (rpc, simultaneous_calls) rpc.start (); boost::property_tree::ptree request; request.put ("action", "account_block_count"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); constexpr auto num = 100; std::array, num> test_responses; @@ -5565,7 +5565,7 @@ TEST (rpc, in_process) rpc->start (); boost::property_tree::ptree request; request.put ("action", "account_balance"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); std::string balance_text (response.get ("balance")); ASSERT_EQ ("340282366920938463463374607431768211455", balance_text); @@ -5614,11 +5614,11 @@ TEST (rpc, deprecated_account_format) auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "account_info"); - request.put ("account", nano::dev_genesis_key.pub.to_account ()); + request.put ("account", nano::dev::genesis_key.pub.to_account ()); auto response (wait_response (system, rpc, request)); boost::optional deprecated_account_format (response.get_optional ("deprecated_account_format")); ASSERT_FALSE (deprecated_account_format.is_initialized ()); - std::string account_text (nano::dev_genesis_key.pub.to_account ()); + std::string account_text (nano::dev::genesis_key.pub.to_account ()); account_text[4] = '-'; request.put ("account", account_text); auto response2 (wait_response (system, rpc, request)); @@ -5633,15 +5633,15 @@ TEST (rpc, epoch_upgrade) nano::system system; auto node = add_ipc_enabled_node (system); nano::keypair key1, key2, key3; - nano::keypair epoch_signer (nano::dev_genesis_key); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account + nano::keypair epoch_signer (nano::dev::genesis_key); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); - auto send2 (std::make_shared (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) + auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); - auto send3 (std::make_shared (nano::dev_genesis_key.pub, send2->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) + auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send3).code); nano::account max_account (std::numeric_limits::max ()); - auto send4 (std::make_shared (nano::dev_genesis_key.pub, send3->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account + auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account ASSERT_EQ (nano::process_result::progress, node->process (*send4).code); auto open (std::make_shared (key1.pub, 0, key1.pub, 1, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); ASSERT_EQ (nano::process_result::progress, node->process (*open).code); @@ -5682,10 +5682,10 @@ TEST (rpc, epoch_upgrade) rpc_ctx->io_scope->reset (); // Epoch 2 upgrade - auto genesis_latest (node->latest (nano::dev_genesis_key.pub)); - auto send5 (std::make_shared (nano::dev_genesis_key.pub, genesis_latest, nano::dev_genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) + auto genesis_latest (node->latest (nano::dev::genesis_key.pub)); + auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send5).code); - auto send6 (std::make_shared (nano::dev_genesis_key.pub, send5->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) + auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) ASSERT_EQ (nano::process_result::progress, node->process (*send6).code); auto key1_latest (node->latest (key1.pub)); auto send7 (std::make_shared (key1.pub, key1_latest, key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (key1_latest))); // to key3 @@ -5727,15 +5727,15 @@ TEST (rpc, epoch_upgrade_multithreaded) node_config.work_threads = 4; auto node = add_ipc_enabled_node (system, node_config); nano::keypair key1, key2, key3; - nano::keypair epoch_signer (nano::dev_genesis_key); - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account + nano::keypair epoch_signer (nano::dev::genesis_key); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); - auto send2 (std::make_shared (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) + auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); - auto send3 (std::make_shared (nano::dev_genesis_key.pub, send2->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) + auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send3).code); nano::account max_account (std::numeric_limits::max ()); - auto send4 (std::make_shared (nano::dev_genesis_key.pub, send3->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account + auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account ASSERT_EQ (nano::process_result::progress, node->process (*send4).code); auto open (std::make_shared (key1.pub, 0, key1.pub, 1, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); ASSERT_EQ (nano::process_result::progress, node->process (*open).code); @@ -5775,10 +5775,10 @@ TEST (rpc, epoch_upgrade_multithreaded) rpc_ctx->io_scope->reset (); // Epoch 2 upgrade - auto genesis_latest (node->latest (nano::dev_genesis_key.pub)); - auto send5 (std::make_shared (nano::dev_genesis_key.pub, genesis_latest, nano::dev_genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) + auto genesis_latest (node->latest (nano::dev::genesis_key.pub)); + auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send5).code); - auto send6 (std::make_shared (nano::dev_genesis_key.pub, send5->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) + auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) ASSERT_EQ (nano::process_result::progress, node->process (*send6).code); auto key1_latest (node->latest (key1.pub)); auto send7 (std::make_shared (key1.pub, key1_latest, key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (key1_latest))); // to key3 @@ -5821,7 +5821,7 @@ TEST (rpc, account_lazy_start) auto node1 = system.add_node (node_flags); nano::keypair key; // Generating test chain - auto send1 (std::make_shared (nano::dev_genesis_key.pub, nano::dev::genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto open (std::make_shared (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); @@ -5854,14 +5854,14 @@ TEST (rpc, receive) auto wallet = system.wallet (0); std::string wallet_text; node->wallets.items.begin ()->first.encode_hex (wallet_text); - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; wallet->insert_adhoc (key1.prv); - auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number (), *node->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, node->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); + auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number (), *node->work_generate_blocking (nano::dev::genesis->hash ()))); + ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); ASSERT_TIMELY (10s, !node->store.account.exists (node->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount - auto send2 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (send1->hash ()))); + auto send2 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (send1->hash ()))); auto [rpc, rpc_ctx] = add_rpc (system, node); boost::property_tree::ptree request; request.put ("action", "receive"); @@ -5895,11 +5895,11 @@ TEST (rpc, receive_unopened) auto wallet = system.wallet (0); std::string wallet_text; node->wallets.items.begin ()->first.encode_hex (wallet_text); - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); // Test receiving for unopened account nano::keypair key1; - auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, !node->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); + auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (nano::dev::genesis->hash ()))); + ASSERT_TIMELY (5s, !node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); wallet->insert_adhoc (key1.prv); // should not auto receive, amount sent was lower than minimum @@ -5916,15 +5916,15 @@ TEST (rpc, receive_unopened) ASSERT_FALSE (node->store.account.get (node->store.tx_begin_read (), key1.pub, info)); ASSERT_EQ (info.head, info.open_block); ASSERT_EQ (info.head.to_string (), receive_text); - ASSERT_EQ (info.representative, nano::dev_genesis_key.pub); + ASSERT_EQ (info.representative, nano::dev::genesis_key.pub); } rpc_ctx->io_scope->reset (); // Test receiving for an unopened with a different wallet representative nano::keypair key2; - auto prev_amount (node->balance (nano::dev_genesis_key.pub)); - auto send2 (wallet->send_action (nano::dev_genesis_key.pub, key2.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (send1->hash ()))); - ASSERT_TIMELY (5s, !node->balance (nano::dev_genesis_key.pub) != prev_amount); + auto prev_amount (node->balance (nano::dev::genesis_key.pub)); + auto send2 (wallet->send_action (nano::dev::genesis_key.pub, key2.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (send1->hash ()))); + ASSERT_TIMELY (5s, !node->balance (nano::dev::genesis_key.pub) != prev_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key2.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send2->hash ())); nano::public_key rep; @@ -5955,13 +5955,13 @@ TEST (rpc, receive_work_disabled) auto wallet = system.wallet (1); std::string wallet_text; node->wallets.items.begin ()->first.encode_hex (wallet_text); - wallet->insert_adhoc (nano::dev_genesis_key.prv); + wallet->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; nano::genesis genesis; ASSERT_TRUE (worker_node.work_generation_enabled ()); - auto send1 (wallet->send_action (nano::dev_genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *worker_node.work_generate_blocking (genesis.hash ()), false)); + auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *worker_node.work_generate_blocking (genesis.hash ()), false)); ASSERT_TRUE (send1 != nullptr); - ASSERT_TIMELY (5s, node->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); wallet->insert_adhoc (key1.prv); @@ -5990,16 +5990,16 @@ TEST (rpc, receive_pruned) auto wallet2 = system.wallet (1); std::string wallet_text; node2->wallets.items.begin ()->first.encode_hex (wallet_text); - wallet1->insert_adhoc (nano::dev_genesis_key.prv); + wallet1->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key1; wallet2->insert_adhoc (key1.prv); - auto send1 (wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, node2->balance (nano::dev_genesis_key.pub) != nano::genesis_amount); + auto send1 (wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (nano::dev::genesis->hash ()))); + ASSERT_TIMELY (5s, node2->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); ASSERT_TIMELY (10s, !node2->store.account.exists (node2->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount - auto send2 (wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, node2->config.receive_minimum.number () - 1, *node2->work_generate_blocking (send1->hash ()))); + auto send2 (wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, node2->config.receive_minimum.number () - 1, *node2->work_generate_blocking (send1->hash ()))); // Extra send frontier - auto send3 (wallet1->send_action (nano::dev_genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (send1->hash ()))); + auto send3 (wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (send1->hash ()))); // Pruning ASSERT_TIMELY (5s, node2->ledger.cache.cemented_count == 6 && node2->confirmation_height_processor.current ().is_zero () && node2->confirmation_height_processor.awaiting_processing_size () == 0); { @@ -6211,8 +6211,8 @@ TEST (rpc, confirmation_active) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); - auto send2 (std::make_shared (send1->hash (), nano::public_key (), nano::genesis_amount - 200, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()))); + auto send1 (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send2 (std::make_shared (send1->hash (), nano::public_key (), nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); node1->process_active (send1); node1->process_active (send2); nano::blocks_confirm (*node1, { send1, send2 }); @@ -6240,7 +6240,7 @@ TEST (rpc, confirmation_info) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::genesis genesis; - auto send (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); node1->process_active (send); node1->block_processor.flush (); node1->scheduler.flush (); diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp index 4ebd64f4..3ef5c04b 100644 --- a/nano/secure/common.cpp +++ b/nano/secure/common.cpp @@ -81,6 +81,7 @@ std::string const test_canary_public_key_data = nano::get_env_or_default ("NANO_ nano::ledger_constants nano::dev::constants{ nano::networks::nano_dev_network }; std::shared_ptr & nano::dev::genesis = nano::dev::constants.genesis; +nano::keypair nano::dev::genesis_key{ dev_private_key_data }; nano::network_params::network_params () : network_params (network_constants::active_network) @@ -107,7 +108,6 @@ nano::ledger_constants::ledger_constants (nano::network_constants & network_cons nano::ledger_constants::ledger_constants (nano::networks network_a) : zero_key ("0"), - dev_genesis_key (dev_private_key_data), nano_dev_account (dev_public_key_data), nano_beta_account (beta_public_key_data), nano_live_account (live_public_key_data), diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp index 3648b898..bce7c83a 100644 --- a/nano/secure/common.hpp +++ b/nano/secure/common.hpp @@ -371,7 +371,6 @@ public: nano::account genesis_account () const; nano::block_hash genesis_hash () const; nano::keypair zero_key; - nano::keypair dev_genesis_key; nano::account nano_dev_account; nano::account nano_beta_account; nano::account nano_live_account; @@ -400,6 +399,7 @@ namespace dev { extern nano::ledger_constants constants; extern std::shared_ptr & genesis; + extern nano::keypair genesis_key; } /** Constants which depend on random values (this class should never be used globally due to CryptoPP globals potentially not being initialized) */ diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index e9492dfb..008958c5 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -22,7 +22,7 @@ TEST (system, generate_mass_activity) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.enable_voting = false; // Prevent blocks cementing auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); uint32_t count (20); system.generate_mass_activity (count, *system.nodes[0]); auto transaction (system.nodes[0]->store.tx_begin_read ()); @@ -38,7 +38,7 @@ TEST (system, generate_mass_activity_long) node_config.enable_voting = false; // Prevent blocks cementing auto node = system.add_node (node_config); nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); uint32_t count (1000000000); system.generate_mass_activity (count, *system.nodes[0]); auto transaction (system.nodes[0]->store.tx_begin_read ()); @@ -58,20 +58,20 @@ TEST (system, receive_while_synchronizing) node_config.enable_voting = false; // Prevent blocks cementing auto node = system.add_node (node_config); nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); uint32_t count (1000); system.generate_mass_activity (count, *system.nodes[0]); nano::keypair key; auto node1 (std::make_shared (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work)); ASSERT_FALSE (node1->init_error ()); 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)); node1->start (); system.nodes.push_back (node1); ASSERT_NE (nullptr, nano::establish_tcp (system, *node1, node->network.endpoint ())); node1->workers.add_timed_task (std::chrono::steady_clock::now () + std::chrono::milliseconds (200), ([&system, &key] () { - auto hash (system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key.pub, system.nodes[0]->config.receive_minimum.number ())); + auto hash (system.wallet (0)->send_sync (nano::dev::genesis_key.pub, key.pub, system.nodes[0]->config.receive_minimum.number ())); auto transaction (system.nodes[0]->store.tx_begin_read ()); auto block (system.nodes[0]->store.block.get (transaction, hash)); std::string block_text; @@ -101,16 +101,16 @@ TEST (ledger, deep_account_compute) nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; auto balance (nano::genesis_amount - 1); - nano::send_block send (genesis.hash (), key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send (genesis.hash (), key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); auto sprevious (send.hash ()); auto rprevious (open.hash ()); for (auto i (0), n (100000); i != n; ++i) { balance -= 1; - nano::send_block send (sprevious, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (sprevious)); + nano::send_block send (sprevious, key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (sprevious)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); sprevious = send.hash (); nano::receive_block receive (rprevious, send.hash (), key.prv, key.pub, *pool.generate (rprevious)); @@ -132,21 +132,21 @@ TEST (wallet, multithreaded_send_async) nano::system system (1); nano::keypair key; auto wallet_l (system.wallet (0)); - wallet_l->insert_adhoc (nano::dev_genesis_key.prv); + wallet_l->insert_adhoc (nano::dev::genesis_key.prv); wallet_l->insert_adhoc (key.prv); for (auto i (0); i < 20; ++i) { threads.push_back (boost::thread ([wallet_l, &key] () { for (auto i (0); i < 1000; ++i) { - wallet_l->send_async (nano::dev_genesis_key.pub, key.pub, 1000, [] (std::shared_ptr const & block_a) { + wallet_l->send_async (nano::dev::genesis_key.pub, key.pub, 1000, [] (std::shared_ptr const & block_a) { ASSERT_FALSE (block_a == nullptr); ASSERT_FALSE (block_a->hash ().is_zero ()); }); } })); } - ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::dev_genesis_key.pub) == (nano::genesis_amount - 20 * 1000 * 1000)); + ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::dev::genesis_key.pub) == (nano::genesis_amount - 20 * 1000 * 1000)); } for (auto i (threads.begin ()), n (threads.end ()); i != n; ++i) { @@ -186,15 +186,15 @@ TEST (node, fork_storm) nano::node_flags flags; flags.disable_max_peers_per_ip = true; nano::system system (64, nano::transport::transport_type::tcp, flags); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - auto previous (system.nodes[0]->latest (nano::dev_genesis_key.pub)); - auto balance (system.nodes[0]->balance (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + auto previous (system.nodes[0]->latest (nano::dev::genesis_key.pub)); + auto balance (system.nodes[0]->balance (nano::dev::genesis_key.pub)); ASSERT_FALSE (previous.is_zero ()); for (auto j (0); j != system.nodes.size (); ++j) { balance -= 1; nano::keypair key; - nano::send_block send (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0); + nano::send_block send (previous, key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); system.nodes[j]->work_generate_blocking (send); previous = send.hash (); for (auto i (0); i != system.nodes.size (); ++i) @@ -393,7 +393,7 @@ TEST (store, unchecked_load) { nano::system system (1); auto & node (*system.nodes[0]); - auto block (std::make_shared (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block (std::make_shared (0, 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); constexpr auto num_unchecked = 1000000; for (auto i (0); i < 1000000; ++i) { @@ -408,10 +408,10 @@ TEST (store, vote_load) { nano::system system (1); auto & node (*system.nodes[0]); - auto block (std::make_shared (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0)); + auto block (std::make_shared (0, 0, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); for (auto i (0); i < 1000000; ++i) { - auto vote (std::make_shared (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, i, block)); + auto vote (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, i, block)); node.vote_processor.vote (vote, std::make_shared (node)); } } @@ -482,13 +482,13 @@ TEST (wallets, rep_scan) TEST (node, mass_vote_by_hash) { nano::system system (1); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::block_hash previous (nano::dev::genesis->hash ()); nano::keypair key; std::vector> blocks; for (auto i (0); i < 10000; ++i) { - auto block (std::make_shared (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, nano::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous))); + auto block (std::make_shared (nano::dev::genesis_key.pub, previous, nano::dev::genesis_key.pub, nano::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous))); previous = block->hash (); blocks.push_back (block); } @@ -507,13 +507,13 @@ TEST (confirmation_height, many_accounts_single_confirmation) node_config.online_weight_minimum = 100; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); // The number of frontiers should be more than the nano::confirmation_height::unbounded_cutoff to test the amount of blocks confirmed is correct. node->confirmation_height_processor.batch_write_size = 500; auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50; - nano::keypair last_keypair = nano::dev_genesis_key; - auto last_open_hash = node->latest (nano::dev_genesis_key.pub); + nano::keypair last_keypair = nano::dev::genesis_key; + auto last_open_hash = node->latest (nano::dev::genesis_key.pub); { auto transaction = node->store.tx_begin_write (); for (auto i = num_accounts - 1; i > 0; --i) @@ -577,11 +577,11 @@ TEST (confirmation_height, many_accounts_many_confirmations) node_config.online_weight_minimum = 100; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); node->confirmation_height_processor.batch_write_size = 500; auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50; - auto latest_genesis = node->latest (nano::dev_genesis_key.pub); + auto latest_genesis = node->latest (nano::dev::genesis_key.pub); std::vector> open_blocks; { auto transaction = node->store.tx_begin_write (); @@ -590,9 +590,9 @@ TEST (confirmation_height, many_accounts_many_confirmations) nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::send_block send (latest_genesis, key.pub, node->online_reps.delta (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis)); + nano::send_block send (latest_genesis, key.pub, node->online_reps.delta (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); - auto open = std::make_shared (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); + auto open = std::make_shared (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code); open_blocks.push_back (std::move (open)); latest_genesis = send.hash (); @@ -639,15 +639,15 @@ TEST (confirmation_height, long_chains) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); nano::keypair key1; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); - nano::block_hash latest (node->latest (nano::dev_genesis_key.pub)); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); + nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); system.wallet (0)->insert_adhoc (key1.prv); node->confirmation_height_processor.batch_write_size = 500; auto const num_blocks = nano::confirmation_height::unbounded_cutoff * 2 + 50; // First open the other account - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); { auto transaction = node->store.tx_begin_write (); @@ -662,7 +662,7 @@ TEST (confirmation_height, long_chains) auto transaction = node->store.tx_begin_write (); for (auto i = num_blocks - 1; i > 0; --i) { - nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); + nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); nano::receive_block receive (previous_destination_chain_hash, send.hash (), key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, receive).code); @@ -673,12 +673,12 @@ TEST (confirmation_height, long_chains) } // Send one from destination to genesis and pocket it - nano::send_block send1 (previous_destination_chain_hash, nano::dev_genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); - auto receive1 (std::make_shared (nano::dev_genesis_key.pub, previous_genesis_chain_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); + nano::send_block send1 (previous_destination_chain_hash, nano::dev::genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); + auto receive1 (std::make_shared (nano::dev::genesis_key.pub, previous_genesis_chain_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); // Unpocketed. Send to a non-existing account to prevent auto receives from the wallet adjusting expected confirmation height nano::keypair key2; - nano::state_block send2 (nano::dev::genesis->account (), receive1->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1->hash ())); + nano::state_block send2 (nano::dev::genesis->account (), receive1->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1->hash ())); { auto transaction = node->store.tx_begin_write (); @@ -699,9 +699,9 @@ TEST (confirmation_height, long_chains) auto transaction (node->store.tx_begin_read ()); nano::account_info account_info; - ASSERT_FALSE (node->store.account.get (transaction, nano::dev_genesis_key.pub, account_info)); + ASSERT_FALSE (node->store.account.get (transaction, nano::dev::genesis_key.pub, account_info)); nano::confirmation_height_info confirmation_height_info; - ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev_genesis_key.pub, confirmation_height_info)); + ASSERT_FALSE (node->store.confirmation_height.get (transaction, nano::dev::genesis_key.pub, confirmation_height_info)); ASSERT_EQ (num_blocks + 2, confirmation_height_info.height); ASSERT_EQ (num_blocks + 3, account_info.block_count); // Includes the unpocketed send @@ -732,13 +732,13 @@ TEST (confirmation_height, dynamic_algorithm) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto const num_blocks = nano::confirmation_height::unbounded_cutoff; auto latest_genesis = nano::genesis ().open; std::vector> state_blocks; for (auto i = 0; i < num_blocks; ++i) { - auto send (std::make_shared (nano::dev_genesis_key.pub, latest_genesis->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - i - 1, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - i - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis->hash ()))); latest_genesis = send; state_blocks.push_back (send); } @@ -786,15 +786,15 @@ TEST (confirmation_height, dynamic_algorithm_no_transition_while_pending) node_flags.force_use_write_database_queue = true; auto node = system.add_node (node_config, node_flags); nano::keypair key; - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto latest_genesis = node->latest (nano::dev_genesis_key.pub); + auto latest_genesis = node->latest (nano::dev::genesis_key.pub); std::vector> state_blocks; auto const num_blocks = nano::confirmation_height::unbounded_cutoff - 2; auto add_block_to_genesis_chain = [&] (nano::write_transaction & transaction) { static int num = 0; - auto send (std::make_shared (nano::dev_genesis_key.pub, latest_genesis, nano::dev_genesis_key.pub, nano::genesis_amount - num - 1, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::genesis_amount - num - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); latest_genesis = send->hash (); state_blocks.push_back (send); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); @@ -855,7 +855,7 @@ TEST (confirmation_height, many_accounts_send_receive_self) nano::node_flags node_flags; node_flags.confirmation_height_processor_mode = nano::confirmation_height_mode::unbounded; auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); #ifndef NDEBUG auto const num_accounts = 10000; @@ -863,7 +863,7 @@ TEST (confirmation_height, many_accounts_send_receive_self) auto const num_accounts = 100000; #endif - auto latest_genesis = node->latest (nano::dev_genesis_key.pub); + auto latest_genesis = node->latest (nano::dev::genesis_key.pub); std::vector keys; std::vector> open_blocks; { @@ -873,9 +873,9 @@ TEST (confirmation_height, many_accounts_send_receive_self) nano::keypair key; keys.emplace_back (key); - nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis)); + nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); - auto open = std::make_shared (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); + auto open = std::make_shared (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code); open_blocks.push_back (std::move (open)); latest_genesis = send.hash (); @@ -994,9 +994,9 @@ TEST (confirmation_height, many_accounts_send_receive_self_no_elections) { nano::keypair key; keys.emplace_back (key); - nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (latest_genesis)); + nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (latest_genesis)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); - auto open = std::make_shared (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); + auto open = std::make_shared (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *open).code); open_blocks.push_back (std::move (open)); latest_genesis = send.hash (); @@ -1077,11 +1077,11 @@ TEST (confirmation_height, prioritize_frontiers_overwrite) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config); - system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv); + system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto num_accounts = node->active.max_priority_cementable_frontiers * 2; - nano::keypair last_keypair = nano::dev_genesis_key; - auto last_open_hash = node->latest (nano::dev_genesis_key.pub); + nano::keypair last_keypair = nano::dev::genesis_key; + auto last_open_hash = node->latest (nano::dev::genesis_key.pub); // Clear confirmation height so that the genesis account has the same amount of uncemented blocks as the other frontiers { auto transaction = node->store.tx_begin_write (); @@ -1119,9 +1119,9 @@ TEST (confirmation_height, prioritize_frontiers_overwrite) // Add a new frontier with 1 block, it should not be added to the frontier container because it is not higher than any already in the maxed out container nano::keypair key; - auto latest_genesis = node->latest (nano::dev_genesis_key.pub); - nano::send_block send (latest_genesis, key.pub, nano::Gxrb_ratio - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis)); - nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); + auto latest_genesis = node->latest (nano::dev::genesis_key.pub); + nano::send_block send (latest_genesis, key.pub, nano::Gxrb_ratio - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis)); + nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -1133,7 +1133,7 @@ TEST (confirmation_height, prioritize_frontiers_overwrite) ASSERT_EQ (node->active.priority_wallet_cementable_frontiers_size (), num_accounts / 2); // The account now has an extra block (2 in total) so has 1 more uncemented block than the next smallest frontier in the collection. - nano::send_block send1 (send.hash (), key.pub, nano::Gxrb_ratio - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send1 (send.hash (), key.pub, nano::Gxrb_ratio - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::receive_block receive (open.hash (), send1.hash (), key.prv, key.pub, *system.work.generate (open.hash ())); { auto transaction = node->store.tx_begin_write (); @@ -1308,11 +1308,11 @@ TEST (telemetry, under_load) nano::genesis genesis; nano::keypair key; nano::keypair key1; - 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 (key.prv); - auto latest_genesis = node->latest (nano::dev_genesis_key.pub); + auto latest_genesis = node->latest (nano::dev::genesis_key.pub); auto num_blocks = 150000; - auto send (std::make_shared (nano::dev_genesis_key.pub, latest_genesis, nano::dev_genesis_key.pub, nano::genesis_amount - num_blocks, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest_genesis))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::genesis_amount - num_blocks, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); node->process_active (send); latest_genesis = send->hash (); auto open (std::make_shared (key.pub, 0, key.pub, num_blocks, send->hash (), key.prv, key.pub, *system.work.generate (key.pub))); @@ -1329,7 +1329,7 @@ TEST (telemetry, under_load) } }; - std::thread thread1 (thread_func, nano::dev_genesis_key, latest_genesis, nano::genesis_amount - num_blocks); + std::thread thread1 (thread_func, nano::dev::genesis_key, latest_genesis, nano::genesis_amount - num_blocks); std::thread thread2 (thread_func, key, latest_key, num_blocks); ASSERT_TIMELY (200s, node1->ledger.cache.block_count == num_blocks * 2 + 3); @@ -1447,7 +1447,7 @@ TEST (telemetry, many_nodes) // Give all nodes a non-default number of blocks nano::keypair key; nano::genesis genesis; - nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ())); for (auto node : system.nodes) { auto transaction (node->store.tx_begin_write ()); @@ -1594,8 +1594,8 @@ TEST (node, mass_epoch_upgrader) //node_config.work_peers = { { "192.168.1.101", 7000 } }; auto & node = *system.add_node (node_config); - auto balance = node.balance (nano::dev_genesis_key.pub); - auto latest = node.latest (nano::dev_genesis_key.pub); + auto balance = node.balance (nano::dev::genesis_key.pub); + auto latest = node.latest (nano::dev::genesis_key.pub); nano::uint128_t amount = 1; // Send to all accounts @@ -1608,12 +1608,12 @@ TEST (node, mass_epoch_upgrader) nano::state_block_builder builder; std::error_code ec; auto block = builder - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest) .balance (balance) .link (info.key.pub) - .representative (nano::dev_genesis_key.pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (latest, nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_0, false, false, false)))) .build (ec); ASSERT_FALSE (ec); @@ -1647,7 +1647,7 @@ TEST (node, mass_epoch_upgrader) ASSERT_EQ (1 + total_accounts + opened.size (), node.ledger.cache.block_count); ASSERT_EQ (1 + opened.size (), node.ledger.cache.account_count); - nano::keypair epoch_signer (nano::dev_genesis_key); + nano::keypair epoch_signer (nano::dev::genesis_key); auto const block_count_before = node.ledger.cache.block_count.load (); auto const total_to_upgrade = 1 + total_accounts; @@ -1730,16 +1730,16 @@ TEST (node, mass_block_new) nano::state_block_builder builder; std::vector> send_blocks; auto send_threshold (nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_2, true, false, false))); - auto latest_genesis = node.latest (nano::dev_genesis_key.pub); + auto latest_genesis = node.latest (nano::dev::genesis_key.pub); for (auto i = 0; i < num_blocks; ++i) { auto send = builder.make_block () - .account (nano::dev_genesis_key.pub) + .account (nano::dev::genesis_key.pub) .previous (latest_genesis) .balance (nano::genesis_amount - i - 1) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (keys[i].pub) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::work_version::work_1, latest_genesis, send_threshold)) .build (); latest_genesis = send->hash (); @@ -1834,7 +1834,7 @@ TEST (node, wallet_create_block_confirm_conflicts) auto transaction = node->store.tx_begin_write (); for (auto i = num_blocks - 1; i > 0; --i) { - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); latest = send.hash (); } diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp index a5888292..23779432 100644 --- a/nano/test_common/system.cpp +++ b/nano/test_common/system.cpp @@ -158,12 +158,12 @@ void nano::system::ledger_initialization_set (std::vector const & { balance -= amount; nano::state_block_builder builder; - builder.account (nano::dev_genesis_key.pub) + builder.account (nano::dev::genesis_key.pub) .previous (previous) - .representative (nano::dev_genesis_key.pub) + .representative (nano::dev::genesis_key.pub) .link (i.pub) .balance (balance) - .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*work.generate (previous)); initialization_blocks.emplace_back (builder.build_shared ()); previous = initialization_blocks.back ()->hash (); @@ -212,7 +212,7 @@ uint64_t nano::system::work_generate_limited (nano::block_hash const & root_a, u std::unique_ptr nano::upgrade_epoch (nano::work_pool & pool_a, nano::ledger & ledger_a, nano::epoch epoch_a) { auto transaction (ledger_a.store.tx_begin_write ()); - auto dev_genesis_key = nano::ledger_constants (nano::networks::nano_dev_network).dev_genesis_key; + auto dev_genesis_key = nano::dev::genesis_key; auto account = dev_genesis_key.pub; auto latest = ledger_a.latest (transaction, account); auto balance = ledger_a.account_balance (transaction, account); @@ -523,7 +523,7 @@ void nano::system::generate_send_new (nano::node & node_a, std::vector accounts; - auto dev_genesis_key = nano::ledger_constants (nano::networks::nano_dev_network).dev_genesis_key; + auto dev_genesis_key = nano::dev::genesis_key; wallet (0)->insert_adhoc (dev_genesis_key.prv); accounts.push_back (dev_genesis_key.pub); auto previous (std::chrono::steady_clock::now ()); diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index 36838a99..1643f17d 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -15,7 +15,6 @@ namespace nano::ledger_constants dev_constants (nano::networks::nano_dev_network); } -nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index 9dc3b07b..082344da 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -53,7 +53,6 @@ class telemetry_data; class network_params; class system; -extern nano::keypair const & dev_genesis_key; extern nano::public_key const & nano_dev_account; extern nano::uint128_t const & genesis_amount; From ffa184a3cf45fc1f42e008e549600c4e1441c7f1 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Wed, 21 Jul 2021 00:20:44 +0100 Subject: [PATCH 6/7] Remove nano::nano_dev_account and use public key from dev genesis block. --- nano/core_test/ledger_walker.cpp | 4 ++-- nano/secure/common.cpp | 3 +-- nano/secure/common.hpp | 1 - nano/test_common/testutil.cpp | 1 - nano/test_common/testutil.hpp | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nano/core_test/ledger_walker.cpp b/nano/core_test/ledger_walker.cpp index 6c8aef22..59ce8242 100644 --- a/nano/core_test/ledger_walker.cpp +++ b/nano/core_test/ledger_walker.cpp @@ -65,7 +65,7 @@ TEST (ledger_walker, genesis_account_longer) const auto transaction = node->ledger.store.tx_begin_read (); nano::account_info genesis_account_info{}; - ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::nano_dev_account, genesis_account_info)); + ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::dev::genesis_key.pub, genesis_account_info)); EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.open_block), 1); EXPECT_EQ (get_number_of_walked_blocks (genesis_account_info.head), 1); @@ -76,7 +76,7 @@ TEST (ledger_walker, genesis_account_longer) ASSERT_TRUE (send); EXPECT_EQ (get_number_of_walked_blocks (send->hash ()), 1 + itr * 2 - 1); ASSERT_TIMELY (3s, 1 + itr * 2 == node->ledger.cache.cemented_count); - ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::nano_dev_account, genesis_account_info)); + ASSERT_FALSE (node->ledger.store.account.get (transaction, nano::dev::genesis_key.pub, genesis_account_info)); // TODO: check issue with account head // EXPECT_EQ(get_number_of_walked_blocks (genesis_account_info.head), 1 + itr * 2); } diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp index 3ef5c04b..0f46a198 100644 --- a/nano/secure/common.cpp +++ b/nano/secure/common.cpp @@ -108,7 +108,6 @@ nano::ledger_constants::ledger_constants (nano::network_constants & network_cons nano::ledger_constants::ledger_constants (nano::networks network_a) : zero_key ("0"), - nano_dev_account (dev_public_key_data), nano_beta_account (beta_public_key_data), nano_live_account (live_public_key_data), nano_test_account (test_public_key_data), @@ -139,7 +138,7 @@ nano::ledger_constants::ledger_constants (nano::networks network_a) : nano::account nano_live_epoch_v2_signer; auto error (nano_live_epoch_v2_signer.decode_account ("nano_3qb6o6i1tkzr6jwr5s7eehfxwg9x6eemitdinbpi7u8bjjwsgqfj4wzser3x")); debug_assert (!error); - auto epoch_v2_signer (network_a == nano::networks::nano_dev_network ? nano_dev_account : network_a == nano::networks::nano_beta_network ? nano_beta_account : network_a == nano::networks::nano_test_network ? nano_test_account : nano_live_epoch_v2_signer); + auto epoch_v2_signer (network_a == nano::networks::nano_dev_network ? nano::dev::genesis_key.pub : network_a == nano::networks::nano_beta_network ? nano_beta_account : network_a == nano::networks::nano_test_network ? nano_test_account : nano_live_epoch_v2_signer); const char * epoch_message_v2 ("epoch v2 block"); strncpy ((char *)epoch_link_v2.bytes.data (), epoch_message_v2, epoch_link_v2.bytes.size ()); epochs.add (nano::epoch::epoch_2, epoch_v2_signer, epoch_link_v2); diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp index bce7c83a..06cf4762 100644 --- a/nano/secure/common.hpp +++ b/nano/secure/common.hpp @@ -371,7 +371,6 @@ public: nano::account genesis_account () const; nano::block_hash genesis_hash () const; nano::keypair zero_key; - nano::account nano_dev_account; nano::account nano_beta_account; nano::account nano_live_account; nano::account nano_test_account; diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index 1643f17d..aea9951a 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -15,7 +15,6 @@ namespace nano::ledger_constants dev_constants (nano::networks::nano_dev_network); } -nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); void nano::wait_peer_connections (nano::system & system_a) diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp index 082344da..7210f3b4 100644 --- a/nano/test_common/testutil.hpp +++ b/nano/test_common/testutil.hpp @@ -53,7 +53,6 @@ class telemetry_data; class network_params; class system; -extern nano::public_key const & nano_dev_account; extern nano::uint128_t const & genesis_amount; class stringstream_mt_sink : public boost::iostreams::sink From 8f3d9686cead2c25487215895152469b387ceecc Mon Sep 17 00:00:00 2001 From: clemahieu Date: Wed, 21 Jul 2021 00:54:04 +0100 Subject: [PATCH 7/7] Moving nano::genesis_amount in to nano::dev namespace. --- nano/core_test/active_transactions.cpp | 72 ++-- nano/core_test/block_store.cpp | 42 +-- nano/core_test/bootstrap.cpp | 52 +-- nano/core_test/confirmation_height.cpp | 90 ++--- nano/core_test/confirmation_solicitor.cpp | 10 +- nano/core_test/election.cpp | 12 +- nano/core_test/election_scheduler.cpp | 10 +- nano/core_test/frontiers_confirmation.cpp | 6 +- nano/core_test/gap_cache.cpp | 12 +- nano/core_test/ledger.cpp | 432 +++++++++++----------- nano/core_test/network_filter.cpp | 4 +- nano/core_test/node.cpp | 170 ++++----- nano/core_test/request_aggregator.cpp | 24 +- nano/core_test/system.cpp | 28 +- nano/core_test/vote_processor.cpp | 8 +- nano/core_test/voting.cpp | 8 +- nano/core_test/wallet.cpp | 8 +- nano/core_test/wallets.cpp | 4 +- nano/core_test/websocket.cpp | 16 +- nano/node/json_handler.cpp | 6 +- nano/node/node.cpp | 2 +- nano/qt/qt.cpp | 2 +- nano/qt_test/qt.cpp | 6 +- nano/rpc_test/rpc.cpp | 140 +++---- nano/secure/common.cpp | 2 +- nano/secure/common.hpp | 2 +- nano/secure/ledger.cpp | 2 +- nano/secure/store_partial.hpp | 2 +- nano/slow_test/node.cpp | 32 +- nano/test_common/system.cpp | 4 +- nano/test_common/testutil.cpp | 8 - 31 files changed, 604 insertions(+), 612 deletions(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index c2d7acf0..472c82c6 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -21,7 +21,7 @@ TEST (active_transactions, confirm_active) auto send = nano::send_block_builder () .previous (genesis.hash ()) .destination (nano::public_key ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -49,7 +49,7 @@ TEST (active_transactions, confirm_active) ASSERT_FALSE (peers.empty ()); { nano::lock_guard guard (node2.rep_crawler.probable_reps_mutex); - node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::genesis_amount, *peers.begin ()); + node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::dev::genesis_amount, *peers.begin ()); } ASSERT_TIMELY (5s, election->votes ().size () != 1); // Votes were inserted (except for not_an_account) auto confirm_req_count (election->confirmation_request_count.load ()); @@ -89,7 +89,7 @@ TEST (active_transactions, confirm_frontier) ASSERT_FALSE (peers.empty ()); { nano::lock_guard guard (node2.rep_crawler.probable_reps_mutex); - node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::genesis_amount, *peers.begin ()); + node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, nano::dev::genesis_amount, *peers.begin ()); } nano::genesis genesis; @@ -98,7 +98,7 @@ TEST (active_transactions, confirm_frontier) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (nano::public_key ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -193,7 +193,7 @@ TEST (active_transactions, inactive_votes_cache) auto send = nano::send_block_builder () .previous (latest) .destination (key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -215,7 +215,7 @@ TEST (active_transactions, inactive_votes_cache_non_final) auto send = nano::send_block_builder () .previous (latest) .destination (key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -228,7 +228,7 @@ TEST (active_transactions, inactive_votes_cache_non_final) auto election = node.active.election (send->qualified_root ()); ASSERT_NE (nullptr, election); ASSERT_FALSE (election->confirmed ()); - ASSERT_EQ (nano::genesis_amount - 100, election->tally ().begin ()->first); + ASSERT_EQ (nano::dev::genesis_amount - 100, election->tally ().begin ()->first); } TEST (active_transactions, inactive_votes_cache_fork) @@ -241,14 +241,14 @@ TEST (active_transactions, inactive_votes_cache_fork) auto send1 = builder.make_block () .previous (latest) .destination (key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto send2 = builder.make_block () .previous (latest) .destination (key.pub) - .balance (nano::genesis_amount - 200) + .balance (nano::dev::genesis_amount - 200) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -285,7 +285,7 @@ TEST (active_transactions, inactive_votes_cache_existing_vote) auto send = builder.send () .previous (latest) .destination (key.pub) - .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 100 * nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -342,7 +342,7 @@ TEST (active_transactions, inactive_votes_cache_multiple_votes) auto send1 = builder.send () .previous (latest) .destination (key1.pub) - .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 100 * nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); @@ -394,14 +394,14 @@ TEST (active_transactions, inactive_votes_cache_election_start) auto send1 = send_block_builder.make_block () .previous (latest) .destination (key1.pub) - .balance (nano::genesis_amount - 5000 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 5000 * nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (latest)) .build_shared (); auto send2 = send_block_builder.make_block () .previous (send1->hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 10000 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 10000 * nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) .build_shared (); @@ -499,7 +499,7 @@ TEST (active_transactions, vote_replays) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -584,7 +584,7 @@ TEST (active_transactions, dropped_cleanup) nano::genesis genesis; auto block = genesis.open; - block->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + block->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::dev::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); // Add to network filter to ensure proper cleanup after the election is dropped std::vector block_bytes; @@ -653,7 +653,7 @@ TEST (active_transactions, republish_winner) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -670,7 +670,7 @@ TEST (active_transactions, republish_winner) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1 - i) + .balance (nano::dev::genesis_amount - 1 - i) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -686,7 +686,7 @@ TEST (active_transactions, republish_winner) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -719,7 +719,7 @@ TEST (active_transactions, fork_filter_cleanup) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -737,7 +737,7 @@ TEST (active_transactions, fork_filter_cleanup) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1 - i) + .balance (nano::dev::genesis_amount - 1 - i) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -776,7 +776,7 @@ TEST (active_transactions, fork_replacement_tally) size_t const max_blocks = 10; std::vector keys (reps_count); auto latest (genesis.hash ()); - auto balance (nano::genesis_amount); + auto balance (nano::dev::genesis_amount); auto amount (node1.minimum_principal_weight ()); nano::state_block_builder builder; @@ -946,7 +946,7 @@ TEST (active_transactions, confirm_new) auto send = nano::send_block_builder () .previous (genesis.hash ()) .destination (nano::public_key ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -977,7 +977,7 @@ TEST (active_transactions, conflicting_block_vote_existing_election) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -986,7 +986,7 @@ TEST (active_transactions, conflicting_block_vote_existing_election) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 200) + .balance (nano::dev::genesis_amount - 200) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -1024,7 +1024,7 @@ TEST (active_transactions, activate_account_chain) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); @@ -1033,7 +1033,7 @@ TEST (active_transactions, activate_account_chain) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build (); @@ -1042,7 +1042,7 @@ TEST (active_transactions, activate_account_chain) .previous (send2->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 3) + .balance (nano::dev::genesis_amount - 3) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send2->hash ())) .build (); @@ -1124,7 +1124,7 @@ TEST (active_transactions, activate_inactive) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -1133,7 +1133,7 @@ TEST (active_transactions, activate_inactive) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::keypair ().pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); @@ -1185,7 +1185,7 @@ TEST (active_transactions, pessimistic_elections) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -1197,7 +1197,7 @@ TEST (active_transactions, pessimistic_elections) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build (); @@ -1324,7 +1324,7 @@ TEST (active_transactions, list_active) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -1336,7 +1336,7 @@ TEST (active_transactions, list_active) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); @@ -1379,7 +1379,7 @@ TEST (active_transactions, vacancy) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -1417,7 +1417,7 @@ TEST (active_transactions, fifo) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key0.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -1430,7 +1430,7 @@ TEST (active_transactions, fifo) .previous (send0->hash ()) .representative (nano::dev::genesis_key.pub) .link (key1.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send0->hash ())) .build_shared (); diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp index bf68e4d1..2bd7952f 100644 --- a/nano/core_test/block_store.cpp +++ b/nano/core_test/block_store.cpp @@ -1016,17 +1016,17 @@ TEST (mdb_block_store, sideband_height) auto transaction (store.tx_begin_write ()); store.initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); nano::change_block change (receive.hash (), 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); - nano::state_block state_send1 (nano::dev::genesis_key.pub, change.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); + nano::state_block state_send1 (nano::dev::genesis_key.pub, change.hash (), 0, nano::dev::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send1).code); - nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send1.hash (), 0, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send1.hash ())); + nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send1.hash (), 0, nano::dev::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send2).code); - nano::state_block state_send3 (nano::dev::genesis_key.pub, state_send2.hash (), 0, nano::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send2.hash ())); + nano::state_block state_send3 (nano::dev::genesis_key.pub, state_send2.hash (), 0, nano::dev::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send3).code); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_open).code); @@ -1274,9 +1274,9 @@ TEST (mdb_block_store, upgrade_v14_v15) nano::genesis genesis; nano::network_params network_params; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block epoch (nano::dev::genesis_key.pub, send.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); - nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch (nano::dev::genesis_key.pub, send.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); { nano::logger_mt logger; nano::mdb_store store (logger, path); @@ -1430,9 +1430,9 @@ TEST (mdb_block_store, upgrade_v16_v17) } nano::genesis genesis; nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block block1 (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block block2 (nano::dev::genesis_key.pub, block1.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); - nano::state_block block3 (nano::dev::genesis_key.pub, block2.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block2.hash ())); + nano::state_block block1 (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block block2 (nano::dev::genesis_key.pub, block1.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); + nano::state_block block3 (nano::dev::genesis_key.pub, block2.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio - 2, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block2.hash ())); auto code = [&block1, &block2, &block3] (auto confirmation_height, nano::block_hash const & expected_cemented_frontier) { auto path (nano::unique_path ()); @@ -1499,16 +1499,16 @@ TEST (mdb_block_store, upgrade_v17_v18) nano::keypair key3; nano::network_params network_params; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send_zero (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block state_receive_zero (nano::dev::genesis_key.pub, send_zero.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, send_zero.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send_zero.hash ())); - nano::state_block epoch (nano::dev::genesis_key.pub, state_receive_zero.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive_zero.hash ())); - nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); - nano::state_block state_receive (nano::dev::genesis_key.pub, state_send.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, state_send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send.hash ())); - nano::state_block state_change (nano::dev::genesis_key.pub, state_receive.hash (), nano::dev::genesis_key.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive.hash ())); - nano::state_block state_send_change (nano::dev::genesis_key.pub, state_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_change.hash ())); + nano::send_block send_zero (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block state_receive_zero (nano::dev::genesis_key.pub, send_zero.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, send_zero.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send_zero.hash ())); + nano::state_block epoch (nano::dev::genesis_key.pub, state_receive_zero.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive_zero.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, epoch.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch.hash ())); + nano::state_block state_receive (nano::dev::genesis_key.pub, state_send.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, state_send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send.hash ())); + nano::state_block state_change (nano::dev::genesis_key.pub, state_receive.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_receive.hash ())); + nano::state_block state_send_change (nano::dev::genesis_key.pub, state_change.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_change.hash ())); nano::state_block epoch_first (key1.pub, 0, 0, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (key1.pub)); nano::state_block state_receive2 (key1.pub, epoch_first.hash (), key1.pub, nano::Gxrb_ratio, state_send_change.hash (), key1.prv, key1.pub, *pool.generate (epoch_first.hash ())); - nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send_change.hash ())); + nano::state_block state_send2 (nano::dev::genesis_key.pub, state_send_change.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_send_change.hash ())); nano::state_block state_open (key2.pub, 0, key2.pub, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (key2.pub)); nano::state_block state_send_epoch_link (key2.pub, state_open.hash (), key2.pub, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), key2.prv, key2.pub, *pool.generate (state_open.hash ())); { @@ -1700,11 +1700,11 @@ TEST (mdb_block_store, upgrade_v18_v19) nano::keypair key1; nano::work_pool pool (std::numeric_limits::max ()); nano::network_params network_params; - nano::send_block send (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + nano::send_block send (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); nano::change_block change (receive.hash (), 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive.hash ())); - nano::state_block state_epoch (nano::dev::genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); - nano::state_block state_send (nano::dev::genesis_key.pub, state_epoch.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_epoch.hash ())); + nano::state_block state_epoch (nano::dev::genesis_key.pub, change.hash (), 0, nano::dev::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change.hash ())); + nano::state_block state_send (nano::dev::genesis_key.pub, state_epoch.hash (), 0, nano::dev::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (state_epoch.hash ())); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); { diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp index 17278646..22e25635 100644 --- a/nano/core_test/bootstrap.cpp +++ b/nano/core_test/bootstrap.cpp @@ -256,7 +256,7 @@ TEST (bootstrap_processor, process_state) .account (nano::dev::genesis_key.pub) .previous (node0->latest (nano::dev::genesis_key.pub)) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -266,7 +266,7 @@ TEST (bootstrap_processor, process_state) .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (block1->hash ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -362,7 +362,7 @@ TEST (bootstrap_processor, DISABLED_pull_requeue_network_error) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -431,7 +431,7 @@ TEST (bootstrap_processor, push_diamond_pruning) ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); // 1st bootstrap node1->bootstrap_initiator.bootstrap (node0->network.endpoint (), false); - ASSERT_TIMELY (10s, node0->balance (key.pub) == nano::genesis_amount); + ASSERT_TIMELY (10s, node0->balance (key.pub) == nano::dev::genesis_amount); // Process more blocks & prune old auto send2 (std::make_shared (open->hash (), nano::dev::genesis_key.pub, std::numeric_limits::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); @@ -497,7 +497,7 @@ TEST (bootstrap_processor, lazy_hash) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -572,7 +572,7 @@ TEST (bootstrap_processor, lazy_hash_bootstrap_id) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -649,7 +649,7 @@ TEST (bootstrap_processor, lazy_hash_pruning) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -659,7 +659,7 @@ TEST (bootstrap_processor, lazy_hash_pruning) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (send1->hash ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (send1->hash ())) @@ -669,7 +669,7 @@ TEST (bootstrap_processor, lazy_hash_pruning) .account (nano::dev::genesis_key.pub) .previous (receive1->hash ()) .representative (key1.pub) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (receive1->hash ())) @@ -679,7 +679,7 @@ TEST (bootstrap_processor, lazy_hash_pruning) .account (nano::dev::genesis_key.pub) .previous (change1->hash ()) .representative (key2.pub) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (change1->hash ())) @@ -689,7 +689,7 @@ TEST (bootstrap_processor, lazy_hash_pruning) .account (nano::dev::genesis_key.pub) .previous (change2->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (change2->hash ())) @@ -783,7 +783,7 @@ TEST (bootstrap_processor, lazy_max_pull_count) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -886,7 +886,7 @@ TEST (bootstrap_processor, lazy_unclear_state_link) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -897,7 +897,7 @@ TEST (bootstrap_processor, lazy_unclear_state_link) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) @@ -949,7 +949,7 @@ TEST (bootstrap_processor, lazy_unclear_state_link_not_existing) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -1001,7 +1001,7 @@ TEST (bootstrap_processor, DISABLED_lazy_destinations) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -1012,7 +1012,7 @@ TEST (bootstrap_processor, DISABLED_lazy_destinations) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) @@ -1066,7 +1066,7 @@ TEST (bootstrap_processor, lazy_pruning_missing_block) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -1077,7 +1077,7 @@ TEST (bootstrap_processor, lazy_pruning_missing_block) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send1->hash ())) @@ -1161,7 +1161,7 @@ TEST (bootstrap_processor, lazy_cancel) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -1201,7 +1201,7 @@ TEST (bootstrap_processor, wallet_lazy_frontier) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -1280,7 +1280,7 @@ TEST (bootstrap_processor, wallet_lazy_pending) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (genesis.hash ())) @@ -1342,7 +1342,7 @@ TEST (bootstrap_processor, multiple_attempts) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (genesis.hash ())) @@ -1464,7 +1464,7 @@ TEST (frontier_req, count) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -1567,7 +1567,7 @@ TEST (frontier_req, confirmed_frontier) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key_before_genesis.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -1579,7 +1579,7 @@ TEST (frontier_req, confirmed_frontier) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key_after_genesis.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp index edd60acc..28dbfabe 100644 --- a/nano/core_test/confirmation_height.cpp +++ b/nano/core_test/confirmation_height.cpp @@ -225,11 +225,11 @@ TEST (confirmation_height, gap_bootstrap) auto & node1 = *system.add_node (node_flags); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -304,18 +304,18 @@ TEST (confirmation_height, gap_live) node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); node_config.peering_port = nano::get_available_port (); - node_config.receive_minimum = nano::genesis_amount; // Prevent auto-receive & open1/receive1/receive2 blocks conflicts + node_config.receive_minimum = nano::dev::genesis_amount; // Prevent auto-receive & open1/receive1/receive2 blocks conflicts system.add_node (node_config, node_flags); nano::keypair destination; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); system.wallet (1)->insert_adhoc (destination.prv); nano::genesis genesis; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 1, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send2); - auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::genesis_amount - 3, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send3 (std::make_shared (nano::dev::genesis->account (), send2->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 3, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node->work_generate_blocking (*send3); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); @@ -478,10 +478,10 @@ TEST (confirmation_height, send_receive_self) auto node = system.add_node (node_config, node_flags); nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); - nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); - nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1.hash ())); - nano::send_block send3 (send2.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); + nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); nano::receive_block receive2 (send3.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); auto receive3 = std::make_shared (receive2.hash (), send3.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); @@ -543,8 +543,8 @@ TEST (confirmation_height, all_block_types) nano::keypair key1; nano::keypair key2; auto & store = node->store; - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key2.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::state_block state_open (key2.pub, 0, 0, nano::Gxrb_ratio, send1.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)); @@ -569,7 +569,7 @@ TEST (confirmation_height, all_block_types) nano::state_block state_send3 (key2.pub, state_send2->hash (), 0, nano::Gxrb_ratio - 1, key1.pub, key2.prv, key2.pub, *system.work.generate (state_send2->hash ())); nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::dev::genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ())); - nano::state_block state_receive3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::state_block state_receive3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); { auto transaction (store.tx_begin_write ()); @@ -656,10 +656,10 @@ TEST (confirmation_height, conflict_rollback_cemented) ASSERT_EQ (1, node1->network.size ()); nano::keypair key1; nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); nano::publish publish1 (send1); nano::keypair key2; - auto send2 (std::make_shared (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send2 (std::make_shared (genesis.hash (), key2.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); nano::publish publish2 (send2); auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ())); node1->network.inbound (publish1, channel1); @@ -695,7 +695,7 @@ TEST (confirmation_height, conflict_rollback_cemented) ASSERT_TIMELY (20s, sb.component ()->str ().find (rollback_log_entry) != std::string::npos); auto winner (*election->tally ().begin ()); ASSERT_EQ (*publish1.block, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); ASSERT_TRUE (node1->ledger.block_or_pruned_exists (publish1.block->hash ())); ASSERT_TRUE (node2->ledger.block_or_pruned_exists (publish2.block->hash ())); ASSERT_FALSE (node2->ledger.block_or_pruned_exists (publish1.block->hash ())); @@ -729,7 +729,7 @@ TEST (confirmation_heightDeathTest, rollback_added_block) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + auto send = std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -806,7 +806,7 @@ TEST (confirmation_heightDeathTest, modified_chain) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -877,7 +877,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1; - auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open = std::make_shared (key1.pub, 0, 0, nano::Gxrb_ratio, send->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); { auto transaction (store->tx_begin_write ()); @@ -940,8 +940,8 @@ TEST (confirmation_height, pending_observer_callbacks) nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); { auto transaction = node->store.tx_begin_write (); @@ -982,13 +982,13 @@ TEST (confirmation_height, callback_confirmed_history) nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send = std::make_shared (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); } - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); add_callback_stats (*node); @@ -1063,9 +1063,9 @@ TEST (confirmation_height, dependent_election) nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); - auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); + auto send = std::make_shared (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); + auto send2 = std::make_shared (send1->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); @@ -1115,22 +1115,22 @@ TEST (confirmation_height, cemented_gap_below_receive) nano::keypair key1; system.wallet (0)->insert_adhoc (key1.prv); - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::keypair dummy_key; - nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send.hash ())); - nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); nano::keypair key2; system.wallet (0)->insert_adhoc (key2.prv); - nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); - nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); + nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); + nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); @@ -1200,22 +1200,22 @@ TEST (confirmation_height, cemented_gap_below_no_cache) nano::keypair key1; system.wallet (0)->insert_adhoc (key1.prv); - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (send.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send.hash ())); nano::keypair dummy_key; - nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::send_block send2 (receive1.hash (), nano::dev::genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send.hash ())); - nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); + nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive2.hash ())); nano::keypair key2; system.wallet (0)->insert_adhoc (key2.prv); - nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); - nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); + nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 4, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (dummy_send1.hash ())); + nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 5, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3.hash ())); auto open1 = std::make_shared (send3.hash (), nano::dev::genesis->account (), key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); @@ -1281,9 +1281,9 @@ TEST (confirmation_height, election_winner_details_clearing) nano::block_hash latest (node->latest (nano::dev::genesis_key.pub)); nano::keypair key1; - auto send = std::make_shared (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); - auto send2 = std::make_shared (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); + auto send = std::make_shared (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send->hash ())); + auto send2 = std::make_shared (send1->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 3, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ())); { auto transaction = node->store.tx_begin_write (); @@ -1344,7 +1344,7 @@ TEST (confirmation_height, election_winner_details_clearing_node_process_confirm nano::system system (1); auto node = system.nodes.front (); - auto send = std::make_shared (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ())); + auto send = std::make_shared (nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ())); // Add to election_winner_details. Use an unrealistic iteration so that it should fall into the else case and do a cleanup node->active.add_election_winner_details (send->hash (), nullptr); nano::election_status election; @@ -1372,8 +1372,8 @@ TEST (confirmation_height, unbounded_block_cache_iteration) nano::work_pool pool (std::numeric_limits::max ()); nano::logging logging; nano::keypair key1; - auto send = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); - auto send1 = std::make_shared (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send->hash ())); + auto send = std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + auto send1 = std::make_shared (send->hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send->hash ())); { auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); @@ -1422,7 +1422,7 @@ TEST (confirmation_height, pruned_source) nano::write_database_queue write_database_queue (false); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key1, key2; - auto send1 = std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 100, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); + auto send1 = std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 100, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (nano::dev::genesis->hash ())); auto open1 = std::make_shared (key1.pub, 0, key1.pub, 100, send1->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); auto send2 = std::make_shared (key1.pub, open1->hash (), key1.pub, 50, key2.pub, key1.prv, key1.pub, *pool.generate (open1->hash ())); auto send3 = std::make_shared (key1.pub, send2->hash (), key1.pub, 25, key2.pub, key1.prv, key1.pub, *pool.generate (send2->hash ())); diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp index 19572e40..8fd7a5aa 100644 --- a/nano/core_test/confirmation_solicitor.cpp +++ b/nano/core_test/confirmation_solicitor.cpp @@ -19,7 +19,7 @@ TEST (confirmation_solicitor, batches) auto & node2 = *system.add_node (node_flags); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); // Solicitor will only solicit from this representative - nano::representative representative (nano::dev::genesis_key.pub, nano::genesis_amount, channel1); + nano::representative representative (nano::dev::genesis_key.pub, nano::dev::genesis_amount, channel1); std::vector representatives{ representative }; nano::confirmation_solicitor solicitor (node2.network, node2.config); solicitor.prepare (representatives); @@ -28,7 +28,7 @@ TEST (confirmation_solicitor, batches) ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (nano::dev::genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); { nano::lock_guard guard (node2.active.mutex); @@ -63,7 +63,7 @@ TEST (confirmation_solicitor, different_hash) auto & node2 = *system.add_node (node_flags); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); // Solicitor will only solicit from this representative - nano::representative representative (nano::dev::genesis_key.pub, nano::genesis_amount, channel1); + nano::representative representative (nano::dev::genesis_key.pub, nano::dev::genesis_amount, channel1); std::vector representatives{ representative }; nano::confirmation_solicitor solicitor (node2.network, node2.config); solicitor.prepare (representatives); @@ -72,7 +72,7 @@ TEST (confirmation_solicitor, different_hash) ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (nano::dev::genesis_key.pub, representatives.front ().account); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner @@ -108,7 +108,7 @@ TEST (confirmation_solicitor, bypass_max_requests_cap) ASSERT_EQ (max_representatives + 1, representatives.size ()); solicitor.prepare (representatives); ASSERT_TIMELY (3s, node2.network.size () == 1); - auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis->hash (), nano::keypair ().pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); send->sideband_set ({}); auto election (std::make_shared (node2, send, nullptr, nullptr, nano::election_behavior::normal)); // Add a vote for something else, not the winner diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp index c731faa6..601e4426 100644 --- a/nano/core_test/election.cpp +++ b/nano/core_test/election.cpp @@ -11,7 +11,7 @@ TEST (election, construction) nano::system system (1); nano::genesis genesis; auto & node = *system.nodes[0]; - genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::dev::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); node.scheduler.flush (); auto election = node.active.election (genesis.open->qualified_root ()); @@ -22,7 +22,7 @@ TEST (election, quorum_minimum_flip_success) { nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); - node_config.online_weight_minimum = nano::genesis_amount; + node_config.online_weight_minimum = nano::dev::genesis_amount; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); nano::keypair key1; @@ -68,7 +68,7 @@ TEST (election, quorum_minimum_flip_fail) { nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); - node_config.online_weight_minimum = nano::genesis_amount; + node_config.online_weight_minimum = nano::dev::genesis_amount; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); nano::keypair key1; @@ -114,7 +114,7 @@ TEST (election, quorum_minimum_confirm_success) { nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); - node_config.online_weight_minimum = nano::genesis_amount; + node_config.online_weight_minimum = nano::dev::genesis_amount; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); nano::keypair key1; @@ -147,7 +147,7 @@ TEST (election, quorum_minimum_confirm_fail) { nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); - node_config.online_weight_minimum = nano::genesis_amount; + node_config.online_weight_minimum = nano::dev::genesis_amount; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); nano::keypair key1; @@ -202,7 +202,7 @@ TEST (election, quorum_minimum_update_weight_before_quorum_checks) .account (key1.pub) .previous (0) .representative (key1.pub) - .balance (nano::genesis_amount - amount) + .balance (nano::dev::genesis_amount - amount) .link (send1->hash ()) .work (0) .sign (key1.prv, key1.pub) diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp index 565d5d05..10e2c94b 100644 --- a/nano/core_test/election_scheduler.cpp +++ b/nano/core_test/election_scheduler.cpp @@ -21,7 +21,7 @@ TEST (election_scheduler, activate_one_timely) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -39,7 +39,7 @@ TEST (election_scheduler, activate_one_flush) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -65,7 +65,7 @@ TEST (election_scheduler, no_vacancy) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -91,7 +91,7 @@ TEST (election_scheduler, no_vacancy) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) .link (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) .build_shared (); @@ -138,7 +138,7 @@ TEST (election_scheduler, flush_vacancy) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); diff --git a/nano/core_test/frontiers_confirmation.cpp b/nano/core_test/frontiers_confirmation.cpp index 009a2e37..8f5a39e9 100644 --- a/nano/core_test/frontiers_confirmation.cpp +++ b/nano/core_test/frontiers_confirmation.cpp @@ -219,7 +219,7 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::always; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -232,7 +232,7 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::automatic; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); @@ -245,7 +245,7 @@ TEST (frontiers_confirmation, mode) nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto node = system.add_node (node_config, node_flags); - nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); { auto transaction = node->store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); diff --git a/nano/core_test/gap_cache.cpp b/nano/core_test/gap_cache.cpp index 972cb082..270e8203 100644 --- a/nano/core_test/gap_cache.cpp +++ b/nano/core_test/gap_cache.cpp @@ -67,10 +67,10 @@ TEST (gap_cache, gap_bootstrap) auto & node2 (*system.nodes[1]); nano::block_hash latest (node1.latest (nano::dev::genesis_key.pub)); nano::keypair key; - auto send (std::make_shared (latest, key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); + auto send (std::make_shared (latest, key.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); node1.process (*send); - ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - 100, node1.balance (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, node2.balance (nano::dev::genesis->account ())); // Confirm send block, allowing voting on the upcoming block node1.block_confirm (send); auto election = node1.active.election (send->qualified_root ()); @@ -81,9 +81,9 @@ TEST (gap_cache, gap_bootstrap) system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto latest_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, 100)); ASSERT_NE (nullptr, latest_block); - ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, node2.balance (nano::dev::genesis->account ())); - ASSERT_TIMELY (10s, node2.balance (nano::dev::genesis->account ()) == nano::genesis_amount - 200); + ASSERT_EQ (nano::dev::genesis_amount - 200, node1.balance (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, node2.balance (nano::dev::genesis->account ())); + ASSERT_TIMELY (10s, node2.balance (nano::dev::genesis->account ()) == nano::dev::genesis_amount - 200); } TEST (gap_cache, two_dependencies) diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp index 67530c10..f80296aa 100644 --- a/nano/core_test/ledger.cpp +++ b/nano/core_test/ledger.cpp @@ -50,9 +50,9 @@ TEST (ledger, genesis_balance) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); auto balance (ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, balance); + ASSERT_EQ (nano::dev::genesis_amount, balance); auto amount (ledger.amount (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, amount); + ASSERT_EQ (nano::dev::genesis_amount, amount); nano::account_info info; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis->account (), info)); ASSERT_EQ (1, ledger.cache.account_count); @@ -76,7 +76,7 @@ TEST (ledger, process_modifies_sideband) nano::genesis genesis; store->initialize (store->tx_begin_write (), ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (store->tx_begin_write (), send1).code); ASSERT_EQ (send1.sideband ().timestamp, store->block.get (store->tx_begin_read (), send1.hash ())->sideband ().timestamp); } @@ -104,13 +104,13 @@ TEST (ledger, process_send) auto return1 (ledger.process (transaction, send)); ASSERT_EQ (nano::dev::genesis_key.pub, send.sideband ().account); ASSERT_EQ (2, send.sideband ().height); - ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash1)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.amount (transaction, hash1)); ASSERT_TRUE (store->frontier.get (transaction, info1.head).is_zero ()); ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, hash1)); ASSERT_EQ (nano::process_result::progress, return1.code); ASSERT_EQ (nano::dev::genesis_key.pub, store->block.account_calculated (send)); ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); nano::account_info info2; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info2)); ASSERT_EQ (2, info2.block_count); @@ -126,17 +126,17 @@ TEST (ledger, process_send) auto return2 (ledger.process (transaction, open)); ASSERT_EQ (nano::process_result::progress, return2.code); ASSERT_EQ (key2.pub, open.sideband ().account); - ASSERT_EQ (nano::genesis_amount - 50, open.sideband ().balance.number ()); + ASSERT_EQ (nano::dev::genesis_amount - 50, open.sideband ().balance.number ()); ASSERT_EQ (1, open.sideband ().height); - ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash2)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.amount (transaction, hash2)); ASSERT_EQ (nano::process_result::progress, return2.code); ASSERT_EQ (key2.pub, store->block.account_calculated (open)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash2)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.amount (transaction, hash2)); ASSERT_EQ (key2.pub, store->frontier.get (transaction, hash2)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (key2.pub)); nano::account_info info3; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); auto latest2 (store->block.get (transaction, info3.head)); @@ -158,9 +158,9 @@ TEST (ledger, process_send) nano::pending_info pending1; ASSERT_FALSE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash1), pending1)); ASSERT_EQ (nano::dev::genesis_key.pub, pending1.source); - ASSERT_EQ (nano::genesis_amount - 50, pending1.amount.number ()); + ASSERT_EQ (nano::dev::genesis_amount - 50, pending1.amount.number ()); ASSERT_EQ (0, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); @@ -168,7 +168,7 @@ TEST (ledger, process_send) ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis_key.pub, info6)); ASSERT_EQ (hash1, info6.head); ASSERT_FALSE (ledger.rollback (transaction, info6.head)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (nano::dev::genesis_key.pub, store->frontier.get (transaction, info1.head)); ASSERT_TRUE (store->frontier.get (transaction, hash1).is_zero ()); nano::account_info info7; @@ -177,7 +177,7 @@ TEST (ledger, process_send) ASSERT_EQ (info1.head, info7.head); nano::pending_info pending2; ASSERT_TRUE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash1), pending2)); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -206,10 +206,10 @@ TEST (ledger, process_receive) ASSERT_EQ (nano::process_result::progress, return1.code); ASSERT_EQ (key2.pub, store->block.account_calculated (open)); ASSERT_EQ (key2.pub, open.sideband ().account); - ASSERT_EQ (nano::genesis_amount - 50, open.sideband ().balance.number ()); + ASSERT_EQ (nano::dev::genesis_amount - 50, open.sideband ().balance.number ()); ASSERT_EQ (1, open.sideband ().height); - ASSERT_EQ (nano::genesis_amount - 50, ledger.amount (transaction, hash2)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.amount (transaction, hash2)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (key3.pub)); nano::send_block send2 (hash1, key2.pub, 25, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); nano::block_hash hash3 (send2.hash ()); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); @@ -218,7 +218,7 @@ TEST (ledger, process_receive) ASSERT_EQ (key2.pub, store->frontier.get (transaction, hash2)); auto return2 (ledger.process (transaction, receive)); ASSERT_EQ (key2.pub, receive.sideband ().account); - ASSERT_EQ (nano::genesis_amount - 25, receive.sideband ().balance.number ()); + ASSERT_EQ (nano::dev::genesis_amount - 25, receive.sideband ().balance.number ()); ASSERT_EQ (2, receive.sideband ().height); ASSERT_EQ (25, ledger.amount (transaction, hash4)); ASSERT_TRUE (store->frontier.get (transaction, hash2).is_zero ()); @@ -228,16 +228,16 @@ TEST (ledger, process_receive) ASSERT_EQ (hash4, ledger.latest (transaction, key2.pub)); ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_pending (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount - 25, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount - 25, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 25, ledger.account_balance (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 25, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, hash4)); ASSERT_TRUE (store->block.successor (transaction, hash2).is_zero ()); ASSERT_EQ (key2.pub, store->frontier.get (transaction, hash2)); ASSERT_TRUE (store->frontier.get (transaction, hash4).is_zero ()); ASSERT_EQ (25, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (25, ledger.account_pending (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (key3.pub)); ASSERT_EQ (hash2, ledger.latest (transaction, key2.pub)); nano::pending_info pending1; ASSERT_FALSE (ledger.store.pending.get (transaction, nano::pending_key (key2.pub, hash3), pending1)); @@ -269,14 +269,14 @@ TEST (ledger, rollback_receiver) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); ASSERT_EQ (hash2, ledger.latest (transaction, key2.pub)); ASSERT_EQ (50, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.account_balance (transaction, key2.pub)); ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, hash1)); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.account_balance (transaction, key2.pub)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); nano::account_info info2; @@ -314,7 +314,7 @@ TEST (ledger, rollback_representation) nano::receive_block receive1 (open.hash (), send2.hash (), key2.prv, key2.pub, *pool.generate (open.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_EQ (1, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 1, ledger.weight (key4.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 1, ledger.weight (key4.pub)); nano::account_info info1; ASSERT_FALSE (store->account.get (transaction, key2.pub, info1)); ASSERT_EQ (key4.pub, info1.representative); @@ -323,12 +323,12 @@ TEST (ledger, rollback_representation) ASSERT_FALSE (store->account.get (transaction, key2.pub, info2)); ASSERT_EQ (key4.pub, info2.representative); ASSERT_EQ (0, ledger.weight (key2.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (key4.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (key4.pub)); ASSERT_FALSE (ledger.rollback (transaction, open.hash ())); ASSERT_EQ (1, ledger.weight (key3.pub)); ASSERT_EQ (0, ledger.weight (key4.pub)); ledger.rollback (transaction, send1.hash ()); - ASSERT_EQ (nano::genesis_amount, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (key3.pub)); nano::account_info info3; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); ASSERT_EQ (key3.pub, info3.representative); @@ -336,7 +336,7 @@ TEST (ledger, rollback_representation) nano::account_info info4; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info4)); ASSERT_EQ (key5.pub, info4.representative); - ASSERT_EQ (nano::genesis_amount, ledger.weight (key5.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (key5.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); } @@ -351,7 +351,7 @@ TEST (ledger, receive_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::receive_block receive (send.hash (), send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); @@ -406,7 +406,7 @@ TEST (ledger, weight) nano::genesis genesis; auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, representative_change) @@ -421,7 +421,7 @@ TEST (ledger, representative_change) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); nano::account_info info1; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); @@ -434,7 +434,7 @@ TEST (ledger, representative_change) ASSERT_EQ (nano::process_result::progress, return1.code); ASSERT_EQ (nano::dev::genesis_key.pub, store->block.account_calculated (block)); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount, ledger.weight (key2.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (key2.pub)); nano::account_info info2; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info2)); ASSERT_EQ (block.hash (), info2.head); @@ -444,7 +444,7 @@ TEST (ledger, representative_change) nano::account_info info3; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info3)); ASSERT_EQ (info1.head, info3.head); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key2.pub)); } @@ -542,38 +542,38 @@ TEST (ledger, representation) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - ASSERT_EQ (nano::genesis_amount, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, rep_weights.representation_get (nano::dev::genesis_key.pub)); nano::keypair key2; - nano::send_block block1 (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block block1 (genesis.hash (), key2.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block1).code); - ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); nano::keypair key3; nano::open_block block2 (block1.hash (), key3.pub, key2.pub, key2.prv, key2.pub, *pool.generate (key2.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block2).code); - ASSERT_EQ (nano::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (100, rep_weights.representation_get (key3.pub)); - nano::send_block block3 (block1.hash (), key2.pub, nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); + nano::send_block block3 (block1.hash (), key2.pub, nano::dev::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (block1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block3).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (100, rep_weights.representation_get (key3.pub)); nano::receive_block block4 (block2.hash (), block3.hash (), key2.prv, key2.pub, *pool.generate (block2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block4).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (200, rep_weights.representation_get (key3.pub)); nano::keypair key4; nano::change_block block5 (block4.hash (), key4.pub, key2.prv, key2.pub, *pool.generate (block4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block5).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (200, rep_weights.representation_get (key4.pub)); nano::keypair key5; nano::send_block block6 (block5.hash (), key5.pub, 100, key2.prv, key2.pub, *pool.generate (block5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block6).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (100, rep_weights.representation_get (key4.pub)); @@ -581,7 +581,7 @@ TEST (ledger, representation) nano::keypair key6; nano::open_block block7 (block6.hash (), key6.pub, key5.pub, key5.prv, key5.pub, *pool.generate (key5.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block7).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (100, rep_weights.representation_get (key4.pub)); @@ -589,7 +589,7 @@ TEST (ledger, representation) ASSERT_EQ (100, rep_weights.representation_get (key6.pub)); nano::send_block block8 (block6.hash (), key5.pub, 0, key2.prv, key2.pub, *pool.generate (block6.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block8).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (0, rep_weights.representation_get (key4.pub)); @@ -597,7 +597,7 @@ TEST (ledger, representation) ASSERT_EQ (100, rep_weights.representation_get (key6.pub)); nano::receive_block block9 (block7.hash (), block8.hash (), key5.prv, key5.pub, *pool.generate (block7.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, block9).code); - ASSERT_EQ (nano::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 200, rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, rep_weights.representation_get (key2.pub)); ASSERT_EQ (0, rep_weights.representation_get (key3.pub)); ASSERT_EQ (0, rep_weights.representation_get (key4.pub)); @@ -653,7 +653,7 @@ TEST (votes, check_signature) auto & node1 = *system.add_node (node_config); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); { auto transaction (node1.store.tx_begin_write ()); @@ -677,7 +677,7 @@ TEST (votes, add_one) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair key1; - auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); @@ -697,7 +697,7 @@ TEST (votes, add_one) nano::lock_guard guard (node1.active.mutex); auto winner (*election1->tally ().begin ()); ASSERT_EQ (*send1, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); } TEST (votes, add_two) @@ -706,7 +706,7 @@ TEST (votes, add_two) auto & node1 = *system.nodes[0]; nano::genesis genesis; nano::keypair key1; - auto send1 = std::make_shared (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); + auto send1 = std::make_shared (genesis.hash (), key1.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); node1.work_generate_blocking (*send1); auto transaction = node1.store.tx_begin_write (); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *send1).code); @@ -735,7 +735,7 @@ TEST (votes, add_existing) { nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); - node_config.online_weight_minimum = nano::genesis_amount; + node_config.online_weight_minimum = nano::dev::genesis_amount; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; auto & node1 = *system.add_node (node_config); nano::keypair key1; @@ -744,7 +744,7 @@ TEST (votes, add_existing) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) // No representative, blocks can't confirm - .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount / 2 - nano::Gxrb_ratio) .link (key1.pub) .work (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -764,7 +764,7 @@ TEST (votes, add_existing) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) // No representative, blocks can't confirm - .balance (nano::genesis_amount / 2 - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount / 2 - nano::Gxrb_ratio) .link (key2.pub) .work (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -1432,7 +1432,7 @@ TEST (ledger, change_representative_move_representation) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); auto hash1 (genesis.hash ()); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis_key.pub)); nano::send_block send (hash1, key1.pub, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (hash1)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); @@ -1442,7 +1442,7 @@ TEST (ledger, change_representative_move_representation) nano::keypair key3; nano::open_block open (send.hash (), key3.pub, key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); - ASSERT_EQ (nano::genesis_amount, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (key3.pub)); } TEST (ledger, send_open_receive_rollback) @@ -1459,10 +1459,10 @@ TEST (ledger, send_open_receive_rollback) nano::account_info info1; ASSERT_FALSE (store->account.get (transaction, nano::dev::genesis_key.pub, info1)); nano::keypair key1; - nano::send_block send1 (info1.head, key1.pub, nano::genesis_amount - 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); + nano::send_block send1 (info1.head, key1.pub, nano::dev::genesis_amount - 50, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (info1.head)); auto return1 (ledger.process (transaction, send1)); ASSERT_EQ (nano::process_result::progress, return1.code); - nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key1.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); auto return2 (ledger.process (transaction, send2)); ASSERT_EQ (nano::process_result::progress, return2.code); nano::keypair key2; @@ -1474,34 +1474,34 @@ TEST (ledger, send_open_receive_rollback) ASSERT_EQ (nano::process_result::progress, return5.code); nano::keypair key3; ASSERT_EQ (100, ledger.weight (key2.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); nano::change_block change1 (send2.hash (), key3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); auto return6 (ledger.process (transaction, change1)); ASSERT_EQ (nano::process_result::progress, return6.code); ASSERT_EQ (100, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, receive.hash ())); ASSERT_EQ (50, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, open.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (key3.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, ledger.weight (key3.pub)); ASSERT_FALSE (ledger.rollback (transaction, change1.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 100, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_FALSE (ledger.rollback (transaction, send2.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 50, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 50, ledger.weight (nano::dev::genesis_key.pub)); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_EQ (0, ledger.weight (key2.pub)); ASSERT_EQ (0, ledger.weight (key3.pub)); - ASSERT_EQ (nano::genesis_amount - 0, ledger.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - 0, ledger.weight (nano::dev::genesis_key.pub)); } TEST (ledger, bootstrap_rep_weight) @@ -1553,7 +1553,7 @@ TEST (ledger, block_destination_source) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair dest; - nano::uint128_t balance (nano::genesis_amount); + nano::uint128_t balance (nano::dev::genesis_amount); balance -= nano::Gxrb_ratio; nano::send_block block1 (genesis.hash (), dest.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); balance -= nano::Gxrb_ratio; @@ -1598,7 +1598,7 @@ TEST (ledger, state_account) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (nano::dev::genesis->account (), ledger.account (transaction, send1.hash ())); } @@ -1614,29 +1614,29 @@ TEST (ledger, state_send_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, send2->sideband ().height); ASSERT_TRUE (send2->sideband ().details.is_send); ASSERT_FALSE (send2->sideband ().details.is_receive); ASSERT_FALSE (send2->sideband ().details.is_epoch); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); ASSERT_NE (nullptr, receive2); ASSERT_EQ (receive1, *receive2); - ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); ASSERT_EQ (3, receive2->sideband ().height); @@ -1656,24 +1656,24 @@ TEST (ledger, state_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); ASSERT_NE (nullptr, receive2); ASSERT_EQ (receive1, *receive2); - ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (3, receive2->sideband ().height); ASSERT_FALSE (receive2->sideband ().details.is_send); ASSERT_TRUE (receive2->sideband ().details.is_receive); @@ -1692,16 +1692,16 @@ TEST (ledger, state_rep_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_TRUE (store->block.exists (transaction, change1.hash ())); auto change2 (store->block.get (transaction, change1.hash ())); ASSERT_NE (nullptr, change2); ASSERT_EQ (change1, *change2); - ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, change1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.balance (transaction, change1.hash ())); ASSERT_EQ (0, ledger.amount (transaction, change1.hash ())); ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (rep.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (rep.pub)); ASSERT_EQ (2, change2->sideband ().height); ASSERT_FALSE (change2->sideband ().details.is_send); ASSERT_FALSE (change2->sideband ().details.is_receive); @@ -1720,15 +1720,15 @@ TEST (ledger, state_open) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (destination.pub, send1.hash ()))); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -1739,7 +1739,7 @@ TEST (ledger, state_open) ASSERT_EQ (open1, *open2); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, open1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, open1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (ledger.cache.account_count, store->account.count (transaction)); ASSERT_EQ (1, open2->sideband ().height); ASSERT_FALSE (open2->sideband ().details.is_send); @@ -1759,9 +1759,9 @@ TEST (ledger, send_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::send_block send2 (send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - (2 * nano::Gxrb_ratio), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, send2).code); } @@ -1777,7 +1777,7 @@ TEST (ledger, receive_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, receive1).code); @@ -1795,7 +1795,7 @@ TEST (ledger, change_after_state_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; nano::change_block change1 (send1.hash (), rep.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); @@ -1813,16 +1813,16 @@ TEST (ledger, state_unreceivable_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, receive1).code); } @@ -1837,16 +1837,16 @@ TEST (ledger, state_receive_bad_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, receive1).code); } @@ -1861,10 +1861,10 @@ TEST (ledger, state_no_link_amount_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::balance_mismatch, ledger.process (transaction, change1).code); } @@ -1879,15 +1879,15 @@ TEST (ledger, state_receive_wrong_account_fail) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::keypair key; nano::state_block receive1 (key.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, receive1).code); @@ -1905,7 +1905,7 @@ TEST (ledger, state_open_state_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -1926,7 +1926,7 @@ TEST (ledger, state_state_open_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -1948,7 +1948,7 @@ TEST (ledger, state_open_previous_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 1, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (1)); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, open1).code); @@ -1966,7 +1966,7 @@ TEST (ledger, state_open_source_fail) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), 0, 0, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::gap_source, ledger.process (transaction, open1).code); @@ -1984,16 +1984,16 @@ TEST (ledger, state_send_change) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (rep.pub)); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (rep.pub)); ASSERT_EQ (2, send2->sideband ().height); ASSERT_TRUE (send2->sideband ().details.is_send); ASSERT_FALSE (send2->sideband ().details.is_receive); @@ -2011,26 +2011,26 @@ TEST (ledger, state_receive_change) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.balance (transaction, send1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::keypair rep; - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::dev::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive2 (store->block.get (transaction, receive1.hash ())); ASSERT_NE (nullptr, receive2); ASSERT_EQ (receive1, *receive2); - ASSERT_EQ (nano::genesis_amount, ledger.balance (transaction, receive1.hash ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); ASSERT_EQ (0, ledger.weight (nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (rep.pub)); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (rep.pub)); ASSERT_EQ (3, receive2->sideband ().height); ASSERT_FALSE (receive2->sideband ().details.is_send); ASSERT_TRUE (receive2->sideband ().details.is_receive); @@ -2049,13 +2049,13 @@ TEST (ledger, state_open_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, open1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, open1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, state_receive_old) @@ -2070,9 +2070,9 @@ TEST (ledger, state_receive_old) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - (2 * nano::Gxrb_ratio), destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::open_block open1 (send1.hash (), nano::dev::genesis->account (), destination.pub, destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -2080,7 +2080,7 @@ TEST (ledger, state_receive_old) ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_EQ (2 * nano::Gxrb_ratio, ledger.balance (transaction, receive1.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); } TEST (ledger, state_rollback_send) @@ -2094,22 +2094,22 @@ TEST (ledger, state_rollback_send) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send2 (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send2); ASSERT_EQ (send1, *send2); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::pending_info info; ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()), info)); ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_TRUE (store->block.successor (transaction, genesis.hash ()).is_zero ()); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); @@ -2126,9 +2126,9 @@ TEST (ledger, state_rollback_receive) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), receive1.hash ()))); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); @@ -2137,8 +2137,8 @@ TEST (ledger, state_rollback_receive) ASSERT_EQ (nano::dev::genesis->account (), info.source); ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2154,7 +2154,7 @@ TEST (ledger, state_rollback_received_send) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block receive1 (key.pub, 0, key.pub, nano::Gxrb_ratio, send1.hash (), key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); @@ -2163,8 +2163,8 @@ TEST (ledger, state_rollback_received_send) ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.account_balance (transaction, key.pub)); ASSERT_EQ (0, ledger.weight (key.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); @@ -2182,12 +2182,12 @@ TEST (ledger, state_rep_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); ASSERT_FALSE (ledger.rollback (transaction, change1.hash ())); ASSERT_FALSE (store->block.exists (transaction, change1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); } @@ -2203,14 +2203,14 @@ TEST (ledger, state_open_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::state_block open1 (destination.pub, 0, nano::dev::genesis->account (), nano::Gxrb_ratio, send1.hash (), destination.prv, destination.pub, *pool.generate (destination.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); ASSERT_FALSE (ledger.rollback (transaction, open1.hash ())); ASSERT_FALSE (store->block.exists (transaction, open1.hash ())); ASSERT_EQ (0, ledger.account_balance (transaction, destination.pub)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); nano::pending_info info; ASSERT_FALSE (store->pending.get (transaction, nano::pending_key (destination.pub, send1.hash ()), info)); ASSERT_EQ (nano::dev::genesis->account (), info.source); @@ -2230,12 +2230,12 @@ TEST (ledger, state_send_change_rollback) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair rep; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), rep.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_FALSE (ledger.rollback (transaction, send1.hash ())); ASSERT_FALSE (store->block.exists (transaction, send1.hash ())); - ASSERT_EQ (nano::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2251,15 +2251,15 @@ TEST (ledger, state_receive_change_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); nano::keypair rep; - nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send1.hash (), rep.pub, nano::dev::genesis_amount, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (ledger.rollback (transaction, receive1.hash ())); ASSERT_FALSE (store->block.exists (transaction, receive1.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (0, ledger.weight (rep.pub)); ASSERT_EQ (store->account.count (transaction), ledger.cache.account_count); } @@ -2276,14 +2276,14 @@ TEST (ledger, epoch_blocks_v1_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_FALSE (epoch1.sideband ().details.is_send); ASSERT_FALSE (epoch1.sideband ().details.is_receive); ASSERT_TRUE (epoch1.sideband ().details.is_epoch); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch2).code); nano::account_info genesis_info; ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); @@ -2301,7 +2301,7 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (send1.sideband ().details.is_send); ASSERT_FALSE (send1.sideband ().details.is_receive); @@ -2328,7 +2328,7 @@ TEST (ledger, epoch_blocks_v1_general) ASSERT_EQ (0, ledger.balance (transaction, epoch4.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, receive2.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive2.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.weight (destination.pub)); ASSERT_FALSE (receive2.sideband ().details.is_send); ASSERT_TRUE (receive2.sideband ().details.is_receive); @@ -2347,19 +2347,19 @@ TEST (ledger, epoch_blocks_v2_general) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); // Trying to upgrade from epoch 0 to epoch 2. It is a requirement epoch upgrades are sequential unless the account is unopened ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch1).code); // Set it to the first epoch and it should now succeed - epoch1 = nano::state_block (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, epoch1.work); + epoch1 = nano::state_block (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, epoch1.work); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); ASSERT_EQ (nano::epoch::epoch_1, epoch1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch1.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); ASSERT_EQ (nano::epoch::epoch_2, epoch2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch2.sideband ().source_epoch); // Not used for epoch blocks - nano::state_block epoch3 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, epoch3).code); nano::account_info genesis_info; ASSERT_FALSE (ledger.store.account.get (transaction, nano::dev::genesis->account (), genesis_info)); @@ -2372,7 +2372,7 @@ TEST (ledger, epoch_blocks_v2_general) ASSERT_EQ (genesis_info.epoch (), nano::epoch::epoch_1); nano::change_block change1 (epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::block_position, ledger.process (transaction, change1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (nano::epoch::epoch_1, send1.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send1.sideband ().source_epoch); // Not used for send blocks @@ -2397,7 +2397,7 @@ TEST (ledger, epoch_blocks_v2_general) ASSERT_EQ (0, ledger.balance (transaction, epoch6.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.balance (transaction, receive2.hash ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.amount (transaction, receive2.hash ())); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.weight (nano::dev::genesis->account ())); ASSERT_EQ (nano::Gxrb_ratio, ledger.weight (destination.pub)); } @@ -2413,11 +2413,11 @@ TEST (ledger, epoch_blocks_receive_upgrade) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_EQ (nano::epoch::epoch_1, send2.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, send2.sideband ().source_epoch); // Not used for send blocks @@ -2454,14 +2454,14 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open2).code); // Upgrade to epoch 2 and send to destination. Try to create an open block from an epoch 2 source block. nano::keypair destination3; - nano::state_block epoch2 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch2).code); - nano::state_block send4 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); + nano::state_block send4 (nano::dev::genesis->account (), epoch2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 3, destination3.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send4).code); nano::open_block open3 (send4.hash (), destination3.pub, destination3.pub, destination3.prv, destination3.pub, *pool.generate (destination3.pub)); ASSERT_EQ (nano::process_result::unreceivable, ledger.process (transaction, open3).code); // Send it to an epoch 1 account - nano::state_block send5 (nano::dev::genesis->account (), send4.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send4.hash ())); + nano::state_block send5 (nano::dev::genesis->account (), send4.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 4, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send4.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send5).code); ASSERT_FALSE (ledger.store.account.get (transaction, destination.pub, destination_info)); ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_1); @@ -2473,7 +2473,7 @@ TEST (ledger, epoch_blocks_receive_upgrade) ASSERT_EQ (destination_info.epoch (), nano::epoch::epoch_2); // Upgrade an unopened account straight to epoch 2 nano::keypair destination4; - nano::state_block send6 (nano::dev::genesis->account (), send5.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send5.hash ())); + nano::state_block send6 (nano::dev::genesis->account (), send5.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 5, destination4.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send5.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send6).code); nano::state_block epoch4 (destination4.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (destination4.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch4).code); @@ -2494,17 +2494,17 @@ TEST (ledger, epoch_blocks_fork) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair destination; - nano::send_block send1 (genesis.hash (), nano::account (0), nano::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::account (0), nano::dev::genesis_amount, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch1).code); - nano::state_block epoch2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); - nano::state_block epoch3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch3 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch3).code); ASSERT_EQ (nano::epoch::epoch_1, epoch3.sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_0, epoch3.sideband ().source_epoch); // Not used for epoch state blocks - nano::state_block epoch4 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block epoch4 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_2), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::fork, ledger.process (transaction, epoch2).code); } @@ -2515,11 +2515,11 @@ TEST (ledger, successor_epoch) nano::keypair key1; nano::genesis genesis; nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), key1.pub, nano::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), key1.pub, nano::dev::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); nano::state_block open (key1.pub, 0, key1.pub, 1, send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); nano::state_block change (key1.pub, open.hash (), key1.pub, 1, 0, key1.prv, key1.pub, *pool.generate (open.hash ())); auto open_hash = open.hash (); - nano::send_block send2 (send1.hash (), reinterpret_cast (open_hash), nano::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), reinterpret_cast (open_hash), nano::dev::genesis_amount - 2, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); nano::state_block epoch_open (reinterpret_cast (open_hash), 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (open.hash ())); auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, send1).code); @@ -2565,7 +2565,7 @@ TEST (ledger, epoch_open_pending) .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (nano::dev::genesis->hash ())) @@ -2593,7 +2593,7 @@ TEST (ledger, block_hash_account_conflict) .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) @@ -2680,13 +2680,13 @@ TEST (ledger, could_fit) nano::keypair destination; // Test legacy and state change blocks could_fit nano::change_block change1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); - nano::state_block change2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block change2 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_TRUE (ledger.could_fit (transaction, change1)); ASSERT_TRUE (ledger.could_fit (transaction, change2)); // Test legacy and state send nano::keypair key1; - nano::send_block send1 (change1.hash (), key1.pub, nano::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), change1.hash (), nano::dev::genesis->account (), nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); + nano::send_block send1 (change1.hash (), key1.pub, nano::dev::genesis_amount - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), change1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_FALSE (ledger.could_fit (transaction, send1)); ASSERT_FALSE (ledger.could_fit (transaction, send2)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); @@ -2708,7 +2708,7 @@ TEST (ledger, could_fit) ASSERT_TRUE (ledger.could_fit (transaction, open1)); ASSERT_TRUE (ledger.could_fit (transaction, open2)); // Create another send to receive - nano::state_block send3 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 2, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block send3 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 2, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); // Test legacy and state receive nano::receive_block receive1 (open1.hash (), send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); nano::state_block receive2 (key1.pub, open1.hash (), nano::dev::genesis->account (), 2, send3.hash (), key1.prv, key1.pub, *pool.generate (open1.hash ())); @@ -2734,7 +2734,7 @@ TEST (ledger, unchecked_epoch) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2774,7 +2774,7 @@ TEST (ledger, unchecked_epoch_invalid) auto & node1 (*system.add_node (node_config)); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (destination.pub, 0, destination.pub, nano::Gxrb_ratio, send1->hash (), destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2826,7 +2826,7 @@ TEST (ledger, unchecked_open) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2863,9 +2863,9 @@ TEST (ledger, unchecked_receive) auto & node1 (*system.nodes[0]); nano::genesis genesis; nano::keypair destination; - auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send1 (std::make_shared (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send1); - auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); + auto send2 (std::make_shared (nano::dev::genesis->account (), send1->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0)); node1.work_generate_blocking (*send2); auto open1 (std::make_shared (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); node1.work_generate_blocking (*open1); @@ -2947,7 +2947,7 @@ TEST (ledger, zero_rep) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (0) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -2955,18 +2955,18 @@ TEST (ledger, zero_rep) auto transaction (node1.store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *block1).code); ASSERT_EQ (0, node1.ledger.cache.rep_weights.representation_get (nano::dev::genesis_key.pub)); - ASSERT_EQ (nano::genesis_amount, node1.ledger.cache.rep_weights.representation_get (0)); + ASSERT_EQ (nano::dev::genesis_amount, node1.ledger.cache.rep_weights.representation_get (0)); auto block2 = builder.state () .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (0) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) .build (); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, *block2).code); - ASSERT_EQ (nano::genesis_amount, node1.ledger.cache.rep_weights.representation_get (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, node1.ledger.cache.rep_weights.representation_get (nano::dev::genesis_key.pub)); ASSERT_EQ (0, node1.ledger.cache.rep_weights.representation_get (0)); } @@ -3002,7 +3002,7 @@ TEST (ledger, work_validation) auto send = *builder.send () .previous (nano::dev::genesis->hash ()) .destination (gen.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (gen.prv, gen.pub) .work (0) .build (ec); @@ -3028,7 +3028,7 @@ TEST (ledger, work_validation) .account (gen.pub) .previous (change.hash ()) .representative (gen.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (key.pub) .sign (gen.prv, gen.pub) .work (0) @@ -3081,7 +3081,7 @@ TEST (ledger, dependents_confirmed) .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) @@ -3092,7 +3092,7 @@ TEST (ledger, dependents_confirmed) .account (nano::dev::genesis->account ()) .previous (send1->hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 200) + .balance (nano::dev::genesis_amount - 200) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (send1->hash ())) @@ -3154,7 +3154,7 @@ TEST (ledger, dependents_confirmed_pruning) .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) @@ -3164,7 +3164,7 @@ TEST (ledger, dependents_confirmed_pruning) .account (nano::dev::genesis->account ()) .previous (send1->hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 200) + .balance (nano::dev::genesis_amount - 200) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (send1->hash ())) @@ -3206,7 +3206,7 @@ TEST (ledger, block_confirmed) .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (genesis.hash ())) @@ -3242,7 +3242,7 @@ TEST (ledger, cache) auto account_count = 1 + i; auto block_count = 1 + 2 * (i + 1) - 2; auto cemented_count = 1 + 2 * (i + 1) - 2; - auto genesis_weight = nano::genesis_amount - i; + auto genesis_weight = nano::dev::genesis_amount - i; auto pruned_count = i; auto cache_check = [&, i] (nano::ledger_cache const & cache_a) { @@ -3259,7 +3259,7 @@ TEST (ledger, cache) .account (nano::dev::genesis->account ()) .previous (latest) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - (i + 1)) + .balance (nano::dev::genesis_amount - (i + 1)) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (latest)) @@ -3346,14 +3346,14 @@ TEST (ledger, pruning_action) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); auto send1_stored (store->block.get (transaction, send1.hash ())); ASSERT_NE (nullptr, send1_stored); ASSERT_EQ (send1, *send1_stored); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3370,7 +3370,7 @@ TEST (ledger, pruning_action) ASSERT_TRUE (store->block.exists (transaction, genesis.hash ())); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Receiving pruned block - nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_TRUE (store->block.exists (transaction, receive1.hash ())); auto receive1_stored (store->block.get (transaction, receive1.hash ())); @@ -3407,10 +3407,10 @@ TEST (ledger, pruning_large_chain) auto last_hash (genesis.hash ()); for (auto i (0); i < send_receive_pairs; i++) { - nano::state_block send (nano::dev::genesis->account (), last_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (last_hash)); + nano::state_block send (nano::dev::genesis->account (), last_hash, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (last_hash)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_TRUE (store->block.exists (transaction, send.hash ())); - nano::state_block receive (nano::dev::genesis->account (), send.hash (), nano::dev::genesis->account (), nano::genesis_amount, send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); + nano::state_block receive (nano::dev::genesis->account (), send.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, send.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_TRUE (store->block.exists (transaction, receive.hash ())); last_hash = receive.hash (); @@ -3440,12 +3440,12 @@ TEST (ledger, pruning_source_rollback) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block epoch1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, ledger.epoch_link (nano::epoch::epoch_1), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch1).code); - nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), epoch1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (epoch1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3461,7 +3461,7 @@ TEST (ledger, pruning_source_rollback) ASSERT_EQ (nano::Gxrb_ratio, info.amount.number ()); ASSERT_EQ (nano::epoch::epoch_1, info.epoch); // Receiving pruned block - nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); + nano::state_block receive1 (nano::dev::genesis->account (), send2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); ASSERT_FALSE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); ASSERT_EQ (2, ledger.cache.pruned_count); @@ -3492,15 +3492,15 @@ TEST (ledger, pruning_source_rollback_legacy) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); nano::keypair key1; - nano::send_block send2 (send1.hash (), key1.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key1.pub, nano::dev::genesis_amount - 2 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (key1.pub, send2.hash ()))); - nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), nano::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); + nano::send_block send3 (send2.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - 3 * nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send3).code); ASSERT_TRUE (store->block.exists (transaction, send3.hash ())); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send3.hash ()))); @@ -3571,7 +3571,7 @@ TEST (ledger, pruning_process_error) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_EQ (0, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3582,7 +3582,7 @@ TEST (ledger, pruning_process_error) // Attempt to process pruned block again ASSERT_EQ (nano::process_result::old, ledger.process (transaction, send1).code); // Attept to process new block after pruned - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::gap_previous, ledger.process (transaction, send2).code); ASSERT_EQ (1, ledger.cache.pruned_count); ASSERT_EQ (2, ledger.cache.block_count); @@ -3601,14 +3601,14 @@ TEST (ledger, pruning_legacy_blocks) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::send_block send1 (genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->pending.exists (transaction, nano::pending_key (nano::dev::genesis->account (), send1.hash ()))); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive1).code); nano::change_block change1 (receive1.hash (), key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (receive1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change1).code); - nano::send_block send2 (change1.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); + nano::send_block send2 (change1.hash (), key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (change1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::open_block open1 (send2.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *pool.generate (key1.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open1).code); @@ -3646,10 +3646,10 @@ TEST (ledger, pruning_safe_functions) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3664,7 +3664,7 @@ TEST (ledger, pruning_safe_functions) ASSERT_EQ (0, ledger.balance_safe (transaction, send1.hash (), error)); ASSERT_TRUE (error); error = false; - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * 2, ledger.balance_safe (transaction, send2.hash (), error)); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio * 2, ledger.balance_safe (transaction, send2.hash (), error)); ASSERT_FALSE (error); error = false; ASSERT_EQ (0, ledger.amount_safe (transaction, send2.hash (), error)); @@ -3689,10 +3689,10 @@ TEST (ledger, hash_root_random) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); - nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); + nano::state_block send1 (nano::dev::genesis->account (), genesis.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); ASSERT_TRUE (store->block.exists (transaction, send1.hash ())); - nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); + nano::state_block send2 (nano::dev::genesis->account (), send1.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio * 2, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); ASSERT_TRUE (store->block.exists (transaction, send2.hash ())); // Pruning action @@ -3738,7 +3738,7 @@ TEST (ledger, migrate_lmdb_to_rocksdb) .previous (nano::dev::genesis->hash ()) .representative (0) .link (nano::account (10)) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -3824,7 +3824,7 @@ TEST (ledger, unconfirmed_frontiers) .account (nano::dev::genesis->account ()) .previous (latest) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*pool.generate (latest)) diff --git a/nano/core_test/network_filter.cpp b/nano/core_test/network_filter.cpp index 2e2c58bd..43ce1bfc 100644 --- a/nano/core_test/network_filter.cpp +++ b/nano/core_test/network_filter.cpp @@ -42,7 +42,7 @@ TEST (network_filter, unit) .account (nano::dev::genesis_key.pub) .previous (genesis.open->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 10 * nano::xrb_ratio) + .balance (nano::dev::genesis_amount - 10 * nano::xrb_ratio) .link (nano::public_key ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -72,7 +72,7 @@ TEST (network_filter, many) .account (nano::dev::genesis_key.pub) .previous (genesis.open->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - i * 10 * nano::xrb_ratio) + .balance (nano::dev::genesis_amount - i * 10 * nano::xrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp index 7d0647cd..640d895f 100644 --- a/nano/core_test/node.cpp +++ b/nano/core_test/node.cpp @@ -212,7 +212,7 @@ TEST (node, send_out_of_order) node1.process_active (send3); node1.process_active (send2); node1.process_active (send1); - ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return node_a->balance (nano::dev::genesis_key.pub) == nano::genesis_amount - node1.config.receive_minimum.number () * 3; })); + ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr const & node_a) { return node_a->balance (nano::dev::genesis_key.pub) == nano::dev::genesis_amount - node1.config.receive_minimum.number () * 3; })); } TEST (node, quick_confirm) @@ -247,7 +247,7 @@ TEST (node, node_receive_quorum) auto send = nano::send_block_builder () .previous (previous) .destination (key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) .build_shared (); @@ -1055,7 +1055,7 @@ TEST (node, fork_publish) auto send1 = builder.make_block () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); @@ -1064,7 +1064,7 @@ TEST (node, fork_publish) auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) .build_shared (); @@ -1085,7 +1085,7 @@ TEST (node, fork_publish) ASSERT_EQ (send1->hash (), existing1->second.hash); auto winner (*election->tally ().begin ()); ASSERT_EQ (*send1, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); } ASSERT_TRUE (node0.expired ()); } @@ -1101,14 +1101,14 @@ TEST (node, fork_publish_inactive) auto send1 = builder.make_block () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (send1->block_work ()) .build_shared (); @@ -1139,14 +1139,14 @@ TEST (node, fork_keep) auto send1 = builder.make_block () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1175,7 +1175,7 @@ TEST (node, fork_keep) // The vote should be in agreement with what we already have. auto winner (*election1->tally ().begin ()); ASSERT_EQ (*send1, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); ASSERT_TRUE (node1.store.block.exists (transaction0, send1->hash ())); ASSERT_TRUE (node2.store.block.exists (transaction1, send1->hash ())); } @@ -1192,7 +1192,7 @@ TEST (node, fork_flip) auto send1 = builder.make_block () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1201,7 +1201,7 @@ TEST (node, fork_flip) auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1229,7 +1229,7 @@ TEST (node, fork_flip) ASSERT_TIMELY (10s, node2.ledger.block_or_pruned_exists (publish1.block->hash ())); auto winner (*election1->tally ().begin ()); ASSERT_EQ (*publish1.block, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); ASSERT_TRUE (node1.ledger.block_or_pruned_exists (publish1.block->hash ())); ASSERT_TRUE (node2.ledger.block_or_pruned_exists (publish1.block->hash ())); ASSERT_FALSE (node2.ledger.block_or_pruned_exists (publish2.block->hash ())); @@ -1260,7 +1260,7 @@ TEST (node, fork_multi_flip) auto send1 = builder.make_block () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1269,7 +1269,7 @@ TEST (node, fork_multi_flip) auto send2 = builder.make_block () .previous (genesis.hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1277,7 +1277,7 @@ TEST (node, fork_multi_flip) auto send3 = builder.make_block () .previous (publish2.block->hash ()) .destination (key2.pub) - .balance (nano::genesis_amount - 100) + .balance (nano::dev::genesis_amount - 100) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (publish2.block->hash ())) .build_shared (); @@ -1306,7 +1306,7 @@ TEST (node, fork_multi_flip) ASSERT_TIMELY (10s, node2.ledger.block_or_pruned_exists (publish1.block->hash ())); auto winner (*election1->tally ().begin ()); ASSERT_EQ (*publish1.block, *winner.second); - ASSERT_EQ (nano::genesis_amount - 100, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 100, winner.first); ASSERT_TRUE (node1.ledger.block_or_pruned_exists (publish1.block->hash ())); ASSERT_TRUE (node2.ledger.block_or_pruned_exists (publish1.block->hash ())); ASSERT_FALSE (node2.ledger.block_or_pruned_exists (publish2.block->hash ())); @@ -1335,7 +1335,7 @@ TEST (node, fork_bootstrap_flip) auto send1 = builder.make_block () .previous (latest) .destination (key1.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system0.work.generate (latest)) .build_shared (); @@ -1343,7 +1343,7 @@ TEST (node, fork_bootstrap_flip) auto send2 = builder.make_block () .previous (latest) .destination (key2.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system0.work.generate (latest)) .build_shared (); @@ -1430,7 +1430,7 @@ TEST (node, fork_open_flip) auto send1 = nano::send_block_builder () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -1484,7 +1484,7 @@ TEST (node, fork_open_flip) auto transaction2 (node2.store.tx_begin_read ()); auto winner (*election1->tally ().begin ()); ASSERT_EQ (*open1, *winner.second); - ASSERT_EQ (nano::genesis_amount - 1, winner.first); + ASSERT_EQ (nano::dev::genesis_amount - 1, winner.first); ASSERT_TRUE (node1.store.block.exists (transaction1, open1->hash ())); ASSERT_TRUE (node2.store.block.exists (transaction2, open1->hash ())); ASSERT_FALSE (node2.store.block.exists (transaction2, open2->hash ())); @@ -1511,7 +1511,7 @@ TEST (node, fork_no_vote_quorum) auto & node3 (*system.nodes[2]); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto key4 (system.wallet (0)->deterministic_insert ()); - system.wallet (0)->send_action (nano::dev::genesis_key.pub, key4, nano::genesis_amount / 4); + system.wallet (0)->send_action (nano::dev::genesis_key.pub, key4, nano::dev::genesis_amount / 4); auto key1 (system.wallet (1)->deterministic_insert ()); { auto transaction (system.wallet (1)->wallets.tx_begin_write ()); @@ -1523,7 +1523,7 @@ TEST (node, fork_no_vote_quorum) ASSERT_EQ (node1.config.receive_minimum.number (), node1.weight (key1)); ASSERT_EQ (node1.config.receive_minimum.number (), node2.weight (key1)); ASSERT_EQ (node1.config.receive_minimum.number (), node3.weight (key1)); - nano::state_block send1 (nano::dev::genesis_key.pub, block->hash (), nano::dev::genesis_key.pub, (nano::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2), key1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (block->hash ())); + nano::state_block send1 (nano::dev::genesis_key.pub, block->hash (), nano::dev::genesis_key.pub, (nano::dev::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2), key1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (block->hash ())); ASSERT_EQ (nano::process_result::progress, node1.process (send1).code); ASSERT_EQ (nano::process_result::progress, node2.process (send1).code); ASSERT_EQ (nano::process_result::progress, node3.process (send1).code); @@ -1531,7 +1531,7 @@ TEST (node, fork_no_vote_quorum) auto send2 = nano::send_block_builder () .previous (block->hash ()) .destination (key2) - .balance ((nano::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2)) + .balance ((nano::dev::genesis_amount / 4) - (node1.config.receive_minimum.number () * 2)) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block->hash ())) .build_shared (); @@ -1575,10 +1575,10 @@ TEST (node, DISABLED_fork_pre_confirm) auto transaction (system.wallet (2)->wallets.tx_begin_write ()); system.wallet (2)->store.representative_set (transaction, key2.pub); } - auto block0 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::genesis_amount / 3)); + auto block0 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::dev::genesis_amount / 3)); ASSERT_NE (nullptr, block0); ASSERT_TIMELY (30s, node0.balance (key1.pub) != 0); - auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, nano::genesis_amount / 3)); + auto block1 (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, nano::dev::genesis_amount / 3)); ASSERT_NE (nullptr, block1); ASSERT_TIMELY (30s, node0.balance (key2.pub) != 0); nano::keypair key3; @@ -1638,7 +1638,7 @@ TEST (node, DISABLED_fork_stale) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Mxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Mxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -1655,7 +1655,7 @@ TEST (node, DISABLED_fork_stale) .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Mxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Mxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -1665,7 +1665,7 @@ TEST (node, DISABLED_fork_stale) .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Mxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Mxrb_ratio) .link (key2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (0) @@ -1964,7 +1964,7 @@ TEST (node, bootstrap_fork_open) auto send0 = *builder.send () .previous (nano::dev::genesis->hash ()) .destination (key0.pub) - .balance (nano::genesis_amount - 500) + .balance (nano::dev::genesis_amount - 500) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build (); @@ -2020,7 +2020,7 @@ TEST (node, bootstrap_confirm_frontiers) auto send0 = nano::send_block_builder () .previous (nano::dev::genesis->hash ()) .destination (key0.pub) - .balance (nano::genesis_amount - 500) + .balance (nano::dev::genesis_amount - 500) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node0->work_generate_blocking (nano::dev::genesis->hash ())) .build_shared (); @@ -2082,7 +2082,7 @@ TEST (node, DISABLED_unconfirmed_send) ASSERT_EQ (nano::process_result::progress, node1.ledger.process (transaction, send2).code); } auto send3 (wallet1->send_action (key0.pub, nano::dev::genesis->account (), nano::Mxrb_ratio)); - ASSERT_TIMELY (10s, node0.balance (nano::dev::genesis->account ()) == nano::genesis_amount); + ASSERT_TIMELY (10s, node0.balance (nano::dev::genesis->account ()) == nano::dev::genesis_amount); } // Test that nodes can track nodes that have rep weight for priority broadcasting @@ -2138,7 +2138,7 @@ TEST (node, rep_weight) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - amount_not_pr) + .balance (nano::dev::genesis_amount - amount_not_pr) .link (keypair1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -2158,7 +2158,7 @@ TEST (node, rep_weight) .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - amount_not_pr - amount_pr) + .balance (nano::dev::genesis_amount - amount_not_pr - amount_pr) .link (keypair2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) @@ -2220,7 +2220,7 @@ TEST (node, rep_remove) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - node.minimum_principal_weight () * 2) + .balance (nano::dev::genesis_amount - node.minimum_principal_weight () * 2) .link (keypair1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -2240,7 +2240,7 @@ TEST (node, rep_remove) .account (nano::dev::genesis_key.pub) .previous (block1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - node.minimum_principal_weight () * 4) + .balance (nano::dev::genesis_amount - node.minimum_principal_weight () * 4) .link (keypair2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (block1->hash ())) @@ -2477,11 +2477,11 @@ TEST (node, online_reps) auto vote (std::make_shared ()); ASSERT_EQ (0, node1.online_reps.online ()); node1.online_reps.observe (nano::dev::genesis_key.pub); - ASSERT_EQ (nano::genesis_amount, node1.online_reps.online ()); + ASSERT_EQ (nano::dev::genesis_amount, node1.online_reps.online ()); // 1 minimum, 1 maximum ASSERT_EQ (node1.config.online_weight_minimum, node1.online_reps.trended ()); node1.online_reps.sample (); - ASSERT_EQ (nano::genesis_amount, node1.online_reps.trended ()); + ASSERT_EQ (nano::dev::genesis_amount, node1.online_reps.trended ()); node1.online_reps.clear (); // 2 minimum, 1 maximum node1.online_reps.sample (); @@ -2507,7 +2507,7 @@ TEST (node, online_reps_rep_crawler) node1.rep_crawler.active.insert (nano::dev::genesis->hash ()); } node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); - ASSERT_EQ (nano::genesis_amount, node1.online_reps.online ()); + ASSERT_EQ (nano::dev::genesis_amount, node1.online_reps.online ()); } } @@ -2525,7 +2525,7 @@ TEST (node, online_reps_election) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) @@ -2538,7 +2538,7 @@ TEST (node, online_reps_election) auto vote = std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::milliseconds_since_epoch (), std::vector{ send1->hash () }); ASSERT_EQ (0, node1.online_reps.online ()); node1.vote_processor.vote_blocking (vote, std::make_shared (node1)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, node1.online_reps.online ()); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, node1.online_reps.online ()); } TEST (node, block_confirm) @@ -2564,7 +2564,7 @@ TEST (node, block_confirm) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) @@ -2665,7 +2665,7 @@ TEST (node, local_votes_cache) nano::system system; nano::node_config node_config (nano::get_available_port (), system.logging); node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; - node_config.receive_minimum = nano::genesis_amount; + node_config.receive_minimum = nano::dev::genesis_amount; auto & node (*system.add_node (node_config)); nano::genesis genesis; nano::state_block_builder builder; @@ -2673,7 +2673,7 @@ TEST (node, local_votes_cache) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -2682,7 +2682,7 @@ TEST (node, local_votes_cache) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -2691,7 +2691,7 @@ TEST (node, local_votes_cache) .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 3 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) @@ -2760,7 +2760,7 @@ TEST (node, local_votes_cache_batch) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -2772,7 +2772,7 @@ TEST (node, local_votes_cache_batch) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -2838,7 +2838,7 @@ TEST (node, local_votes_cache_generate_new_vote) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -2878,7 +2878,7 @@ TEST (node, local_votes_cache_fork) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) @@ -2887,7 +2887,7 @@ TEST (node, local_votes_cache_fork) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (genesis.hash ())) @@ -2959,7 +2959,7 @@ TEST (node, vote_by_hash_bundle) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -2971,7 +2971,7 @@ TEST (node, vote_by_hash_bundle) auto block = builder.make_block () .from (*blocks.back ()) .previous (blocks.back ()->hash ()) - .balance (nano::genesis_amount - i) + .balance (nano::dev::genesis_amount - i) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (blocks.back ()->hash ())) .build_shared (); @@ -3062,7 +3062,7 @@ TEST (node, vote_by_hash_epoch_block_republish) .account (nano::dev::genesis->account ()) .previous (genesis.hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .link (node1.ledger.epoch_link (nano::epoch::epoch_1)) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -3098,7 +3098,7 @@ TEST (node, epoch_conflict_confirm) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) @@ -3125,7 +3125,7 @@ TEST (node, epoch_conflict_confirm) .account (nano::dev::genesis_key.pub) .previous (send->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .link (open->hash ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (send->hash ())) @@ -3232,7 +3232,7 @@ TEST (node, fork_election_invalid_block_signature) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -3241,7 +3241,7 @@ TEST (node, fork_election_invalid_block_signature) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -3250,7 +3250,7 @@ TEST (node, fork_election_invalid_block_signature) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .sign (nano::dev::genesis_key.prv, 0) // Invalid signature @@ -3281,7 +3281,7 @@ TEST (node, block_processor_signatures) .account (nano::dev::genesis_key.pub) .previous (latest) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (latest)) @@ -3290,7 +3290,7 @@ TEST (node, block_processor_signatures) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key2.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send1->hash ())) @@ -3299,7 +3299,7 @@ TEST (node, block_processor_signatures) .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 3 * nano::Gxrb_ratio) .link (key3.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send2->hash ())) @@ -3309,7 +3309,7 @@ TEST (node, block_processor_signatures) .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 4 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 4 * nano::Gxrb_ratio) .link (key3.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send3->hash ())) @@ -3320,7 +3320,7 @@ TEST (node, block_processor_signatures) .account (nano::dev::genesis_key.pub) .previous (send3->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 5 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 5 * nano::Gxrb_ratio) .link (key3.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1.work_generate_blocking (send3->hash ())) @@ -3394,7 +3394,7 @@ TEST (node, block_processor_reject_state) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -3409,7 +3409,7 @@ TEST (node, block_processor_reject_state) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -3433,7 +3433,7 @@ TEST (node, block_processor_full) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -3442,7 +3442,7 @@ TEST (node, block_processor_full) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -3451,7 +3451,7 @@ TEST (node, block_processor_full) .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 3 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) @@ -3480,7 +3480,7 @@ TEST (node, block_processor_half_full) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -3489,7 +3489,7 @@ TEST (node, block_processor_half_full) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -3498,7 +3498,7 @@ TEST (node, block_processor_half_full) .account (nano::dev::genesis_key.pub) .previous (send2->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 3 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 3 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send2->hash ())) @@ -3783,7 +3783,7 @@ TEST (node, bidirectional_tcp) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (genesis.hash ())) @@ -3817,7 +3817,7 @@ TEST (node, bidirectional_tcp) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node1->work_generate_blocking (send1->hash ())) @@ -3877,7 +3877,7 @@ TEST (node, aggressive_flooding) ASSERT_TIMELY (10s, std::all_of (nodes_wallets.begin (), nodes_wallets.end (), [] (auto const & node_wallet) { return node_wallet.first->rep_crawler.principal_representatives ().size () != 0; })); // Send a large amount to create a principal representative in each node - auto large_amount = (nano::genesis_amount / 2) / nodes_wallets.size (); + auto large_amount = (nano::dev::genesis_amount / 2) / nodes_wallets.size (); std::vector> genesis_blocks; for (auto & node_wallet : nodes_wallets) { @@ -3977,7 +3977,7 @@ TEST (node, rollback_vote_self) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - weight) + .balance (nano::dev::genesis_amount - weight) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -4066,7 +4066,7 @@ TEST (node, rollback_gap_source) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -4163,7 +4163,7 @@ TEST (node, dependency_graph) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key1.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -4192,7 +4192,7 @@ TEST (node, dependency_graph) .from (*gen_send1) .previous (gen_send1->hash ()) .link (key1_send1->hash ()) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_send1->hash ())) .build (); @@ -4365,7 +4365,7 @@ TEST (node, dependency_graph_frontier) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key1.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -4394,7 +4394,7 @@ TEST (node, dependency_graph_frontier) .from (*gen_send1) .previous (gen_send1->hash ()) .link (key1_send1->hash ()) - .balance (nano::genesis_amount) + .balance (nano::dev::genesis_amount) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (gen_send1->hash ())) .build (); @@ -4528,7 +4528,7 @@ TEST (node, deferred_dependent_elections) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) .link (key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) .build_shared (); @@ -4703,7 +4703,7 @@ TEST (node, pruning_automatic) auto send1 = nano::send_block_builder () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -4756,7 +4756,7 @@ TEST (node, pruning_age) auto send1 = nano::send_block_builder () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); @@ -4813,7 +4813,7 @@ TEST (node, pruning_depth) auto send1 = nano::send_block_builder () .previous (genesis.hash ()) .destination (key1.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) .build_shared (); diff --git a/nano/core_test/request_aggregator.cpp b/nano/core_test/request_aggregator.cpp index 421e8a11..664ddd6a 100644 --- a/nano/core_test/request_aggregator.cpp +++ b/nano/core_test/request_aggregator.cpp @@ -15,7 +15,7 @@ TEST (request_aggregator, one) auto & node (*system.add_node (node_config)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); auto channel (node.network.udp_channels.create (node.network.endpoint ())); @@ -56,7 +56,7 @@ TEST (request_aggregator, one_update) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -69,7 +69,7 @@ TEST (request_aggregator, one_update) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -123,7 +123,7 @@ TEST (request_aggregator, two) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (key1.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (genesis.hash ())) @@ -135,7 +135,7 @@ TEST (request_aggregator, two) .account (nano::dev::genesis_key.pub) .previous (send1->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2) + .balance (nano::dev::genesis_amount - 2) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*node.work_generate_blocking (send1->hash ())) @@ -194,7 +194,7 @@ TEST (request_aggregator, two_endpoints) auto & node2 (*system.add_node (node_config, node_flags)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 1, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1.work_generate_blocking (genesis.hash ()))); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (node1.store.tx_begin_write (), *send1).code); @@ -238,7 +238,7 @@ TEST (request_aggregator, split) .account (nano::dev::genesis_key.pub) .previous (previous) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - (i + 1)) + .balance (nano::dev::genesis_amount - (i + 1)) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) @@ -280,7 +280,7 @@ TEST (request_aggregator, channel_lifetime) auto & node (*system.add_node (node_config)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -301,7 +301,7 @@ TEST (request_aggregator, channel_update) auto & node (*system.add_node (node_config)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -330,7 +330,7 @@ TEST (request_aggregator, channel_max_queue) auto & node (*system.add_node (node_config)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -348,7 +348,7 @@ TEST (request_aggregator, unique) auto & node (*system.add_node (node_config)); nano::genesis genesis; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); std::vector> request; request.emplace_back (send1->hash (), send1->root ()); @@ -377,7 +377,7 @@ TEST (request_aggregator, cannot_vote) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp index 032e0030..446e185f 100644 --- a/nano/core_test/system.cpp +++ b/nano/core_test/system.cpp @@ -29,7 +29,7 @@ TEST (system, system_genesis) for (auto & i : system.nodes) { auto transaction (i->store.tx_begin_read ()); - ASSERT_EQ (nano::genesis_amount, i->ledger.account_balance (transaction, nano::dev::genesis->account ())); + ASSERT_EQ (nano::dev::genesis_amount, i->ledger.account_balance (transaction, nano::dev::genesis->account ())); } } @@ -40,7 +40,7 @@ TEST (system, DISABLED_generate_send_existing) nano::thread_runner runner (system.io_ctx, node1.config.io_threads); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair stake_preserver; - auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::dev::genesis_amount / 3 * 2, true)); nano::account_info info1; { auto transaction (node1.store.tx_begin_read ()); @@ -71,7 +71,7 @@ TEST (system, DISABLED_generate_send_existing) ASSERT_FALSE (node1.store.account.get (transaction, nano::dev::genesis_key.pub, info2)); } ASSERT_EQ (info1.block_count + 2, info2.block_count); - ASSERT_EQ (info2.balance, nano::genesis_amount / 3); + ASSERT_EQ (info2.balance, nano::dev::genesis_amount / 3); { auto transaction (node1.store.tx_begin_read ()); ASSERT_NE (node1.ledger.amount (transaction, info2.head), 0); @@ -94,7 +94,7 @@ TEST (system, DISABLED_generate_send_new) ASSERT_EQ (node1.store.account.end (), iterator1); } nano::keypair stake_preserver; - auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::genesis_amount / 3 * 2, true)); + auto send_block (system.wallet (0)->send_action (nano::dev::genesis->account (), stake_preserver.pub, nano::dev::genesis_amount / 3 * 2, true)); { auto transaction (node1.store.tx_begin_write ()); auto open_block (std::make_shared (send_block->hash (), nano::dev::genesis->account (), stake_preserver.pub, stake_preserver.prv, stake_preserver.pub, 0)); @@ -136,7 +136,7 @@ TEST (system, rep_initialize_one) nano::keypair key; system.ledger_initialization_set ({ key }); auto node = system.add_node (); - ASSERT_EQ (nano::genesis_amount, node->balance (key.pub)); + ASSERT_EQ (nano::dev::genesis_amount, node->balance (key.pub)); } TEST (system, rep_initialize_two) @@ -146,8 +146,8 @@ TEST (system, rep_initialize_two) nano::keypair key1; system.ledger_initialization_set ({ key0, key1 }); auto node = system.add_node (); - ASSERT_EQ (nano::genesis_amount / 2, node->balance (key0.pub)); - ASSERT_EQ (nano::genesis_amount / 2, node->balance (key1.pub)); + ASSERT_EQ (nano::dev::genesis_amount / 2, node->balance (key0.pub)); + ASSERT_EQ (nano::dev::genesis_amount / 2, node->balance (key1.pub)); } TEST (system, rep_initialize_one_reserve) @@ -156,7 +156,7 @@ TEST (system, rep_initialize_one_reserve) nano::keypair key; system.ledger_initialization_set ({ key }, nano::Gxrb_ratio); auto node = system.add_node (); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio, node->balance (key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio, node->balance (key.pub)); ASSERT_EQ (nano::Gxrb_ratio, node->balance (nano::dev::genesis_key.pub)); } @@ -167,8 +167,8 @@ TEST (system, rep_initialize_two_reserve) nano::keypair key1; system.ledger_initialization_set ({ key0, key1 }, nano::Gxrb_ratio); auto node = system.add_node (); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node->balance (key0.pub)); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node->balance (key1.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node->balance (key0.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node->balance (key1.pub)); } TEST (system, rep_initialize_many) @@ -178,9 +178,9 @@ TEST (system, rep_initialize_many) nano::keypair key1; system.ledger_initialization_set ({ key0, key1 }, nano::Gxrb_ratio); auto node0 = system.add_node (); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node0->balance (key0.pub)); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node0->balance (key1.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node0->balance (key0.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node0->balance (key1.pub)); auto node1 = system.add_node (); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node1->balance (key0.pub)); - ASSERT_EQ ((nano::genesis_amount - nano::Gxrb_ratio) / 2, node1->balance (key1.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node1->balance (key0.pub)); + ASSERT_EQ ((nano::dev::genesis_amount - nano::Gxrb_ratio) / 2, node1->balance (key1.pub)); } diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp index 801029c5..b89f7e94 100644 --- a/nano/core_test/vote_processor.cpp +++ b/nano/core_test/vote_processor.cpp @@ -28,7 +28,7 @@ TEST (vote_processor, codes) ASSERT_EQ (nano::vote_code::indeterminate, node.vote_processor.vote_blocking (vote, channel)); // First vote from an account for an ongoing election - genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::dev::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); ASSERT_NE (nullptr, node.active.election (genesis.open->qualified_root ())); ASSERT_EQ (nano::vote_code::vote, node.vote_processor.vote_blocking (vote, channel)); @@ -78,7 +78,7 @@ TEST (vote_processor, invalid_signature) vote_invalid->signature.bytes[0] ^= 1; auto channel = std::make_shared (node); - genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.open->sideband_set (nano::block_sideband (nano::dev::genesis->account (), 0, nano::dev::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); node.block_confirm (genesis.open); auto election = node.active.election (genesis.open->qualified_root ()); ASSERT_TRUE (election); @@ -262,14 +262,14 @@ TEST (vote_processor, no_broadcast_local) .account (key.pub) .representative (nano::dev::genesis_key.pub) .previous (0) - .balance (nano::genesis_amount - 2 * node.config.vote_minimum.number ()) + .balance (nano::dev::genesis_amount - 2 * node.config.vote_minimum.number ()) .link (send->hash ()) .sign (key.prv, key.pub) .work (*system.work.generate (key.pub)) .build (ec); ASSERT_FALSE (ec); ASSERT_EQ (nano::process_result::progress, node.process_local (open).code); - ASSERT_EQ (nano::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::dev::genesis_key.pub)); node.block_confirm (open); // Insert account in wallet system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp index 6cb610ba..be228424 100644 --- a/nano/core_test/voting.cpp +++ b/nano/core_test/voting.cpp @@ -168,7 +168,7 @@ TEST (vote_spacing, vote_generator) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -177,7 +177,7 @@ TEST (vote_spacing, vote_generator) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -211,7 +211,7 @@ TEST (vote_spacing, rapid) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -220,7 +220,7 @@ TEST (vote_spacing, rapid) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio - 1) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp index 5188d766..ec504d7d 100644 --- a/nano/core_test/wallet.cpp +++ b/nano/core_test/wallet.cpp @@ -169,7 +169,7 @@ TEST (wallet, insufficient_spend_one) system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, 500)); ASSERT_NE (nullptr, block); - ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::genesis_amount)); + ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key1.pub, nano::dev::genesis_amount)); } TEST (wallet, spend_all_one) @@ -837,7 +837,7 @@ TEST (wallet, send_race) for (auto i (1); i < 60; ++i) { ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, nano::Gxrb_ratio)); - ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::dev::genesis_key.pub)); + ASSERT_EQ (nano::dev::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::dev::genesis_key.pub)); } } @@ -1166,7 +1166,7 @@ TEST (wallet, search_pending) .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - node.config.receive_minimum.number ()) + .balance (nano::dev::genesis_amount - node.config.receive_minimum.number ()) .link (nano::dev::genesis->account ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -1193,7 +1193,7 @@ TEST (wallet, search_pending) // Pending search should create the receive block ASSERT_EQ (2, node.ledger.cache.block_count); ASSERT_FALSE (wallet.search_pending (wallet.wallets.tx_begin_read ())); - ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::genesis_amount); + ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::dev::genesis_amount); auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::dev::genesis->account ()); auto receive = node.block (receive_hash); ASSERT_NE (nullptr, receive); diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp index 47f205e4..e7703f99 100644 --- a/nano/core_test/wallets.cpp +++ b/nano/core_test/wallets.cpp @@ -169,7 +169,7 @@ TEST (wallets, search_pending) .account (nano::dev::genesis->account ()) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis->account ()) - .balance (nano::genesis_amount - node.config.receive_minimum.number ()) + .balance (nano::dev::genesis_amount - node.config.receive_minimum.number ()) .link (nano::dev::genesis->account ()) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -210,7 +210,7 @@ TEST (wallets, search_pending) { node.wallets.search_pending (wallet_id); } - ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::genesis_amount); + ASSERT_TIMELY (3s, node.balance (nano::dev::genesis->account ()) == nano::dev::genesis_amount); auto receive_hash = node.ledger.latest (node.store.tx_begin_read (), nano::dev::genesis->account ()); auto receive = node.block (receive_hash); ASSERT_NE (nullptr, receive); diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp index b76e3487..90970b34 100644 --- a/nano/core_test/websocket.cpp +++ b/nano/core_test/websocket.cpp @@ -83,7 +83,7 @@ TEST (websocket, confirmation) nano::keypair key; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); - auto balance = nano::genesis_amount; + auto balance = nano::dev::genesis_amount; auto send_amount = node1->online_reps.delta () + 1; // Quick-confirm a block, legacy blocks should work without filtering { @@ -186,7 +186,7 @@ TEST (websocket, confirmation_options) // Confirm a state block for an in-wallet account system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto balance = nano::genesis_amount; + auto balance = nano::dev::genesis_amount; auto send_amount = node1->online_reps.delta () + 1; nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); { @@ -320,7 +320,7 @@ TEST (websocket, confirmation_options_votes) // Confirm a state block for an in-wallet account system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::keypair key; - auto balance = nano::genesis_amount; + auto balance = nano::dev::genesis_amount; auto send_amount = node1->config.online_weight_minimum.number () + 1; nano::block_hash previous (node1->latest (nano::dev::genesis_key.pub)); { @@ -430,7 +430,7 @@ TEST (websocket, confirmation_options_update) .account (nano::dev::genesis_key.pub) .previous (previous) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) @@ -448,7 +448,7 @@ TEST (websocket, confirmation_options_update) .account (nano::dev::genesis_key.pub) .previous (previous) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) + .balance (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) @@ -490,7 +490,7 @@ TEST (websocket, vote) .account (nano::dev::genesis_key.pub) .previous (previous) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - (node1->online_reps.delta () + 1)) + .balance (nano::dev::genesis_amount - (node1->online_reps.delta () + 1)) .link (key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (previous)) @@ -582,7 +582,7 @@ TEST (websocket, vote_options_representatives) // Quick-confirm a block nano::keypair key; - auto balance = nano::genesis_amount; + auto balance = nano::dev::genesis_amount; system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto send_amount = node1->online_reps.delta () + 1; auto confirm_block = [&] () { @@ -918,7 +918,7 @@ TEST (websocket, new_unconfirmed_block) .account (nano::dev::genesis_key.pub) .previous (genesis.hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (genesis.hash ())) diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index f12fcd83..2aa78405 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -1042,7 +1042,7 @@ void nano::json_handler::available_supply () auto landing_balance (node.balance (nano::account ("059F68AAB29DE0D3A27443625C7EA9CDDB6517A8B76FE37727EF6A4D76832AD5"))); // Active unavailable account auto faucet_balance (node.balance (nano::account ("8E319CE6F3025E5B2DF66DA7AB1467FE48F1679C13DD43BFDB29FA2E9FC40D3B"))); // Faucet account auto burned_balance ((node.balance_pending (nano::account (0), false)).second); // Burning 0 account - auto available (node.network_params.ledger.genesis_amount - genesis_balance - landing_balance - faucet_balance - burned_balance); + auto available (nano::dev::genesis_amount - genesis_balance - landing_balance - faucet_balance - burned_balance); response_l.put ("available", available.convert_to ()); response_errors (); } @@ -2332,7 +2332,7 @@ public: else { tree.put ("account", network_params.ledger.genesis_account ().to_account ()); - tree.put ("amount", network_params.ledger.genesis_amount.convert_to ()); + tree.put ("amount", nano::dev::genesis_amount.convert_to ()); } } void change_block (nano::change_block const & block_a) @@ -3260,7 +3260,7 @@ void nano::json_handler::receive () bool generate_work (work == 0); // Disable work generation if "work" option is provided auto response_a (response); wallet->receive_async ( - hash, representative, node.network_params.ledger.genesis_amount, account, [response_a] (std::shared_ptr const & block_a) { + hash, representative, nano::dev::genesis_amount, account, [response_a] (std::shared_ptr const & block_a) { if (block_a != nullptr) { boost::property_tree::ptree response_l; diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 9b9ac0d7..c28a3e57 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1331,7 +1331,7 @@ void nano::node::process_confirmed_data (nano::transaction const & transaction_a } else { - amount_a = ledger.network_params.ledger.genesis_amount; + amount_a = nano::dev::genesis_amount; } if (auto state = dynamic_cast (block_a.get ())) { diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index c51436d4..e1caab3e 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -557,7 +557,7 @@ public: else { account = params.ledger.genesis_account (); - amount = params.ledger.genesis_amount; + amount = nano::dev::genesis_amount; } } void change_block (nano::change_block const & block_a) diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp index 3a5a41e0..511cdf8f 100644 --- a/nano/qt_test/qt.cpp +++ b/nano/qt_test/qt.cpp @@ -562,9 +562,9 @@ TEST (history, pruned_source) auto transaction (store->tx_begin_write ()); store->initialize (transaction, ledger.cache); auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); - nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send1 (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send1).code); - nano::send_block send2 (send1.hash (), key.pub, nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); + nano::send_block send2 (send1.hash (), key.pub, nano::dev::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send2).code); nano::receive_block receive (send2.hash (), send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); @@ -592,7 +592,7 @@ TEST (history, pruned_source) { auto transaction (store->tx_begin_write ()); auto latest (ledger.latest (transaction, nano::dev::genesis_key.pub)); - nano::state_block send (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::genesis_amount - 200, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::state_block send (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 200, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); auto latest_key (ledger.latest (transaction, key.pub)); nano::state_block receive (key.pub, latest_key, key.pub, 200, send.hash (), key.prv, key.pub, *system.work.generate (latest_key)); diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 1ea83c1f..725e8749 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -236,7 +236,7 @@ TEST (rpc, account_balance) .account (nano::dev::genesis_key.pub) .previous (nano::dev::genesis->hash ()) .representative (nano::dev::genesis_key.pub) - .balance (nano::genesis_amount - 1) + .balance (nano::dev::genesis_amount - 1) .link (nano::dev::genesis_key.pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) .work (*system.work.generate (nano::dev::genesis->hash ())) @@ -400,14 +400,14 @@ TEST (rpc, send) request.put ("source", nano::dev::genesis_key.pub.to_account ()); request.put ("destination", nano::dev::genesis_key.pub.to_account ()); request.put ("amount", "100"); - ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::dev::genesis_amount); auto response (wait_response (system, rpc, request, 10s)); std::string block_text (response.get ("block")); nano::block_hash block; ASSERT_FALSE (block.decode_hex (block_text)); ASSERT_TRUE (node->ledger.block_or_pruned_exists (block)); ASSERT_EQ (node->latest (nano::dev::genesis_key.pub), block); - ASSERT_NE (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount); + ASSERT_NE (node->balance (nano::dev::genesis_key.pub), nano::dev::genesis_amount); } TEST (rpc, send_fail) @@ -487,18 +487,18 @@ TEST (rpc, send_idempotent) request.put ("action", "send"); request.put ("source", nano::dev::genesis_key.pub.to_account ()); request.put ("destination", nano::account (0).to_account ()); - request.put ("amount", (nano::genesis_amount - (nano::genesis_amount / 4)).convert_to ()); + request.put ("amount", (nano::dev::genesis_amount - (nano::dev::genesis_amount / 4)).convert_to ()); request.put ("id", "123abc"); auto response (wait_response (system, rpc, request)); std::string block_text (response.get ("block")); nano::block_hash block; ASSERT_FALSE (block.decode_hex (block_text)); ASSERT_TRUE (node->ledger.block_or_pruned_exists (block)); - ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount / 4); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::dev::genesis_amount / 4); auto response2 (wait_response (system, rpc, request)); ASSERT_EQ ("", response2.get ("error", "")); ASSERT_EQ (block_text, response2.get ("block")); - ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::genesis_amount / 4); + ASSERT_EQ (node->balance (nano::dev::genesis_key.pub), nano::dev::genesis_amount / 4); request.erase ("id"); request.put ("id", "456def"); auto response3 (wait_response (system, rpc, request)); @@ -1086,9 +1086,9 @@ TEST (rpc, history) auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); - nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1127,7 +1127,7 @@ TEST (rpc, history) ASSERT_EQ (send->hash ().to_string (), std::get<3> (history_l[3])); ASSERT_EQ ("receive", std::get<0> (history_l[4])); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[4])); - ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[4])); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), std::get<2> (history_l[4])); ASSERT_EQ (genesis.hash ().to_string (), std::get<3> (history_l[4])); } @@ -1143,9 +1143,9 @@ TEST (rpc, account_history) auto receive (system.wallet (0)->receive_action (send->hash (), nano::dev::genesis_key.pub, node0->config.receive_minimum.number (), send->link ().as_account ())); ASSERT_NE (nullptr, receive); nano::genesis genesis; - nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); - nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); - nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); + nano::state_block usend (nano::dev::genesis->account (), node0->latest (nano::dev::genesis->account ()), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (node0->latest (nano::dev::genesis->account ()))); + nano::state_block ureceive (nano::dev::genesis->account (), usend.hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, usend.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend.hash ())); + nano::state_block uchange (nano::dev::genesis->account (), ureceive.hash (), nano::keypair ().pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive.hash ())); { auto transaction (node0->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node0->ledger.process (transaction, usend).code); @@ -1189,7 +1189,7 @@ TEST (rpc, account_history) ASSERT_EQ ("3", std::get<4> (history_l[3])); ASSERT_EQ ("receive", std::get<0> (history_l[4])); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[4])); - ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[4])); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), std::get<2> (history_l[4])); ASSERT_EQ (genesis.hash ().to_string (), std::get<3> (history_l[4])); ASSERT_EQ ("1", std::get<4> (history_l[4])); // change block (height 2) is skipped } @@ -1279,13 +1279,13 @@ TEST (rpc, history_pruning) nano::genesis genesis; auto change (std::make_shared (genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (genesis.hash ()))); node0->process_active (change); - auto send (std::make_shared (change->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - node0->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (change->hash ()))); + auto send (std::make_shared (change->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - node0->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (change->hash ()))); node0->process_active (send); auto receive (std::make_shared (send->hash (), send->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work.generate (send->hash ()))); node0->process_active (receive); - auto usend (std::make_shared (nano::dev::genesis->account (), receive->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); - auto ureceive (std::make_shared (nano::dev::genesis->account (), usend->hash (), nano::dev::genesis->account (), nano::genesis_amount, usend->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); - auto uchange (std::make_shared (nano::dev::genesis->account (), ureceive->hash (), nano::keypair ().pub, nano::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); + auto usend (std::make_shared (nano::dev::genesis->account (), receive->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis->account (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (receive->hash ()))); + auto ureceive (std::make_shared (nano::dev::genesis->account (), usend->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount, usend->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (usend->hash ()))); + auto uchange (std::make_shared (nano::dev::genesis->account (), ureceive->hash (), nano::keypair ().pub, nano::dev::genesis_amount, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node0->work_generate_blocking (ureceive->hash ()))); node0->process_active (usend); node0->process_active (ureceive); node0->process_active (uchange); @@ -1490,7 +1490,7 @@ TEST (rpc, process_block_async) ASSERT_EQ (ec.message (), response.get ("error")); } - auto state_send (std::make_shared (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::genesis_amount - 100, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); + auto state_send (std::make_shared (nano::dev::genesis_key.pub, latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 100, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest))); std::string json1; state_send->serialize_json (json1); request.put ("block", json1); @@ -1546,7 +1546,7 @@ TEST (rpc, process_subtype_send) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::keypair key; auto latest (node1->latest (nano::dev::genesis_key.pub)); - nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1572,7 +1572,7 @@ TEST (rpc, process_subtype_open) auto & node2 = *system.add_node (); nano::keypair key; auto latest (node1->latest (nano::dev::genesis_key.pub)); - auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); @@ -1602,12 +1602,12 @@ TEST (rpc, process_subtype_receive) auto node1 = add_ipc_enabled_node (system); auto & node2 = *system.add_node (); auto latest (node1->latest (nano::dev::genesis_key.pub)); - auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); + auto send = std::make_shared (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest)); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node2.process (*send).code); auto [rpc, rpc_ctx] = add_rpc (system, node1); node1->scheduler.manual (send); - nano::state_block receive (nano::dev::genesis_key.pub, send->hash (), nano::dev::genesis_key.pub, nano::genesis_amount, send->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send->hash ())); + nano::state_block receive (nano::dev::genesis_key.pub, send->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount, send->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send->hash ())); boost::property_tree::ptree request; request.put ("action", "process"); std::string json; @@ -1636,7 +1636,7 @@ TEST (rpc, process_ledger_insufficient_work) auto latest (node->latest (nano::dev::genesis_key.pub)); auto min_difficulty = node->network_params.network.publish_thresholds.entry; auto max_difficulty = node->network_params.network.publish_thresholds.epoch_1; - nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); + nano::state_block send (nano::dev::genesis->account (), latest, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, system.work_generate_limited (latest, min_difficulty, max_difficulty)); ASSERT_LT (send.difficulty (), max_difficulty); ASSERT_GE (send.difficulty (), min_difficulty); boost::property_tree::ptree request; @@ -1877,7 +1877,7 @@ TEST (rpc, search_pending) system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto wallet (node->wallets.items.begin ()->first.to_string ()); auto latest (node->latest (nano::dev::genesis_key.pub)); - nano::send_block block (latest, nano::dev::genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); + nano::send_block block (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, block).code); @@ -1887,7 +1887,7 @@ TEST (rpc, search_pending) request.put ("action", "search_pending"); request.put ("wallet", wallet); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::genesis_amount); + ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::dev::genesis_amount); } TEST (rpc, version) @@ -2330,7 +2330,7 @@ TEST (rpc, block_count_pruning) node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config, node_flags); auto latest (node1->latest (nano::dev::genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); @@ -2878,7 +2878,7 @@ TEST (rpc, republish) request.put ("action", "republish"); request.put ("hash", send.hash ().to_string ()); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, system.nodes[1]->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (10s, system.nodes[1]->balance (nano::dev::genesis_key.pub) != nano::dev::genesis_amount); auto & blocks_node (response.get_child ("blocks")); std::vector blocks; for (auto i (blocks_node.begin ()), n (blocks_node.end ()); i != n; ++i) @@ -3422,7 +3422,7 @@ TEST (rpc, search_pending_all) auto node = add_ipc_enabled_node (system); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); auto latest (node->latest (nano::dev::genesis_key.pub)); - nano::send_block block (latest, nano::dev::genesis_key.pub, nano::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); + nano::send_block block (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - node->config.receive_minimum.number (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, block).code); @@ -3431,7 +3431,7 @@ TEST (rpc, search_pending_all) boost::property_tree::ptree request; request.put ("action", "search_pending_all"); auto response (wait_response (system, rpc, request)); - ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::genesis_amount); + ASSERT_TIMELY (10s, node->balance (nano::dev::genesis_key.pub) == nano::dev::genesis_amount); } TEST (rpc, wallet_republish) @@ -3775,7 +3775,7 @@ TEST (rpc, json_block_input) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -3833,7 +3833,7 @@ TEST (rpc, blocks_info) std::string account_text (blocks.second.get ("block_account")); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string amount_text (blocks.second.get ("amount")); - ASSERT_EQ (nano::genesis_amount.convert_to (), amount_text); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), amount_text); std::string blocks_text (blocks.second.get ("contents")); ASSERT_FALSE (blocks_text.empty ()); boost::optional pending (blocks.second.get_optional ("pending")); @@ -3841,7 +3841,7 @@ TEST (rpc, blocks_info) boost::optional source (blocks.second.get_optional ("source_account")); ASSERT_FALSE (source.is_initialized ()); std::string balance_text (blocks.second.get ("balance")); - ASSERT_EQ (nano::genesis_amount.convert_to (), balance_text); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), balance_text); ASSERT_TRUE (blocks.second.get ("confirmed")); // Genesis block is confirmed by default std::string successor_text (blocks.second.get ("successor")); ASSERT_EQ (nano::block_hash (0).to_string (), successor_text); // Genesis block doesn't have successor yet @@ -3952,14 +3952,14 @@ TEST (rpc, block_info_successor) std::string account_text (response.get ("block_account")); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), account_text); std::string amount_text (response.get ("amount")); - ASSERT_EQ (nano::genesis_amount.convert_to (), amount_text); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), amount_text); } TEST (rpc, block_info_pruning) { nano::system system; nano::node_config node_config0 (nano::get_available_port (), system.logging); - node_config0.receive_minimum = nano::genesis_amount; // Prevent auto-receive & receive1 block conflicts + node_config0.receive_minimum = nano::dev::genesis_amount; // Prevent auto-receive & receive1 block conflicts auto & node0 = *system.add_node (node_config0); nano::node_config node_config1 (nano::get_available_port (), system.logging); node_config1.enable_voting = false; // Remove after allowing pruned voting @@ -3967,7 +3967,7 @@ TEST (rpc, block_info_pruning) node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config1, node_flags); auto latest (node1->latest (nano::dev::genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); @@ -4002,7 +4002,7 @@ TEST (rpc, block_info_pruning) ASSERT_FALSE (json_error); ASSERT_EQ (receive1->full_hash (), receive_from_json.full_hash ()); std::string balance_text (response2.get ("balance")); - ASSERT_EQ (nano::genesis_amount.convert_to (), balance_text); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), balance_text); ASSERT_TRUE (response2.get ("confirmed")); std::string successor_text (response2.get ("successor")); ASSERT_EQ (successor_text, nano::block_hash (0).to_string ()); // receive1 block doesn't have successor yet @@ -4012,7 +4012,7 @@ TEST (rpc, pruned_exists) { nano::system system; nano::node_config node_config0 (nano::get_available_port (), system.logging); - node_config0.receive_minimum = nano::genesis_amount; // Prevent auto-receive & receive1 block conflicts + node_config0.receive_minimum = nano::dev::genesis_amount; // Prevent auto-receive & receive1 block conflicts auto & node0 = *system.add_node (node_config0); nano::node_config node_config1 (nano::get_available_port (), system.logging); node_config1.enable_voting = false; // Remove after allowing pruned voting @@ -4020,7 +4020,7 @@ TEST (rpc, pruned_exists) node_flags.enable_pruning = true; auto node1 = add_ipc_enabled_node (system, node_config1, node_flags); auto latest (node1->latest (nano::dev::genesis_key.pub)); - auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); + auto send1 (std::make_shared (latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (latest))); node1->process_active (send1); auto receive1 (std::make_shared (send1->hash (), send1->hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node1->work_generate_blocking (send1->hash ()))); node1->process_active (receive1); @@ -4087,7 +4087,7 @@ TEST (rpc, ledger) auto node = add_ipc_enabled_node (system); nano::keypair key; auto latest (node->latest (nano::dev::genesis_key.pub)); - auto genesis_balance (nano::genesis_amount); + auto genesis_balance (nano::dev::genesis_amount); auto send_amount (genesis_balance - 100); genesis_balance -= send_amount; nano::send_block send (latest, key.pub, genesis_balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (latest)); @@ -4313,7 +4313,7 @@ TEST (rpc, block_create_state) request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("previous", genesis.hash ().to_string ()); request.put ("representative", nano::dev::genesis_key.pub.to_account ()); - request.put ("balance", (nano::genesis_amount - nano::Gxrb_ratio).convert_to ()); + request.put ("balance", (nano::dev::genesis_amount - nano::Gxrb_ratio).convert_to ()); request.put ("link", key.pub.to_account ()); request.put ("work", nano::to_string_hex (*node->work_generate_blocking (genesis.hash ()))); auto response (wait_response (system, rpc, request)); @@ -4398,7 +4398,7 @@ TEST (rpc, block_create_state_request_work) request.put ("wallet", node->wallets.items.begin ()->first.to_string ()); request.put ("account", nano::dev::genesis_key.pub.to_account ()); request.put ("representative", nano::dev::genesis_key.pub.to_account ()); - request.put ("balance", (nano::genesis_amount - nano::Gxrb_ratio).convert_to ()); + request.put ("balance", (nano::dev::genesis_amount - nano::Gxrb_ratio).convert_to ()); request.put ("link", key.pub.to_account ()); request.put ("previous", previous); auto response (wait_response (system, rpc, request)); @@ -4710,7 +4710,7 @@ TEST (rpc, online_reps) auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, key.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, send_block); ASSERT_TIMELY (10s, !node2->online_reps.list ().empty ()); - ASSERT_EQ (node2->online_reps.online (), nano::genesis_amount - nano::Gxrb_ratio); + ASSERT_EQ (node2->online_reps.online (), nano::dev::genesis_amount - nano::Gxrb_ratio); auto [rpc, rpc_ctx] = add_rpc (system, node2); boost::property_tree::ptree request; request.put ("action", "representatives_online"); @@ -4778,7 +4778,7 @@ TEST (rpc, confirmation_height_currently_processing) { auto transaction = node->store.tx_begin_write (); nano::keypair key1; - nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); + nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio - 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); previous_genesis_chain_hash = send.hash (); } @@ -4848,7 +4848,7 @@ TEST (rpc, confirmation_history) ASSERT_EQ (block->hash ().to_string (), hash); nano::amount tally_num; tally_num.decode_dec (tally); - debug_assert (tally_num == nano::genesis_amount || tally_num == (nano::genesis_amount - nano::Gxrb_ratio)); + debug_assert (tally_num == nano::dev::genesis_amount || tally_num == (nano::dev::genesis_amount - nano::Gxrb_ratio)); system.stop (); } @@ -4879,7 +4879,7 @@ TEST (rpc, confirmation_history_hash) ASSERT_EQ (send2->hash ().to_string (), hash); nano::amount tally_num; tally_num.decode_dec (tally); - debug_assert (tally_num == nano::genesis_amount || tally_num == (nano::genesis_amount - nano::Gxrb_ratio) || tally_num == (nano::genesis_amount - 2 * nano::Gxrb_ratio) || tally_num == (nano::genesis_amount - 3 * nano::Gxrb_ratio)); + debug_assert (tally_num == nano::dev::genesis_amount || tally_num == (nano::dev::genesis_amount - nano::Gxrb_ratio) || tally_num == (nano::dev::genesis_amount - 2 * nano::Gxrb_ratio) || tally_num == (nano::dev::genesis_amount - 3 * nano::Gxrb_ratio)); system.stop (); } @@ -4889,7 +4889,7 @@ TEST (rpc, block_confirm) auto node = add_ipc_enabled_node (system); system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv); nano::genesis genesis; - auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, nano::dev::genesis_key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *node->work_generate_blocking (genesis.hash ()))); { auto transaction (node->store.tx_begin_write ()); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send1).code); @@ -5212,7 +5212,7 @@ TEST (rpc, wallet_history) // Genesis block ASSERT_EQ ("receive", std::get<0> (history_l[3])); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<1> (history_l[3])); - ASSERT_EQ (nano::genesis_amount.convert_to (), std::get<2> (history_l[3])); + ASSERT_EQ (nano::dev::genesis_amount.convert_to (), std::get<2> (history_l[3])); ASSERT_EQ (nano::dev::genesis->hash ().to_string (), std::get<3> (history_l[3])); ASSERT_EQ (nano::dev::genesis_key.pub.to_account (), std::get<4> (history_l[3])); } @@ -5222,7 +5222,7 @@ TEST (rpc, sign_hash) nano::system system; auto node1 = add_ipc_enabled_node (system); nano::keypair key; - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5245,7 +5245,7 @@ TEST (rpc, sign_block) auto node1 = add_ipc_enabled_node (system); nano::keypair key; system.wallet (0)->insert_adhoc (key.prv); - nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); + nano::state_block send (nano::dev::genesis->account (), node1->latest (nano::dev::genesis_key.pub), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, 0); auto [rpc, rpc_ctx] = add_rpc (system, node1); boost::property_tree::ptree request; request.put ("action", "sign"); @@ -5634,14 +5634,14 @@ TEST (rpc, epoch_upgrade) auto node = add_ipc_enabled_node (system); nano::keypair key1, key2, key3; nano::keypair epoch_signer (nano::dev::genesis_key); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); - auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) + auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); - auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) + auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send3).code); nano::account max_account (std::numeric_limits::max ()); - auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account + auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account ASSERT_EQ (nano::process_result::progress, node->process (*send4).code); auto open (std::make_shared (key1.pub, 0, key1.pub, 1, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); ASSERT_EQ (nano::process_result::progress, node->process (*open).code); @@ -5683,9 +5683,9 @@ TEST (rpc, epoch_upgrade) rpc_ctx->io_scope->reset (); // Epoch 2 upgrade auto genesis_latest (node->latest (nano::dev::genesis_key.pub)); - auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) + auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send5).code); - auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) + auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) ASSERT_EQ (nano::process_result::progress, node->process (*send6).code); auto key1_latest (node->latest (key1.pub)); auto send7 (std::make_shared (key1.pub, key1_latest, key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (key1_latest))); // to key3 @@ -5728,14 +5728,14 @@ TEST (rpc, epoch_upgrade_multithreaded) auto node = add_ipc_enabled_node (system, node_config); nano::keypair key1, key2, key3; nano::keypair epoch_signer (nano::dev::genesis_key); - auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 1, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); // to opened account ASSERT_EQ (nano::process_result::progress, node->process (*send1).code); - auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) + auto send2 (std::make_shared (nano::dev::genesis_key.pub, send1->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 2, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); // to unopened account (pending) ASSERT_EQ (nano::process_result::progress, node->process (*send2).code); - auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) + auto send3 (std::make_shared (nano::dev::genesis_key.pub, send2->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 3, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send2->hash ()))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send3).code); nano::account max_account (std::numeric_limits::max ()); - auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account + auto send4 (std::make_shared (nano::dev::genesis_key.pub, send3->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 4, max_account, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send3->hash ()))); // to max account ASSERT_EQ (nano::process_result::progress, node->process (*send4).code); auto open (std::make_shared (key1.pub, 0, key1.pub, 1, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); ASSERT_EQ (nano::process_result::progress, node->process (*open).code); @@ -5776,9 +5776,9 @@ TEST (rpc, epoch_upgrade_multithreaded) rpc_ctx->io_scope->reset (); // Epoch 2 upgrade auto genesis_latest (node->latest (nano::dev::genesis_key.pub)); - auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) + auto send5 (std::make_shared (nano::dev::genesis_key.pub, genesis_latest, nano::dev::genesis_key.pub, nano::dev::genesis_amount - 5, 0, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis_latest))); // to burn (0) ASSERT_EQ (nano::process_result::progress, node->process (*send5).code); - auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) + auto send6 (std::make_shared (nano::dev::genesis_key.pub, send5->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - 6, key1.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send5->hash ()))); // to key1 (again) ASSERT_EQ (nano::process_result::progress, node->process (*send6).code); auto key1_latest (node->latest (key1.pub)); auto send7 (std::make_shared (key1.pub, key1_latest, key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (key1_latest))); // to key3 @@ -5821,7 +5821,7 @@ TEST (rpc, account_lazy_start) auto node1 = system.add_node (node_flags); nano::keypair key; // Generating test chain - auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); + auto send1 (std::make_shared (nano::dev::genesis_key.pub, nano::dev::genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (nano::dev::genesis->hash ()))); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); auto open (std::make_shared (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); @@ -5858,7 +5858,7 @@ TEST (rpc, receive) nano::keypair key1; wallet->insert_adhoc (key1.prv); auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number (), *node->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::dev::genesis_amount); ASSERT_TIMELY (10s, !node->store.account.exists (node->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount auto send2 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (send1->hash ()))); @@ -5899,7 +5899,7 @@ TEST (rpc, receive_unopened) // Test receiving for unopened account nano::keypair key1; auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *node->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, !node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (5s, !node->balance (nano::dev::genesis_key.pub) != nano::dev::genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); wallet->insert_adhoc (key1.prv); // should not auto receive, amount sent was lower than minimum @@ -5961,7 +5961,7 @@ TEST (rpc, receive_work_disabled) ASSERT_TRUE (worker_node.work_generation_enabled ()); auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *worker_node.work_generate_blocking (genesis.hash ()), false)); ASSERT_TRUE (send1 != nullptr); - ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::dev::genesis_amount); ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub)); ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ())); wallet->insert_adhoc (key1.prv); @@ -5994,7 +5994,7 @@ TEST (rpc, receive_pruned) nano::keypair key1; wallet2->insert_adhoc (key1.prv); auto send1 (wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, node2->config.receive_minimum.number (), *node2->work_generate_blocking (nano::dev::genesis->hash ()))); - ASSERT_TIMELY (5s, node2->balance (nano::dev::genesis_key.pub) != nano::genesis_amount); + ASSERT_TIMELY (5s, node2->balance (nano::dev::genesis_key.pub) != nano::dev::genesis_amount); ASSERT_TIMELY (10s, !node2->store.account.exists (node2->store.tx_begin_read (), key1.pub)); // Send below minimum receive amount auto send2 (wallet1->send_action (nano::dev::genesis_key.pub, key1.pub, node2->config.receive_minimum.number () - 1, *node2->work_generate_blocking (send1->hash ()))); @@ -6211,8 +6211,8 @@ TEST (rpc, confirmation_active) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::genesis genesis; - auto send1 (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); - auto send2 (std::make_shared (send1->hash (), nano::public_key (), nano::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); + auto send1 (std::make_shared (genesis.hash (), nano::public_key (), nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send2 (std::make_shared (send1->hash (), nano::public_key (), nano::dev::genesis_amount - 200, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (send1->hash ()))); node1->process_active (send1); node1->process_active (send2); nano::blocks_confirm (*node1, { send1, send2 }); @@ -6240,7 +6240,7 @@ TEST (rpc, confirmation_info) auto [rpc, rpc_ctx] = add_rpc (system, node1); nano::genesis genesis; - auto send (std::make_shared (genesis.hash (), nano::public_key (), nano::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); + auto send (std::make_shared (genesis.hash (), nano::public_key (), nano::dev::genesis_amount - 100, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ()))); node1->process_active (send); node1->block_processor.flush (); node1->scheduler.flush (); diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp index 0f46a198..f1a29996 100644 --- a/nano/secure/common.cpp +++ b/nano/secure/common.cpp @@ -82,6 +82,7 @@ std::string const test_canary_public_key_data = nano::get_env_or_default ("NANO_ nano::ledger_constants nano::dev::constants{ nano::networks::nano_dev_network }; std::shared_ptr & nano::dev::genesis = nano::dev::constants.genesis; nano::keypair nano::dev::genesis_key{ dev_private_key_data }; +nano::uint128_t nano::dev::genesis_amount{ std::numeric_limits::max () }; nano::network_params::network_params () : network_params (network_constants::active_network) @@ -116,7 +117,6 @@ nano::ledger_constants::ledger_constants (nano::networks network_a) : nano_live_genesis (parse_block_from_genesis_data (live_genesis_data)), nano_test_genesis (parse_block_from_genesis_data (test_genesis_data)), genesis (network_a == nano::networks::nano_dev_network ? nano_dev_genesis : network_a == nano::networks::nano_beta_network ? nano_beta_genesis : network_a == nano::networks::nano_test_network ? nano_test_genesis : nano_live_genesis), - genesis_amount (std::numeric_limits::max ()), burn_account (0), nano_dev_final_votes_canary_account (dev_public_key_data), nano_beta_final_votes_canary_account (beta_canary_public_key_data), diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp index 06cf4762..57253606 100644 --- a/nano/secure/common.hpp +++ b/nano/secure/common.hpp @@ -379,7 +379,6 @@ public: std::shared_ptr nano_live_genesis; std::shared_ptr nano_test_genesis; std::shared_ptr genesis; - nano::uint128_t genesis_amount; nano::account burn_account; nano::account nano_dev_final_votes_canary_account; nano::account nano_beta_final_votes_canary_account; @@ -399,6 +398,7 @@ namespace dev extern nano::ledger_constants constants; extern std::shared_ptr & genesis; extern nano::keypair genesis_key; + extern nano::uint128_t genesis_amount; } /** Constants which depend on random values (this class should never be used globally due to CryptoPP globals potentially not being initialized) */ diff --git a/nano/secure/ledger.cpp b/nano/secure/ledger.cpp index 6d735d41..551431da 100644 --- a/nano/secure/ledger.cpp +++ b/nano/secure/ledger.cpp @@ -1103,7 +1103,7 @@ nano::account nano::ledger::account_safe (nano::transaction const & transaction_ nano::uint128_t nano::ledger::amount (nano::transaction const & transaction_a, nano::account const & account_a) { release_assert (account_a == network_params.ledger.genesis_account ()); - return network_params.ledger.genesis_amount; + return nano::dev::genesis_amount; } nano::uint128_t nano::ledger::amount (nano::transaction const & transaction_a, nano::block_hash const & hash_a) diff --git a/nano/secure/store_partial.hpp b/nano/secure/store_partial.hpp index 2af7a4c1..666a9b8d 100644 --- a/nano/secure/store_partial.hpp +++ b/nano/secure/store_partial.hpp @@ -108,7 +108,7 @@ public: auto & genesis = *network_params.ledger.genesis; auto hash_l (genesis.hash ()); debug_assert (account.begin (transaction_a) == account.end ()); - genesis.sideband_set (nano::block_sideband (network_params.ledger.genesis_account (), 0, network_params.ledger.genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); + genesis.sideband_set (nano::block_sideband (network_params.ledger.genesis_account (), 0, nano::dev::genesis_amount, 1, nano::seconds_since_epoch (), nano::epoch::epoch_0, false, false, false, nano::epoch::epoch_0)); block.put (transaction_a, hash_l, genesis); ++ledger_cache_a.block_count; confirmation_height.put (transaction_a, network_params.ledger.genesis_account (), nano::confirmation_height_info{ 1, genesis.hash () }); diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index 008958c5..0d03564a 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -100,7 +100,7 @@ TEST (ledger, deep_account_compute) store->initialize (transaction, ledger.cache); nano::work_pool pool (std::numeric_limits::max ()); nano::keypair key; - auto balance (nano::genesis_amount - 1); + auto balance (nano::dev::genesis_amount - 1); nano::send_block send (genesis.hash (), key.pub, balance, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (genesis.hash ())); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); nano::open_block open (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); @@ -146,7 +146,7 @@ TEST (wallet, multithreaded_send_async) } })); } - ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::dev::genesis_key.pub) == (nano::genesis_amount - 20 * 1000 * 1000)); + ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::dev::genesis_key.pub) == (nano::dev::genesis_amount - 20 * 1000 * 1000)); } for (auto i (threads.begin ()), n (threads.end ()); i != n; ++i) { @@ -488,7 +488,7 @@ TEST (node, mass_vote_by_hash) std::vector> blocks; for (auto i (0); i < 10000; ++i) { - auto block (std::make_shared (nano::dev::genesis_key.pub, previous, nano::dev::genesis_key.pub, nano::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous))); + auto block (std::make_shared (nano::dev::genesis_key.pub, previous, nano::dev::genesis_key.pub, nano::dev::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous))); previous = block->hash (); blocks.push_back (block); } @@ -647,7 +647,7 @@ TEST (confirmation_height, long_chains) auto const num_blocks = nano::confirmation_height::unbounded_cutoff * 2 + 50; // First open the other account - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); nano::open_block open (send.hash (), nano::dev::genesis->account (), key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); { auto transaction = node->store.tx_begin_write (); @@ -662,7 +662,7 @@ TEST (confirmation_height, long_chains) auto transaction = node->store.tx_begin_write (); for (auto i = num_blocks - 1; i > 0; --i) { - nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); + nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); nano::receive_block receive (previous_destination_chain_hash, send.hash (), key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, receive).code); @@ -674,11 +674,11 @@ TEST (confirmation_height, long_chains) // Send one from destination to genesis and pocket it nano::send_block send1 (previous_destination_chain_hash, nano::dev::genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); - auto receive1 (std::make_shared (nano::dev::genesis_key.pub, previous_genesis_chain_hash, nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); + auto receive1 (std::make_shared (nano::dev::genesis_key.pub, previous_genesis_chain_hash, nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); // Unpocketed. Send to a non-existing account to prevent auto receives from the wallet adjusting expected confirmation height nano::keypair key2; - nano::state_block send2 (nano::dev::genesis->account (), receive1->hash (), nano::dev::genesis->account (), nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1->hash ())); + nano::state_block send2 (nano::dev::genesis->account (), receive1->hash (), nano::dev::genesis->account (), nano::dev::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (receive1->hash ())); { auto transaction = node->store.tx_begin_write (); @@ -738,7 +738,7 @@ TEST (confirmation_height, dynamic_algorithm) std::vector> state_blocks; for (auto i = 0; i < num_blocks; ++i) { - auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis->hash (), nano::dev::genesis_key.pub, nano::genesis_amount - i - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis->hash ()))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis->hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - i - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis->hash ()))); latest_genesis = send; state_blocks.push_back (send); } @@ -794,7 +794,7 @@ TEST (confirmation_height, dynamic_algorithm_no_transition_while_pending) auto add_block_to_genesis_chain = [&] (nano::write_transaction & transaction) { static int num = 0; - auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::genesis_amount - num - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::dev::genesis_amount - num - 1, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); latest_genesis = send->hash (); state_blocks.push_back (send); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); @@ -873,7 +873,7 @@ TEST (confirmation_height, many_accounts_send_receive_self) nano::keypair key; keys.emplace_back (key); - nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis)); + nano::send_block send (latest_genesis, key.pub, nano::dev::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); auto open = std::make_shared (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code); @@ -994,7 +994,7 @@ TEST (confirmation_height, many_accounts_send_receive_self_no_elections) { nano::keypair key; keys.emplace_back (key); - nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (latest_genesis)); + nano::send_block send (latest_genesis, key.pub, nano::dev::genesis_amount - 1 - i, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *pool.generate (latest_genesis)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); auto open = std::make_shared (send.hash (), nano::dev::genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *open).code); @@ -1312,7 +1312,7 @@ TEST (telemetry, under_load) system.wallet (0)->insert_adhoc (key.prv); auto latest_genesis = node->latest (nano::dev::genesis_key.pub); auto num_blocks = 150000; - auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::genesis_amount - num_blocks, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); + auto send (std::make_shared (nano::dev::genesis_key.pub, latest_genesis, nano::dev::genesis_key.pub, nano::dev::genesis_amount - num_blocks, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest_genesis))); node->process_active (send); latest_genesis = send->hash (); auto open (std::make_shared (key.pub, 0, key.pub, num_blocks, send->hash (), key.prv, key.pub, *system.work.generate (key.pub))); @@ -1329,7 +1329,7 @@ TEST (telemetry, under_load) } }; - std::thread thread1 (thread_func, nano::dev::genesis_key, latest_genesis, nano::genesis_amount - num_blocks); + std::thread thread1 (thread_func, nano::dev::genesis_key, latest_genesis, nano::dev::genesis_amount - num_blocks); std::thread thread2 (thread_func, key, latest_key, num_blocks); ASSERT_TIMELY (200s, node1->ledger.cache.block_count == num_blocks * 2 + 3); @@ -1447,7 +1447,7 @@ TEST (telemetry, many_nodes) // Give all nodes a non-default number of blocks nano::keypair key; nano::genesis genesis; - nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ())); + nano::state_block send (nano::dev::genesis_key.pub, genesis.hash (), nano::dev::genesis_key.pub, nano::dev::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (genesis.hash ())); for (auto node : system.nodes) { auto transaction (node->store.tx_begin_write ()); @@ -1736,7 +1736,7 @@ TEST (node, mass_block_new) auto send = builder.make_block () .account (nano::dev::genesis_key.pub) .previous (latest_genesis) - .balance (nano::genesis_amount - i - 1) + .balance (nano::dev::genesis_amount - i - 1) .representative (nano::dev::genesis_key.pub) .link (keys[i].pub) .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) @@ -1834,7 +1834,7 @@ TEST (node, wallet_create_block_confirm_conflicts) auto transaction = node->store.tx_begin_write (); for (auto i = num_blocks - 1; i > 0; --i) { - nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); + nano::send_block send (latest, key1.pub, nano::dev::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev::genesis_key.prv, nano::dev::genesis_key.pub, *system.work.generate (latest)); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); latest = send.hash (); } diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp index 23779432..56d996cf 100644 --- a/nano/test_common/system.cpp +++ b/nano/test_common/system.cpp @@ -152,8 +152,8 @@ nano::system::~system () void nano::system::ledger_initialization_set (std::vector const & reps, nano::amount const & reserve) { nano::block_hash previous = nano::dev::genesis->hash (); - auto amount = (nano::genesis_amount - reserve.number ()) / reps.size (); - auto balance = nano::genesis_amount; + auto amount = (nano::dev::genesis_amount - reserve.number ()) / reps.size (); + auto balance = nano::dev::genesis_amount; for (auto const & i : reps) { balance -= amount; diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp index aea9951a..a0ef8063 100644 --- a/nano/test_common/testutil.cpp +++ b/nano/test_common/testutil.cpp @@ -9,14 +9,6 @@ using namespace std::chrono_literals; -/* Convenience constants for tests which are always on the test network */ -namespace -{ -nano::ledger_constants dev_constants (nano::networks::nano_dev_network); -} - -nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount); - void nano::wait_peer_connections (nano::system & system_a) { auto wait_peer_count = [&system_a] (bool in_memory) {