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

Remove nano::nano_dev_account and use public key from dev genesis block.

Browse source
This commit is contained in:
clemahieu 2021-07-21 00:20:44 +01:00
commit ffa184a3cf
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
5 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/core_test/ledger_walker.cpp
View file

@ -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);
}

3
nano/secure/common.cpp
View file

@ -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);

1
nano/secure/common.hpp
View file

@ -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;

1
nano/test_common/testutil.cpp
View file

@ -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)

1
nano/test_common/testutil.hpp
View file

@ -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