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

more convenient best block check

This commit is contained in:
NikVolf 2016-11-10 19:42:35 +03:00
parent 1a553e2caf
commit 390c7d2854
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/src/storage.rs
View File

@ -593,15 +593,13 @@ impl Store for Storage {
}
fn accepted_location(&self, header: &chain::BlockHeader) -> Option<BlockLocation> {
if self.best_block().is_none() { return Some(BlockLocation::Main(0)); }
let best_number = match self.best_block() {
None => { return Some(BlockLocation::Main(0)); },
Some(best) => best.number,
};
if let Some(height) = self.block_number(&header.previous_header_hash) {
if self.best_block()
.expect("chacked it is not none above; best_block cannot be retracted; qed")
.number == height
{
Some(BlockLocation::Main(height + 1))
}
if best_number == height { Some(BlockLocation::Main(height + 1)) }
else { Some(BlockLocation::Side(height + 1)) }
}
else {