diff --git a/nano/core_test/active_elections.cpp b/nano/core_test/active_elections.cpp index 6c13d4a0..05c243aa 100644 --- a/nano/core_test/active_elections.cpp +++ b/nano/core_test/active_elections.cpp @@ -1224,7 +1224,7 @@ TEST (active_elections, activate_inactive) ASSERT_NE (nullptr, election); election->force_confirm (); - ASSERT_TIMELY (5s, !node.confirming_set.exists (send2->hash ())); + ASSERT_TIMELY (5s, !node.confirming_set.contains (send2->hash ())); ASSERT_TIMELY (5s, node.block_confirmed (send2->hash ())); ASSERT_TIMELY (5s, node.block_confirmed (send->hash ())); diff --git a/nano/core_test/confirming_set.cpp b/nano/core_test/confirming_set.cpp index 7d250178..46e7b914 100644 --- a/nano/core_test/confirming_set.cpp +++ b/nano/core_test/confirming_set.cpp @@ -30,7 +30,7 @@ TEST (confirming_set, add_exists) nano::confirming_set confirming_set{ config, ctx.ledger (), ctx.stats () }; auto send = ctx.blocks ()[0]; confirming_set.add (send->hash ()); - ASSERT_TRUE (confirming_set.exists (send->hash ())); + ASSERT_TRUE (confirming_set.contains (send->hash ())); } TEST (confirming_set, process_one) @@ -242,7 +242,7 @@ TEST (confirmation_callback, dependent_election) // Wait for blocks to be confirmed in ledger, callbacks will happen after ASSERT_TIMELY_EQ (5s, 3, node->stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed, nano::stat::dir::in)); // Once the item added to the confirming set no longer exists, callbacks have completed - ASSERT_TIMELY (5s, !node->confirming_set.exists (send2->hash ())); + ASSERT_TIMELY (5s, !node->confirming_set.contains (send2->hash ())); ASSERT_TIMELY_EQ (5s, 1, node->stats.count (nano::stat::type::confirmation_observer, nano::stat::detail::active_quorum, nano::stat::dir::out)); ASSERT_TIMELY_EQ (5s, 1, node->stats.count (nano::stat::type::confirmation_observer, nano::stat::detail::active_conf_height, nano::stat::dir::out)); diff --git a/nano/node/confirming_set.cpp b/nano/node/confirming_set.cpp index f7a01253..de92e853 100644 --- a/nano/node/confirming_set.cpp +++ b/nano/node/confirming_set.cpp @@ -68,7 +68,7 @@ void nano::confirming_set::stop () notification_workers.stop (); } -bool nano::confirming_set::exists (nano::block_hash const & hash) const +bool nano::confirming_set::contains (nano::block_hash const & hash) const { std::lock_guard lock{ mutex }; return set.get ().contains (hash); diff --git a/nano/node/confirming_set.hpp b/nano/node/confirming_set.hpp index 5eb42967..00329fea 100644 --- a/nano/node/confirming_set.hpp +++ b/nano/node/confirming_set.hpp @@ -51,7 +51,7 @@ public: // Adds a block to the set of blocks to be confirmed void add (nano::block_hash const & hash, std::shared_ptr const & election = nullptr); // Added blocks will remain in this set until after ledger has them marked as confirmed. - bool exists (nano::block_hash const & hash) const; + bool contains (nano::block_hash const & hash) const; std::size_t size () const; nano::container_info container_info () const; diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index 198bdeac..8b75b9d0 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -1187,7 +1187,7 @@ void nano::json_handler::block_confirm () if (!node.ledger.confirmed.block_exists_or_pruned (transaction, hash)) { // Start new confirmation for unconfirmed (or not being confirmed) block - if (!node.confirming_set.exists (hash)) + if (!node.confirming_set.contains (hash)) { node.start_election (std::move (block_l)); } diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 346c20ae..5871f2cf 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1104,14 +1104,14 @@ void nano::node::start_election (std::shared_ptr const & block) scheduler.manual.push (block); } -bool nano::node::block_confirmed (nano::block_hash const & hash_a) +bool nano::node::block_confirmed (nano::block_hash const & hash) { - return ledger.confirmed.block_exists_or_pruned (ledger.tx_begin_read (), hash_a); + return ledger.confirmed.block_exists_or_pruned (ledger.tx_begin_read (), hash); } -bool nano::node::block_confirmed_or_being_confirmed (nano::secure::transaction const & transaction, nano::block_hash const & hash_a) +bool nano::node::block_confirmed_or_being_confirmed (nano::secure::transaction const & transaction, nano::block_hash const & hash) { - return confirming_set.exists (hash_a) || ledger.confirmed.block_exists_or_pruned (transaction, hash_a); + return confirming_set.contains (hash) || ledger.confirmed.block_exists_or_pruned (transaction, hash); } bool nano::node::block_confirmed_or_being_confirmed (nano::block_hash const & hash_a) diff --git a/nano/node/wallet.cpp b/nano/node/wallet.cpp index 837a2ca4..716f78ee 100644 --- a/nano/node/wallet.cpp +++ b/nano/node/wallet.cpp @@ -1201,7 +1201,7 @@ bool nano::wallet::search_receivable (store::transaction const & wallet_transact // Receive confirmed block receive_async (hash, representative, amount, account, [] (std::shared_ptr const &) {}); } - else if (!wallets.node.confirming_set.exists (hash)) + else if (!wallets.node.confirming_set.contains (hash)) { auto block = wallets.node.ledger.any.block_get (block_transaction, hash); if (block)