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

Simplify prev_tree unwrap to avoid an (impossible?) concurrency bug

This commit is contained in:
teor 2023-08-31 14:59:30 +10:00
parent 08624143f6
commit 8c244a0e2e
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zebra-state/src/service/finalized_state/disk_format/upgrade/add_subtrees.rs
View File

@ -39,12 +39,10 @@ pub fn run(
tree.completed_subtree_index_and_root()
.expect("already checked is_complete_subtree()")
} else {
let mut sapling_nct = Arc::try_unwrap(
prev_tree
.take()
.expect("should have some previous sapling frontier"),
)
.unwrap_or_else(|shared_tree| (*shared_tree).clone());
let mut prev_tree = prev_tree
.take()
.expect("should have some previous sapling frontier");
let sapling_nct = Arc::make_mut(&mut prev_tree);
let block = upgrade_db
.block(height.into())
@ -121,12 +119,10 @@ pub fn run(
tree.completed_subtree_index_and_root()
.expect("already checked is_complete_subtree()")
} else {
let mut orchard_nct = Arc::try_unwrap(
prev_tree
.take()
.expect("should have some previous orchard frontier"),
)
.unwrap_or_else(|shared_tree| (*shared_tree).clone());
let mut prev_tree = prev_tree
.take()
.expect("should have some previous orchard frontier");
let orchard_nct = Arc::make_mut(&mut prev_tree);
let block = upgrade_db
.block(height.into())