qyriad/miden-crypto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "smt: impl SimpleSmt::get_path() which returns a sparse path"

Browse source 
This reverts commit 3bcd8cfe82e1b09d974c8bd6b0b5b16bd6bcfbfe.
This commit is contained in:
Qyriad 2025-04-04 14:50:34 +02:00
parent 7f4b2b326c
commit fb5a865dfc
2 changed files with 2 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
miden-crypto/src/merkle/smt/simple/mod.rs
View file

@ -1,11 +1,10 @@
use alloc::{collections::BTreeSet, vec::Vec};
use alloc::collections::BTreeSet;
use super::{
super::ValuePath, EMPTY_WORD, EmptySubtreeRoots, InnerNode, InnerNodeInfo, InnerNodes,
LeafIndex, MerkleError, MerklePath, MutationSet, NodeIndex, RpoDigest, SMT_MAX_DEPTH,
SMT_MIN_DEPTH, SparseMerkleTree, Word,
};
use crate::merkle::{SparseMerklePath, sparse_path::SparseValuePath};
#[cfg(test)]
mod tests;
@ -174,40 +173,6 @@ impl<const DEPTH: u8> SimpleSmt<DEPTH> {
<Self as SparseMerkleTree<DEPTH>>::open(self, key)
}
/// Returns a path (but not an opening) to the leaf associated with `key`.
///
/// Unlike [`SimpleSmt::open()`], this returns a [SparseValuePath] which has a more efficient
/// memory representation optimized for paths containing empty nodes. See [SparseMerklePath]
/// for more information.
pub fn get_path(&self, key: &LeafIndex<DEPTH>) -> SparseValuePath {
let value: RpoDigest = self.get_value(key).into();
// This is a partial re-implementation of `SparseMerklePath::from_sized_iter()`, which
// constructs in place instead of cloning and immediately dropping the entire vec returned
// by `self.open()`.
let mut nodes: Vec<RpoDigest> = Default::default();
let mut index = NodeIndex::from(*key);
let mut empty_nodes: u64 = 0;
for _ in 0..DEPTH {
let is_right = index.is_value_odd();
index.move_up();
match self.inner_nodes.get(&index) {
Some(InnerNode { left, right }) => {
let value = if is_right { left } else { right };
nodes.push(*value);
},
None => empty_nodes |= u64::checked_shl(1, index.depth().into()).unwrap(),
}
}
let path = SparseMerklePath::from_raw_parts(empty_nodes, nodes);
SparseValuePath { value, path }
}
/// Returns a boolean value indicating whether the SMT is empty.
pub fn is_empty(&self) -> bool {
debug_assert_eq!(self.leaves.is_empty(), self.root == Self::EMPTY_ROOT);

10
miden-crypto/src/merkle/smt/simple/tests.rs
View file

@ -1,5 +1,4 @@
use alloc::vec::Vec;
use core::iter;
use assert_matches::assert_matches;
@ -238,16 +237,9 @@ fn small_tree_opening_is_consistent() {
];
for (key, path) in cases {
let index = LeafIndex::<3>::new(key).unwrap();
let opening = tree.open(&index);
let opening = tree.open(&LeafIndex::<3>::new(key).unwrap());
assert_eq!(path, *opening.path);
// Also check that the sparse versions work the same way.
let sparse_path = tree.get_path(&index);
for (path_node, sparse_path_node) in iter::zip(path, sparse_path.path) {
assert_eq!(path_node, sparse_path_node);
}
}
}