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

simplify logic a bit

This commit is contained in:
NikVolf 2018-12-30 01:08:30 +03:00
parent 0ef99a62a4
commit d8b8d6710c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
storage/src/tree_state.rs
View File

@ -112,15 +112,16 @@ impl<D: Dim> TreeState<D> {
let mut combined = sha256_compress(&*former_left, &*former_right);
for i in 0..D::HEIGHT-1 {
let parent_slot = self.parents.get_mut(i as usize)
.expect("Vector is at least self.height in size");
let parent_slot = &mut self.parents[i as usize];
if parent_slot.is_none() {
*parent_slot = Some(combined);
return Ok(());
} else {
let former_parent_slot = parent_slot.take().expect("None variant checked above; qed");
combined = sha256_compress(&*former_parent_slot, &*combined);
match parent_slot.take() {
None => {
*parent_slot = Some(combined);
return Ok(());
},
Some(former) => {
combined = sha256_compress(&*former, &*combined)
},
}
}