Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build after merging PR 3324 #3371

Merged
merged 1 commit into from
Jul 6, 2021
Merged

Fix build after merging PR 3324 #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions nano/core_test/ledger_walker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <nano/node/ledger_walker.hpp>
#include <nano/node/testing.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>

#include <gtest/gtest.h>
Expand Down Expand Up @@ -108,11 +108,11 @@ TEST (ledger_walker, cross_account)
ASSERT_FALSE (node->ledger.store.account.get (transaction, key.pub, account_info));

// TODO: check issue with account head
// const auto first = node->ledger.store.block_get_no_sideband(transaction, account_info.head);
// const auto second = node->ledger.store.block_get_no_sideband(transaction, first->previous());
// const auto third = node->ledger.store.block_get_no_sideband(transaction, second->previous());
// const auto fourth = node->ledger.store.block_get_no_sideband(transaction, third->previous());
// const auto fifth = node->ledger.store.block_get_no_sideband(transaction, fourth->previous());
// const auto first = node->ledger.store.block.get_no_sideband(transaction, account_info.head);
// const auto second = node->ledger.store.block.get_no_sideband(transaction, first->previous());
// const auto third = node->ledger.store.block.get_no_sideband(transaction, second->previous());
// const auto fourth = node->ledger.store.block.get_no_sideband(transaction, third->previous());
// const auto fifth = node->ledger.store.block.get_no_sideband(transaction, fourth->previous());
//
// const auto expected_blocks_to_walk = { first, second, third, fourth, fifth };
// auto expected_blocks_to_walk_itr = expected_blocks_to_walk.begin();
Expand Down Expand Up @@ -189,7 +189,7 @@ TEST (ledger_walker, ladder_geometry)
nano::amount previous_balance{};
if (!block->previous ().is_zero ())
{
const auto previous_block = node->ledger.store.block_get_no_sideband (transaction, block->previous ());
const auto previous_block = node->ledger.store.block.get_no_sideband (transaction, block->previous ());
previous_balance = previous_block->balance ();
}

Expand All @@ -208,7 +208,7 @@ TEST (ledger_walker, ladder_geometry)
nano::amount previous_balance{};
if (!block->previous ().is_zero ())
{
const auto previous_block = node->ledger.store.block_get_no_sideband (transaction, block->previous ());
const auto previous_block = node->ledger.store.block.get_no_sideband (transaction, block->previous ());
previous_balance = previous_block->balance ();
}

Expand Down
12 changes: 6 additions & 6 deletions nano/node/ledger_walker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <nano/lib/blocks.hpp>
#include <nano/lib/errors.hpp>
#include <nano/node/ledger_walker.hpp>
#include <nano/secure/blockstore.hpp>
#include <nano/secure/ledger.hpp>
#include <nano/secure/store.hpp>
#include <nano/secure/utility.hpp>

#include <algorithm>
Expand Down Expand Up @@ -37,10 +37,10 @@ void nano::ledger_walker::walk_backward (nano::block_hash const & start_block_ha
{
if (!hash.is_zero ())
{
const auto block = ledger.store.block_get (transaction, hash);
if (block)
const auto dependent_block = ledger.store.block.get (transaction, hash);
if (dependent_block)
{
enqueue_block (ledger.store.block_get (transaction, hash));
enqueue_block (dependent_block);
}
}
}
Expand Down Expand Up @@ -70,7 +70,7 @@ void nano::ledger_walker::walk (nano::block_hash const & end_block_hash_a, shoul
continue;
}

const auto block = ledger.store.block_get (transaction, *block_hash);
const auto block = ledger.store.block.get (transaction, *block_hash);
if (!block)
{
debug_assert (false);
Expand Down Expand Up @@ -168,7 +168,7 @@ void nano::ledger_walker::clear_queue ()

std::shared_ptr<nano::block> nano::ledger_walker::dequeue_block (nano::transaction const & transaction_a)
{
auto block = ledger.store.block_get (transaction_a, blocks_to_walk.top ());
auto block = ledger.store.block.get (transaction_a, blocks_to_walk.top ());
blocks_to_walk.pop ();

return block;
Expand Down