pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 10:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

babe: small compilation fix (#3764)

Browse Source 
* babe: fix type on find_pre_digest call

* fork-tree: optimize prune

* babe: fix test compilation
This commit is contained in:
André Silva
2019-10-04 19:55:03 +01:00
committed by GitHub
parent 49fb11a1ea
commit f1cdaae6de
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/consensus/babe/src/lib.rs
+1 -1
View File
@@ -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; \ .expect("best finalized hash was given by client; \
finalized headers must exist in db; qed"); 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; \ .expect("finalized header must be valid; \
valid blocks have a pre-digest; qed") valid blocks have a pre-digest; qed")
.slot_number() .slot_number()
substrate/core/consensus/babe/src/tests.rs
+1 -1
View File
@@ -625,7 +625,7 @@ fn importing_epoch_change_block_prunes_tree() {
}; };
let mut proposer = environ.init(&parent_header).unwrap(); 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 { let pre_digest = sr_primitives::generic::Digest {
logs: vec![ logs: vec![
substrate/core/utils/fork-tree/src/lib.rs
+3 -2
View File
@@ -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 // we found the deepest ancestor of the finalized block, so we prune
// out any children that don't include the finalized block. // 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 && node.hash == *hash ||
node.number < *number && is_descendent_of(&node.hash, hash).unwrap_or(false) node.number < *number && is_descendent_of(&node.hash, hash).unwrap_or(false)
}); }).take(1).collect();
self.roots = vec![root]; self.roots = vec![root];
} }