Skip to content

Commit

Permalink
Introduce SimpleSmt::with_contiguous_leaves() (#227)
Browse files Browse the repository at this point in the history
* with_contiguous_leaves

* test
  • Loading branch information
plafer authored and bobbinth committed Feb 14, 2024
1 parent 389fcb0 commit 25b8cb6
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/merkle/simple_smt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,22 @@ impl SimpleSmt {
Ok(tree)
}

/// Wrapper around [`SimpleSmt::with_leaves`] which inserts leaves at contiguous indices
/// starting at index 0.
pub fn with_contiguous_leaves<R, I>(depth: u8, entries: R) -> Result<Self, MerkleError>
where
R: IntoIterator<IntoIter = I>,
I: Iterator<Item = Word> + ExactSizeIterator,
{
Self::with_leaves(
depth,
entries
.into_iter()
.enumerate()
.map(|(idx, word)| (idx.try_into().expect("tree max depth is 2^8"), word)),
)
}

// PUBLIC ACCESSORS
// --------------------------------------------------------------------------------------------

Expand Down
15 changes: 15 additions & 0 deletions src/merkle/simple_smt/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@ fn build_sparse_tree() {
assert_eq!(old_value, EMPTY_WORD);
}

/// Tests that [`SimpleSmt::with_contiguous_leaves`] works as expected
#[test]
fn build_contiguous_tree() {
let tree_with_leaves = SimpleSmt::with_leaves(
2,
[0, 1, 2, 3].into_iter().zip(digests_to_words(&VALUES4).into_iter()),
)
.unwrap();

let tree_with_contiguous_leaves =
SimpleSmt::with_contiguous_leaves(2, digests_to_words(&VALUES4).into_iter()).unwrap();

assert_eq!(tree_with_leaves, tree_with_contiguous_leaves);
}

#[test]
fn test_depth2_tree() {
let tree =
Expand Down

0 comments on commit 25b8cb6

Please sign in to comment.