Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix sync stalling on moving head (best block) prior to the tip of the chain sometimes #4091

Merged
gavofyork merged 3 commits into from
Nov 12, 2019
Merged

Fix sync stalling on moving head (best block) prior to the tip of the chain sometimes #4091

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41f4631
Work around finalization woes
arkpar Nov 11, 2019
644664d
Fixed check_block
arkpar Nov 12, 2019
002fe6a
Added a test
arkpar Nov 12, 2019
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
Prev Previous commit
Next Next commit
Fixed check_block
  • Loading branch information
@arkpar
arkpar committed Nov 12, 2019
commit 644664d71bf9f84550c23c4e9932bfbe305d0016
3 changes: 2 additions & 1 deletion core/client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,8 @@ impl<'a, B, E, Block, RA> consensus::BlockImport<Block> for &'a Client<B, E, Blo
.map_err(|e| ConsensusError::ClientImport(e.to_string()))?
{
BlockStatus::InChainWithState | BlockStatus::Queued => return Ok(ImportResult::AlreadyInChain),
BlockStatus::Unknown | BlockStatus::InChainPruned => {},
BlockStatus::InChainPruned => return Ok(ImportResult::AlreadyInChain),
BlockStatus::Unknown => {},
BlockStatus::KnownBad => return Ok(ImportResult::KnownBad),
}

Expand Down