zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Combine two matches

This commit is contained in:
teor 2020-07-16 14:04:27 +10:00 committed by Henry de Valence
parent b648375bbe
commit c13907d1af
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zebra-consensus/src/checkpoint/list.rs
View File

@ -50,18 +50,14 @@ impl CheckpointList {
let checkpoints: BTreeMap<BlockHeight, BlockHeaderHash> = let checkpoints: BTreeMap<BlockHeight, BlockHeaderHash> =
original_checkpoints.into_iter().collect(); original_checkpoints.into_iter().collect();
// An empty checkpoint list can't actually verify any blocks. // Check that the list starts with the correct genesis block
match checkpoints.keys().next() { match checkpoints.iter().next() {
Some(BlockHeight(0)) => {} Some((BlockHeight(0), h)) if h == &parameters::genesis_hash(network) => {}
Some((BlockHeight(0), _)) => {
Err("the genesis checkpoint does not match the network genesis hash")?
}
Some(_) => Err("checkpoints must start at the genesis block height 0")?,
None => Err("there must be at least one checkpoint, for the genesis block")?, None => Err("there must be at least one checkpoint, for the genesis block")?,
_ => Err("checkpoints must start at the genesis block height 0")?,
};
// Check the hash of the genesis block against the supplied network
match checkpoints.values().next() {
Some(h) if h == &parameters::genesis_hash(network) => {}
Some(_) => Err("the genesis checkpoint does not match the network genesis hash")?,
_ => unreachable!("already checked for an empty list"),
}; };
// This check rejects duplicate heights, whether they have the same or // This check rejects duplicate heights, whether they have the same or