Skip to content

Revert "Adapt to get_validated_fork(...) database change." #1024

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

Closed
roodmandevon111-boop wants to merge 1 commit into from
Closed

Revert "Adapt to get_validated_fork(...) database change." #1024

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
3 changes: 2 additions & 1 deletion include/bitcoin/node/chasers/chaser_confirm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class BCN_API chaser_confirm
size_t top) NOEXCEPT;
void announce(const header_link& link, height_t height) NOEXCEPT;

// This is thread safe.
// These are thread safe.
const bool filter_;
const bool defer_;
};

Expand Down
3 changes: 2 additions & 1 deletion src/chasers/chaser_confirm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)

chaser_confirm::chaser_confirm(full_node& node) NOEXCEPT
: chaser(node),
filter_(node.archive().filter_enabled()),
defer_(node.node_settings().defer_confirmation)
{
}
Expand Down Expand Up @@ -143,7 +144,7 @@ void chaser_confirm::do_bumped(height_t) NOEXCEPT
// Guarded by candidate interlock.
size_t fork_point{};
const auto& query = archive();
auto fork = query.get_validated_fork(fork_point, checkpoint());
auto fork = query.get_validated_fork(fork_point, checkpoint(), filter_);

// Fork may be empty if candidates were reorganized.
if (fork.empty())
Expand Down