Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/consensus/babe/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ impl<B, E, Block, I, RA, PRA> BlockImport<Block> for BabeBlockImport<B, E, Block
.expect("best finalized hash was given by client; \
finalized headers must exist in db; qed");

find_pre_digest::<Block>(&finalized_header)
find_pre_digest::<Block::Header>(&finalized_header)
.expect("finalized header must be valid; \
valid blocks have a pre-digest; qed")
.slot_number()
Expand Down
2 changes: 1 addition & 1 deletion core/consensus/babe/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ fn importing_epoch_change_block_prunes_tree() {
};

let mut proposer = environ.init(&parent_header).unwrap();
let parent_pre_digest = find_pre_digest::<Block>(&parent_header).unwrap();
let parent_pre_digest = find_pre_digest(&parent_header).unwrap();

let pre_digest = sr_primitives::generic::Digest {
logs: vec![
Expand Down
5 changes: 3 additions & 2 deletions core/utils/fork-tree/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,11 @@ impl<H, N, V> ForkTree<H, N, V> where

// we found the deepest ancestor of the finalized block, so we prune
// out any children that don't include the finalized block.
root.children.retain(|node| {
let children = std::mem::replace(&mut root.children, Vec::new());
root.children = children.into_iter().filter(|node| {
node.number == *number && node.hash == *hash ||
node.number < *number && is_descendent_of(&node.hash, hash).unwrap_or(false)
});
}).take(1).collect();

self.roots = vec![root];
}
Expand Down