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

Removing unconfirmed_frontiers command line option. (#4530)

Browse source 
When unconfirmed blocks are moved in to memory this information will not be queryable outside the node process.
This commit is contained in:
clemahieu 2024-04-01 17:40:24 +02:00 • committed by GitHub
commit 697f2ce05d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 0 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

35
nano/core_test/ledger.cpp
View file

@ -5517,41 +5517,6 @@ TEST (ledger, migrate_lmdb_to_rocksdb)
ASSERT_EQ (rocksdb_store.final_vote.get (rocksdb_transaction, nano::root (send->previous ()))[0], nano::block_hash (2)); ASSERT_EQ (rocksdb_store.final_vote.get (rocksdb_transaction, nano::root (send->previous ()))[0], nano::block_hash (2));
} }
TEST (ledger, unconfirmed_frontiers)
{
auto ctx = nano::test::context::ledger_empty ();
auto & ledger = ctx.ledger ();
auto & store = ctx.store ();
nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () };
auto unconfirmed_frontiers = ledger.unconfirmed_frontiers ();
ASSERT_TRUE (unconfirmed_frontiers.empty ());
nano::state_block_builder builder;
nano::keypair key;
auto const latest = ledger.latest (store.tx_begin_read (), nano::dev::genesis_key.pub);
auto send = builder.make_block ()
.account (nano::dev::genesis_key.pub)
.previous (latest)
.representative (nano::dev::genesis_key.pub)
.balance (nano::dev::constants.genesis_amount - 100)
.link (key.pub)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (latest))
.build ();
ASSERT_EQ (nano::block_status::progress, ledger.process (store.tx_begin_write (), send));
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::dev::genesis_key.pub };
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);
ASSERT_EQ (uncemented_info1.frontier, uncemented_info2.frontier);
}
TEST (ledger, is_send_genesis) TEST (ledger, is_send_genesis)
{ {
auto ctx = nano::test::context::ledger_empty (); auto ctx = nano::test::context::ledger_empty ();

14
nano/nano_node/entry.cpp
View file

@ -1993,20 +1993,6 @@ int main (int argc, char * const * argv)
output_account_version_number (i, unopened_account_version_totals[i]); output_account_version_number (i, unopened_account_version_totals[i]);
} }
} }
else if (vm.count ("debug_unconfirmed_frontiers"))
{
auto inactive_node = nano::default_inactive_node (data_path, vm);
auto node = inactive_node->node;
auto unconfirmed_frontiers = node->ledger.unconfirmed_frontiers ();
std::cout << "Account: Height delta | Frontier | Confirmed frontier\n";
for (auto const & [height_delta, unconfirmed_info] : unconfirmed_frontiers)
{
std::cout << (boost::format ("%1%: %2% %3% %4%\n") % unconfirmed_info.account.to_account () % height_delta % unconfirmed_info.frontier.to_string () % unconfirmed_info.cemented_frontier.to_string ()).str ();
}
std::cout << "\nNumber of unconfirmed frontiers: " << unconfirmed_frontiers.size () << std::endl;
}
else if (vm.count ("version")) else if (vm.count ("version"))
{ {
std::cout << "Version " << NANO_VERSION_STRING << "\n" std::cout << "Version " << NANO_VERSION_STRING << "\n"

36
nano/secure/ledger.cpp
View file

@ -1370,37 +1370,6 @@ uint64_t nano::ledger::pruning_action (store::write_transaction & transaction_a,
return pruned_count; return pruned_count;
} }
std::multimap<uint64_t, nano::uncemented_info, std::greater<>> nano::ledger::unconfirmed_frontiers () const
{
nano::locked<std::multimap<uint64_t, nano::uncemented_info, std::greater<>>> result;
using result_t = decltype (result)::value_type;
store.account.for_each_par ([this, &result] (store::read_transaction const & transaction_a, store::iterator<nano::account, nano::account_info> i, store::iterator<nano::account, nano::account_info> n) {
result_t unconfirmed_frontiers_l;
for (; i != n; ++i)
{
auto const & account (i->first);
auto const & account_info (i->second);
nano::confirmation_height_info conf_height_info;
this->store.confirmation_height.get (transaction_a, account, conf_height_info);
if (account_info.block_count != conf_height_info.height)
{
// Always output as no confirmation height has been set on the account yet
auto height_delta = account_info.block_count - conf_height_info.height;
auto const & frontier = account_info.head;
auto const & cemented_frontier = conf_height_info.frontier;
unconfirmed_frontiers_l.emplace (std::piecewise_construct, std::forward_as_tuple (height_delta), std::forward_as_tuple (cemented_frontier, frontier, i->first));
}
}
// Merge results
auto result_locked = result.lock ();
result_locked->insert (unconfirmed_frontiers_l.begin (), unconfirmed_frontiers_l.end ());
});
return result;
}
// A precondition is that the store is an LMDB store // A precondition is that the store is an LMDB store
bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_path_a) const bool nano::ledger::migrate_lmdb_to_rocksdb (std::filesystem::path const & data_path_a) const
{ {
@ -1620,11 +1589,6 @@ uint64_t nano::ledger::pruned_count () const
return cache.pruned_count; return cache.pruned_count;
} }
nano::uncemented_info::uncemented_info (nano::block_hash const & cemented_frontier, nano::block_hash const & frontier, nano::account const & account) :
cemented_frontier (cemented_frontier), frontier (frontier), account (account)
{
}
std::unique_ptr<nano::container_info_component> nano::ledger::collect_container_info (std::string const & name) const std::unique_ptr<nano::container_info_component> nano::ledger::collect_container_info (std::string const & name) const
{ {
auto count = bootstrap_weights.size (); auto count = bootstrap_weights.size ();

10
nano/secure/ledger.hpp
View file

@ -27,15 +27,6 @@ class pending_info;
class pending_key; class pending_key;
class stats; class stats;
class uncemented_info
{
public:
uncemented_info (nano::block_hash const & cemented_frontier, nano::block_hash const & frontier, nano::account const & account);
nano::block_hash cemented_frontier;
nano::block_hash frontier;
nano::account account;
};
class ledger final class ledger final
{ {
friend class receivable_iterator; friend class receivable_iterator;
@ -90,7 +81,6 @@ public:
std::shared_ptr<nano::block> find_receive_block_by_send_hash (store::transaction const & transaction, nano::account const & destination, nano::block_hash const & send_block_hash); std::shared_ptr<nano::block> find_receive_block_by_send_hash (store::transaction const & transaction, nano::account const & destination, nano::block_hash const & send_block_hash);
nano::account const & epoch_signer (nano::link const &) const; nano::account const & epoch_signer (nano::link const &) const;
nano::link const & epoch_link (nano::epoch) const; nano::link const & epoch_link (nano::epoch) const;
std::multimap<uint64_t, uncemented_info, std::greater<>> unconfirmed_frontiers () const;
bool migrate_lmdb_to_rocksdb (std::filesystem::path const &) const; bool migrate_lmdb_to_rocksdb (std::filesystem::path const &) const;
bool bootstrap_weight_reached () const; bool bootstrap_weight_reached () const;
static nano::epoch version (nano::block const & block); static nano::epoch version (nano::block const & block);