From 6fb101d6ec33e88a5bfee60f347689c867e3178e Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Thu, 14 Sep 2023 18:31:08 +0100 Subject: [PATCH] Removing block_store::get_no_sideband as it's effectively not used. --- nano/core_test/ledger_walker.cpp | 14 +++++++------- nano/nano_node/entry.cpp | 4 ++-- nano/node/lmdb/block_store.cpp | 14 -------------- nano/node/lmdb/block_store.hpp | 1 - nano/node/rocksdb/block_store.cpp | 14 -------------- nano/node/rocksdb/block_store.hpp | 1 - nano/secure/store.hpp | 1 - 7 files changed, 9 insertions(+), 40 deletions(-) diff --git a/nano/core_test/ledger_walker.cpp b/nano/core_test/ledger_walker.cpp index ccedb16f..29797a21 100644 --- a/nano/core_test/ledger_walker.cpp +++ b/nano/core_test/ledger_walker.cpp @@ -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 (); } diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp index e859d2b4..690f64cc 100644 --- a/nano/nano_node/entry.cpp +++ b/nano/nano_node/entry.cpp @@ -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; diff --git a/nano/node/lmdb/block_store.cpp b/nano/node/lmdb/block_store.cpp index d3e26749..d495dc95 100644 --- a/nano/node/lmdb/block_store.cpp +++ b/nano/node/lmdb/block_store.cpp @@ -101,20 +101,6 @@ std::shared_ptr nano::lmdb::block_store::get (nano::transaction con return result; } -std::shared_ptr 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 result; - if (value.size () != 0) - { - nano::bufferstream stream (reinterpret_cast (value.data ()), value.size ()); - result = nano::deserialize_block (stream); - debug_assert (result != nullptr); - } - return result; -} - std::shared_ptr nano::lmdb::block_store::random (nano::transaction const & transaction) { nano::block_hash hash; diff --git a/nano/node/lmdb/block_store.hpp b/nano/node/lmdb/block_store.hpp index f6fc8499..65c52c0c 100644 --- a/nano/node/lmdb/block_store.hpp +++ b/nano/node/lmdb/block_store.hpp @@ -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 get (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override; - std::shared_ptr get_no_sideband (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::shared_ptr 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; diff --git a/nano/node/rocksdb/block_store.cpp b/nano/node/rocksdb/block_store.cpp index 64d2a987..89cba8ed 100644 --- a/nano/node/rocksdb/block_store.cpp +++ b/nano/node/rocksdb/block_store.cpp @@ -101,20 +101,6 @@ std::shared_ptr nano::rocksdb::block_store::get (nano::transaction return result; } -std::shared_ptr 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 result; - if (value.size () != 0) - { - nano::bufferstream stream (reinterpret_cast (value.data ()), value.size ()); - result = nano::deserialize_block (stream); - debug_assert (result != nullptr); - } - return result; -} - std::shared_ptr nano::rocksdb::block_store::random (nano::transaction const & transaction) { nano::block_hash hash; diff --git a/nano/node/rocksdb/block_store.hpp b/nano/node/rocksdb/block_store.hpp index 91c64519..b01cbc78 100644 --- a/nano/node/rocksdb/block_store.hpp +++ b/nano/node/rocksdb/block_store.hpp @@ -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 get (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override; - std::shared_ptr get_no_sideband (nano::transaction const & transaction_a, nano::block_hash const & hash_a) const override; std::shared_ptr 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; diff --git a/nano/secure/store.hpp b/nano/secure/store.hpp index 2bcc7250..3f141a6d 100644 --- a/nano/secure/store.hpp +++ b/nano/secure/store.hpp @@ -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 get (nano::transaction const &, nano::block_hash const &) const = 0; - virtual std::shared_ptr get_no_sideband (nano::transaction const &, nano::block_hash const &) const = 0; virtual std::shared_ptr 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;