Merge pull request #71 from nuttycom/shardstore_return_owned_types

Improvements required for implementing `ShardStore` atop a persistent store.
zcash · May 22, 2023 · a26844a · a26844a
2 parents 1562397 + 5691b70
commit a26844a
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 158 deletions.
diff --git a/bridgetree/src/lib.rs b/bridgetree/src/lib.rs
@@ -1032,8 +1032,8 @@ mod tests {
             BridgeTree::current_position(self)
         }
 
-        fn get_marked_leaf(&self, position: Position) -> Option<&H> {
-            BridgeTree::get_marked_leaf(self, position)
+        fn get_marked_leaf(&self, position: Position) -> Option<H> {
+            BridgeTree::get_marked_leaf(self, position).cloned()
         }
 
         fn marked_positions(&self) -> BTreeSet<Position> {

diff --git a/incrementalmerkletree/src/testing.rs b/incrementalmerkletree/src/testing.rs
@@ -42,7 +42,7 @@ pub trait Tree<H, C> {
 
     /// Returns the leaf at the specified position if the tree can produce
     /// a witness for it.
-    fn get_marked_leaf(&self, position: Position) -> Option<&H>;
+    fn get_marked_leaf(&self, position: Position) -> Option<H>;
 
     /// Return a set of all the positions for which we have marked.
     fn marked_positions(&self) -> BTreeSet<Position>;
@@ -420,7 +420,7 @@ impl<H: Hashable + Ord + Clone + Debug, C: Clone, I: Tree<H, C>, E: Tree<H, C>>
         a
     }
 
-    fn get_marked_leaf(&self, position: Position) -> Option<&H> {
+    fn get_marked_leaf(&self, position: Position) -> Option<H> {
         let a = self.inefficient.get_marked_leaf(position);
         let b = self.efficient.get_marked_leaf(position);
         assert_eq!(a, b);

diff --git a/incrementalmerkletree/src/testing/complete_tree.rs b/incrementalmerkletree/src/testing/complete_tree.rs
@@ -230,11 +230,11 @@ impl<H: Hashable + PartialEq + Clone, C: Ord + Clone + core::fmt::Debug, const D
         self.marks.clone()
     }
 
-    fn get_marked_leaf(&self, position: Position) -> Option<&H> {
+    fn get_marked_leaf(&self, position: Position) -> Option<H> {
         if self.marks.contains(&position) {
             self.leaves
                 .get(usize::try_from(position).expect(MAX_COMPLETE_SIZE_ERROR))
-                .and_then(|opt: &Option<H>| opt.as_ref())
+                .and_then(|opt: &Option<H>| opt.clone())
         } else {
             None
         }