Skip to content

Make chain_state pointers const. #771

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

Merged
evoskuil merged 1 commit into from
May 3, 2025
Merged

Make chain_state pointers const. #771

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
8 changes: 4 additions & 4 deletions include/bitcoin/node/chasers/chaser_organize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class chaser_organize
struct block_state
{
typename Block::cptr block;
chain_state::ptr state;
chain_state::cptr state;
};
using block_tree = std::unordered_map<system::hash_cref, block_state>;
using header_links = std_vector<database::header_link>;
Expand Down Expand Up @@ -152,13 +152,13 @@ class chaser_organize

// Store Block into logical tree cache.
void cache(const typename Block::cptr& block,
const chain_state::ptr& state) NOEXCEPT;
const chain_state::cptr& state) NOEXCEPT;

// Getters.
// ------------------------------------------------------------------------

// Obtain chain state for given previous hash, nullptr if not found.
chain_state::ptr get_chain_state(
chain_state::cptr get_chain_state(
const system::hash_digest& previous_hash) const NOEXCEPT;

// Sum of work from header to branch point (excluded).
Expand All @@ -183,7 +183,7 @@ class chaser_organize

// These are protected by strand.
bool bumped_{};
chain_state::ptr state_{};
chain_state::cptr state_{};

// TODO: optimize, default bucket count is around 8.
block_tree tree_{};
Expand Down
10 changes: 3 additions & 7 deletions include/bitcoin/node/impl/chasers/chaser_organize.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
namespace libbitcoin {
namespace node {

BC_PUSH_WARNING(NO_NEW_OR_DELETE)

// Public
// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -372,7 +370,7 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT

using namespace system;
const auto& header = get_header(*block);
state.reset(new chain::chain_state{ *state, header, settings_ });
state = to_shared<chain::chain_state>(*state, header, settings_);
cache(block, state);
}

Expand Down Expand Up @@ -495,7 +493,7 @@ code CLASS::push_block(const system::hash_digest& key) NOEXCEPT

TEMPLATE
void CLASS::cache(const typename Block::cptr& block,
const chain_state::ptr& state) NOEXCEPT
const chain_state::cptr& state) NOEXCEPT
{
tree_.emplace(system::hash_cref(block->get_hash()),
block_state{ block, state });
Expand All @@ -505,7 +503,7 @@ void CLASS::cache(const typename Block::cptr& block,
// ----------------------------------------------------------------------------

TEMPLATE
CLASS::chain_state::ptr CLASS::get_chain_state(
CLASS::chain_state::cptr CLASS::get_chain_state(
const system::hash_digest& previous_hash) const NOEXCEPT
{
if (!state_)
Expand Down Expand Up @@ -638,8 +636,6 @@ void CLASS::log_state_change(const chain_state& from,
}
}

BC_POP_WARNING()

} // namespace node
} // namespace libbitcoin

Expand Down
Loading