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

Revert "Implement ledger::account_receivable in terms of receivable iterators"

Browse source 
This reverts commit a5e1500680.

# Conflicts:
#	nano/secure/ledger.cpp
This commit is contained in:
Colin LeMahieu 2024-08-21 16:06:29 +01:00
commit 750b6ba65b
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nano/secure/ledger.cpp
View file

@ -792,11 +792,19 @@ void nano::ledger::initialize (nano::generate_cache_flags const & generate_cache
nano::uint128_t nano::ledger::account_receivable (secure::transaction const & transaction_a, nano::account const & account_a, bool only_confirmed_a) nano::uint128_t nano::ledger::account_receivable (secure::transaction const & transaction_a, nano::account const & account_a, bool only_confirmed_a)
{ {
nano::uint128_t result{ 0 }; nano::uint128_t result (0);
for (auto i = any.receivable_upper_bound (transaction_a, account_a, 0), n = any.receivable_end (); i != n; ++i) nano::account end (account_a.number () + 1);
for (auto i (store.pending.begin (transaction_a, nano::pending_key (account_a, 0))), n (store.pending.begin (transaction_a, nano::pending_key (end, 0))); i != n; ++i)
{ {
auto const & [key, info] = *i; nano::pending_info const & info (i->second);
if (!only_confirmed_a || confirmed.block_exists_or_pruned (transaction_a, key.hash)) if (only_confirmed_a)
{
if (confirmed.block_exists_or_pruned (transaction_a, i->first.hash))
{
result += info.amount.number ();
}
}
else
{ {
result += info.amount.number (); result += info.amount.number ();
} }