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

combine at_depth and at_depth_nonempty methods

Browse source
This commit is contained in:
Grzegorz Świrski 2025-05-03 20:33:30 +02:00
parent bbf70c90ed
commit 8374e07c4a
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
miden-crypto/src/merkle/sparse_path.rs
View file

@ -71,33 +71,16 @@ impl SparseMerklePath {
return Err(MerkleError::DepthTooBig(node_depth.get().into()));
}
let node = self
.at_depth_nonempty(node_depth)
.unwrap_or_else(|| *EmptySubtreeRoots::entry(self.depth(), node_depth.get()));
let node = if self.is_depth_empty(node_depth) {
*EmptySubtreeRoots::entry(self.depth(), node_depth.get())
} else {
let nonempty_index = self.get_nonempty_index(node_depth);
self.nodes[nonempty_index]
};
Ok(node)
}
/// Get a specific non-empty node in this path at a given depth, or `None` if the specified
/// node is an empty node.
fn at_depth_nonempty(&self, node_depth: NonZero<u8>) -> Option<RpoDigest> {
assert!(
node_depth.get() <= self.depth(),
"node depth {} cannot be greater than tree depth {}",
node_depth.get(),
self.depth(),
);
if self.is_depth_empty(node_depth) {
return None;
}
// Our index needs to account for all the empty nodes that aren't in `self.nodes`.
let nonempty_index = self.get_nonempty_index(node_depth);
Some(self.nodes[nonempty_index])
}
/// Returns the path node at the specified index, or [None] if the index is out of bounds.
///
/// The node at index 0 is the deepest part of the path.