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

Rewrite reset_confirmation_heights to use a reference to ledger_constants

Browse source
This commit is contained in:
clemahieu 2021-08-03 10:18:36 +01:00
commit 2068e04441
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nano/node/cli.cpp
View file

@ -9,7 +9,7 @@
namespace namespace
{ {
void reset_confirmation_heights (nano::write_transaction const & transaction, nano::store & store); void reset_confirmation_heights (nano::write_transaction const & transaction, nano::ledger_constants & constants, nano::store & store);
bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec); bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec);
} }
@ -236,7 +236,7 @@ bool copy_database (boost::filesystem::path const & data_path, boost::program_op
} }
if (vm.count ("confirmation_height_clear")) if (vm.count ("confirmation_height_clear"))
{ {
reset_confirmation_heights (store.tx_begin_write (), store); reset_confirmation_heights (store.tx_begin_write (), node.node->network_params.ledger, store);
} }
if (vm.count ("final_vote_clear")) if (vm.count ("final_vote_clear"))
{ {
@ -601,7 +601,7 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
else else
{ {
auto transaction (node.node->store.tx_begin_write ()); auto transaction (node.node->store.tx_begin_write ());
reset_confirmation_heights (transaction, node.node->store); reset_confirmation_heights (transaction, node.node->network_params.ledger, node.node->store);
std::cout << "Confirmation heights of all accounts (except genesis which is set to 1) are set to 0" << std::endl; std::cout << "Confirmation heights of all accounts (except genesis which is set to 1) are set to 0" << std::endl;
} }
} }
@ -1300,14 +1300,13 @@ std::unique_ptr<nano::inactive_node> nano::default_inactive_node (boost::filesys
namespace namespace
{ {
void reset_confirmation_heights (nano::write_transaction const & transaction, nano::store & store) void reset_confirmation_heights (nano::write_transaction const & transaction, nano::ledger_constants & constants, nano::store & store)
{ {
// First do a clean sweep // First do a clean sweep
store.confirmation_height.clear (transaction); store.confirmation_height.clear (transaction);
// Then make sure the confirmation height of the genesis account open block is 1 // Then make sure the confirmation height of the genesis account open block is 1
nano::network_params network_params; store.confirmation_height.put (transaction, constants.genesis->account (), { 1, constants.genesis->hash () });
store.confirmation_height.put (transaction, network_params.ledger.genesis->account (), { 1, network_params.ledger.genesis->hash () });
} }
bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec) bool is_using_rocksdb (boost::filesystem::path const & data_path, boost::program_options::variables_map const & vm, std::error_code & ec)