[scratchpad] bug fix: branchtracker.next was not properly initialized

Closes: aptos-labs#363
aoi-jp · Mar 31, 2022 · 97facf4 · 97facf4
1 parent 624a6ae
commit 97facf4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/storage/scratchpad/src/sparse_merkle/mod.rs b/storage/scratchpad/src/sparse_merkle/mod.rs
@@ -224,7 +224,12 @@ impl<V> Inner<V> {
         let mut links_locked = self.links.lock();
 
         let child = if links_locked.children.is_empty() {
-            self.spawn_impl(child_root, links_locked.branch_tracker.clone())
+            let child = self.spawn_impl(child_root, links_locked.branch_tracker.clone());
+            let mut branch_tracker_locked = links_locked.branch_tracker.lock();
+            if branch_tracker_locked.next.upgrade().is_none() {
+                branch_tracker_locked.next = Arc::downgrade(&child);
+            }
+            child
         } else {
             // forking a new branch
             let branch_tracker =

diff --git a/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs b/storage/scratchpad/src/sparse_merkle/sparse_merkle_test.rs
@@ -401,7 +401,7 @@ static VALUE: Lazy<AccountStateBlob> = Lazy::new(|| AccountStateBlob::from(b"val
 static LEAF: Lazy<SparseMerkleLeafNode> =
     Lazy::new(|| SparseMerkleLeafNode::new(*KEY, VALUE.hash()));
 static PROOF_READER: Lazy<ProofReader<AccountStateBlob>> = Lazy::new(|| {
-    let proof = SparseMerkleProof::new(Some(LEAF.clone()), vec![]);
+    let proof = SparseMerkleProof::new(Some(*LEAF), vec![]);
     ProofReader::new(vec![(*KEY, proof)])
 });