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

Removing block_store::get_no_sideband as it's effectively not used.

Browse source
This commit is contained in:
Colin LeMahieu 2023-09-14 18:31:08 +01:00
commit 6fb101d6ec
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
7 changed files with 9 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nano/core_test/ledger_walker.cpp
View file

@ -111,11 +111,11 @@ TEST (ledger_walker, cross_account)
ASSERT_TRUE (account_info);
// TODO: check issue with account head
// auto const first = node->ledger.store.block.get_no_sideband(transaction, account_info.head);
// auto const second = node->ledger.store.block.get_no_sideband(transaction, first->previous());
// auto const third = node->ledger.store.block.get_no_sideband(transaction, second->previous());
// auto const fourth = node->ledger.store.block.get_no_sideband(transaction, third->previous());
// auto const fifth = node->ledger.store.block.get_no_sideband(transaction, fourth->previous());
// auto const first = node->ledger.store.block.get(transaction, account_info.head);
// auto const second = node->ledger.store.block.get(transaction, first->previous());
// auto const third = node->ledger.store.block.get(transaction, second->previous());
// auto const fourth = node->ledger.store.block.get(transaction, third->previous());
// auto const fifth = node->ledger.store.block.get(transaction, fourth->previous());
//
// auto const expected_blocks_to_walk = { first, second, third, fourth, fifth };
// auto expected_blocks_to_walk_itr = expected_blocks_to_walk.begin();
@ -193,7 +193,7 @@ TEST (ledger_walker, DISABLED_ladder_geometry)
nano::amount previous_balance{};
if (!block->previous ().is_zero ())
{
auto const previous_block = node->ledger.store.block.get_no_sideband (node->ledger.store.tx_begin_read (), block->previous ());
auto const previous_block = node->ledger.store.block.get (node->ledger.store.tx_begin_read (), block->previous ());
previous_balance = previous_block->balance ();
}
@ -212,7 +212,7 @@ TEST (ledger_walker, DISABLED_ladder_geometry)
nano::amount previous_balance{};
if (!block->previous ().is_zero ())
{
auto const previous_block = node->ledger.store.block.get_no_sideband (node->ledger.store.tx_begin_read (), block->previous ());
auto const previous_block = node->ledger.store.block.get (node->ledger.store.tx_begin_read (), block->previous ());
previous_balance = previous_block->balance ();
}

4
nano/nano_node/entry.cpp
View file

@ -1687,7 +1687,7 @@ int main (int argc, char * const * argv)
std::cout << boost::str (boost::format ("%1% pending blocks validated\n") % count);
}
// Check block existance
auto block (node->store.block.get_no_sideband (transaction, key.hash));
auto block (node->store.block.get (transaction, key.hash));
bool pruned (false);
if (block == nullptr)
{
@ -1811,7 +1811,7 @@ int main (int argc, char * const * argv)
while (!hash.is_zero ())
{
// Retrieving block data
auto block (source_node->store.block.get_no_sideband (transaction, hash));
auto block (source_node->store.block.get (transaction, hash));
if (block != nullptr)
{
++count;

14
nano/node/lmdb/block_store.cpp
View file

@ -101,20 +101,6 @@ std::shared_ptr<nano::block> nano::lmdb::block_store::get (nano::transaction con
return result;
}
std::shared_ptr<nano::block> nano::lmdb::block_store::get_no_sideband (nano::transaction const & transaction, nano::block_hash const & hash) const
{
nano::mdb_val value;
block_raw_get (transaction, hash, value);
std::shared_ptr<nano::block> result;
if (value.size () != 0)
{
nano::bufferstream stream (reinterpret_cast<uint8_t const *> (value.data ()), value.size ());
result = nano::deserialize_block (stream);
debug_assert (result != nullptr);
}
return result;
}
std::shared_ptr<nano::block> nano::lmdb::block_store::random (nano::transaction const & transaction)
{
nano::block_hash hash;

1
nano/node/lmdb/block_store.hpp
View file

@ -23,7 +23,6 @@ namespace lmdb
nano::block_hash successor (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
void successor_clear (nano::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
std::shared_ptr<nano::block> get (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> get_no_sideband (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> random (nano::transaction const & transaction_a) override;
void del (nano::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
bool exists (nano::transaction const & transaction_a, nano::block_hash const & hash_a) override;

14
nano/node/rocksdb/block_store.cpp
View file

@ -101,20 +101,6 @@ std::shared_ptr<nano::block> nano::rocksdb::block_store::get (nano::transaction
return result;
}
std::shared_ptr<nano::block> nano::rocksdb::block_store::get_no_sideband (nano::transaction const & transaction, nano::block_hash const & hash) const
{
nano::rocksdb_val value;
block_raw_get (transaction, hash, value);
std::shared_ptr<nano::block> result;
if (value.size () != 0)
{
nano::bufferstream stream (reinterpret_cast<uint8_t const *> (value.data ()), value.size ());
result = nano::deserialize_block (stream);
debug_assert (result != nullptr);
}
return result;
}
std::shared_ptr<nano::block> nano::rocksdb::block_store::random (nano::transaction const & transaction)
{
nano::block_hash hash;

1
nano/node/rocksdb/block_store.hpp
View file

@ -23,7 +23,6 @@ namespace rocksdb
nano::block_hash successor (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
void successor_clear (nano::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
std::shared_ptr<nano::block> get (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> get_no_sideband (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override;
std::shared_ptr<nano::block> random (nano::transaction const & transaction_a) override;
void del (nano::write_transaction const & transaction_a, nano::block_hash const & hash_a) override;
bool exists (nano::transaction const & transaction_a, nano::block_hash const & hash_a) override;

1
nano/secure/store.hpp
View file

@ -748,7 +748,6 @@ public:
virtual nano::block_hash successor (nano::transaction const &, nano::block_hash const &) const = 0;
virtual void successor_clear (nano::write_transaction const &, nano::block_hash const &) = 0;
virtual std::shared_ptr<nano::block> get (nano::transaction const &, nano::block_hash const &) const = 0;
virtual std::shared_ptr<nano::block> get_no_sideband (nano::transaction const &, nano::block_hash const &) const = 0;
virtual std::shared_ptr<nano::block> random (nano::transaction const &) = 0;
virtual void del (nano::write_transaction const &, nano::block_hash const &) = 0;
virtual bool exists (nano::transaction const &, nano::block_hash const &) = 0;