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

Renaming genesis_block to genesis within ledger_constants.

Browse source
This commit is contained in:
clemahieu 2021-07-20 02:36:11 +01:00
commit 0115cbeac5
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/core_test/telemetry.cpp
View file

@ -563,7 +563,7 @@ TEST (telemetry, remove_peer_different_genesis)
.sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (0)
.build_shared ();
node1->network_params.ledger.genesis_block = junk;
node1->network_params.ledger.genesis = junk;
node1->start ();
system.nodes.push_back (node1);
node0->network.merge_peer (node1->network.endpoint ());
@ -601,7 +601,7 @@ TEST (telemetry, remove_peer_different_genesis_udp)
.sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (0)
.build_shared ();
node1->network_params.ledger.genesis_block = junk;
node1->network_params.ledger.genesis = junk;
node1->start ();
system.nodes.push_back (node1);
auto channel0 (std::make_shared<nano::transport::channel_udp> (node1->network.udp_channels, node0->network.endpoint (), node0->network_params.protocol.protocol_version));

8
nano/secure/common.cpp
View file

@ -113,7 +113,7 @@ nano::ledger_constants::ledger_constants (nano::networks network_a) :
nano_beta_genesis (parse_block_from_genesis_data (beta_genesis_data)),
nano_live_genesis (parse_block_from_genesis_data (live_genesis_data)),
nano_test_genesis (parse_block_from_genesis_data (test_genesis_data)),
genesis_block (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 (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<nano::uint128_t>::max ()),
burn_account (0),
nano_dev_final_votes_canary_account (dev_public_key_data),
@ -144,14 +144,14 @@ nano::ledger_constants::ledger_constants (nano::networks network_a) :
nano::account nano::ledger_constants::genesis_account () const
{
auto result = genesis_block->account ();
auto result = genesis->account ();
debug_assert (!result.is_zero ());
return result;
}
nano::block_hash nano::ledger_constants::genesis_hash () const
{
auto result = genesis_block->hash ();
auto result = genesis->hash ();
debug_assert (!result.is_zero ());
return result;
}
@ -830,7 +830,7 @@ std::unique_ptr<nano::container_info_component> nano::collect_container_info (vo
nano::genesis::genesis ()
{
static nano::network_params network_params;
open = network_params.ledger.genesis_block;
open = network_params.ledger.genesis;
debug_assert (open != nullptr);
}

2
nano/secure/common.hpp
View file

@ -380,7 +380,7 @@ public:
std::shared_ptr<nano::block> nano_beta_genesis;
std::shared_ptr<nano::block> nano_live_genesis;
std::shared_ptr<nano::block> nano_test_genesis;
std::shared_ptr<nano::block> genesis_block;
std::shared_ptr<nano::block> genesis;
nano::uint128_t genesis_amount;
nano::account burn_account;
nano::account nano_dev_final_votes_canary_account;

2
nano/secure/store_partial.hpp
View file

@ -105,7 +105,7 @@ public:
*/
void initialize (nano::write_transaction const & transaction_a, nano::ledger_cache & ledger_cache_a) override
{
auto & genesis = *network_params.ledger.genesis_block;
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));