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

Merge pull request #4559 from clemahieu/recursive_transaction_cleanup

Browse source 
Clean up and remove recursive transaction usage
This commit is contained in:
clemahieu 2024-04-14 21:17:58 +01:00 • committed by GitHub
commit 6fa57aa8f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nano/core_test/wallet.cpp
View file

@ -650,8 +650,7 @@ TEST (wallet, work_generate)
}
nano::keypair key;
auto block (wallet->send_action (nano::dev::genesis_key.pub, key.pub, 100));
auto transaction (node1.store.tx_begin_read ());
ASSERT_TIMELY (10s, node1.ledger.account_balance (transaction, nano::dev::genesis_key.pub) != amount1);
ASSERT_TIMELY (10s, node1.ledger.account_balance (node1.ledger.store.tx_begin_read (), nano::dev::genesis_key.pub) != amount1);
system.deadline_set (10s);
auto again (true);
while (again)

12
nano/node/epoch_upgrader.cpp
View file

@ -134,9 +134,8 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
uint64_t attempts (0);
for (auto i (accounts_list.get<modified_tag> ().begin ()), n (accounts_list.get<modified_tag> ().end ()); i != n && attempts < upgrade_batch_size && attempts < count_limit && !stopped; ++i)
{
auto transaction (store.tx_begin_read ());
nano::account const & account (i->account);
auto info = ledger.account_info (transaction, account);
auto info = ledger.account_info (ledger.store.tx_begin_read (), account);
if (info && info->epoch () < epoch_a)
{
++attempts;
@ -210,11 +209,10 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
std::atomic<uint64_t> upgraded_pending (0);
uint64_t workers (0);
uint64_t attempts (0);
auto transaction = store.tx_begin_read ();
for (auto current = ledger.receivable_upper_bound (transaction, 0), end = ledger.receivable_end (); current != end && attempts < upgrade_batch_size && attempts < count_limit && !stopped;)
for (auto current = ledger.receivable_upper_bound (ledger.store.tx_begin_read (), 0), end = ledger.receivable_end (); current != end && attempts < upgrade_batch_size && attempts < count_limit && !stopped;)
{
auto const & [key, info] = *current;
if (!store.account.exists (transaction, key.account))
if (!store.account.exists (ledger.store.tx_begin_read (), key.account))
{
if (info.epoch < epoch_a)
{
@ -257,7 +255,7 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
}
}
// Move to next pending item
current = ledger.receivable_upper_bound (transaction, key.account, key.hash);
current = ledger.receivable_upper_bound (ledger.store.tx_begin_read (), key.account, key.hash);
}
else
{
@ -268,7 +266,7 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
}
else
{
current = ledger.receivable_upper_bound (transaction, key.account);
current = ledger.receivable_upper_bound (ledger.store.tx_begin_read (), key.account);
}
}
}

2
nano/node/scheduler/optimistic.cpp
View file

@ -155,7 +155,7 @@ void nano::scheduler::optimistic::run_one (store::transaction const & transactio
if (block)
{
// Ensure block is not already confirmed
if (!node.block_confirmed_or_being_confirmed (block->hash ()))
if (!node.block_confirmed_or_being_confirmed (transaction, block->hash ()))
{
// Try to insert it into AEC
// We check for AEC vacancy inside our predicate

4
nano/rpc_test/rpc.cpp
View file

@ -5770,8 +5770,8 @@ TEST (rpc, block_confirmed)
// Open an account directly in the ledger
{
auto transaction = node->store.tx_begin_write ();
nano::block_hash latest (node->latest (nano::dev::genesis_key.pub));
auto transaction = node->ledger.store.tx_begin_write ();
nano::block_hash latest (node->ledger.latest (transaction, nano::dev::genesis_key.pub));
auto send1 = builder
.send ()
.previous (latest)