Skip to content
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

fix synchronizer (grandpa) #1635

Merged
merged 1 commit into from
May 30, 2023
Merged

fix synchronizer (grandpa) #1635

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
11 changes: 5 additions & 6 deletions core/network/impl/synchronizer_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,16 @@ namespace kagome::network {
bool SynchronizerImpl::subscribeToBlock(
const primitives::BlockInfo &block_info, SyncResultHandler &&handler) {
// Check if block is already in tree
if (block_tree_->hasBlockHeader(block_info.hash)) {
auto has = block_tree_->hasBlockHeader(block_info.hash);
if (has and has.value()) {
scheduler_->schedule(
[handler = std::move(handler), block_info] { handler(block_info); });
return false;
}

auto last_finalized_block = block_tree_->getLastFinalized();
// Check if block from discarded side-chain
if (last_finalized_block.number <= block_info.number) {
if (last_finalized_block.number >= block_info.number) {
scheduler_->schedule(
[handler = std::move(handler)] { handler(Error::DISCARDED_BLOCK); });
return false;
Expand Down Expand Up @@ -1205,9 +1206,8 @@ namespace kagome::network {
}
}

auto node = known_blocks_.extract(hash);
if (node) {
auto &block_data = node.mapped().data;
if (auto it = known_blocks_.find(hash); it != known_blocks_.end()) {
auto &block_data = it->second.data;
BOOST_ASSERT(block_data.header.has_value());
const BlockInfo block_info(block_data.header->number, block_data.hash);

Expand Down Expand Up @@ -1302,7 +1302,6 @@ namespace kagome::network {
if (not block_addition_result.has_value()) {
if (block_addition_result
!= outcome::failure(blockchain::BlockTreeError::BLOCK_EXISTS)) {
notifySubscribers(block_info, block_addition_result.as_failure());
auto n = discardBlock(block_data.hash);
SL_WARN(log_,
"Block {} {} been discarded: {}",
Expand Down