From 3d9c82bbe54aae53f156bf4f1bf046cbde2c230c Mon Sep 17 00:00:00 2001 From: Qyriad Date: Fri, 16 Aug 2024 19:31:48 -0600 Subject: [PATCH] add get_value() to SparseMerkleTree trait --- src/merkle/smt/full/mod.rs | 9 +++++++++ src/merkle/smt/mod.rs | 3 +++ src/merkle/smt/simple/mod.rs | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/src/merkle/smt/full/mod.rs b/src/merkle/smt/full/mod.rs index 2de5786..e5a60d6 100644 --- a/src/merkle/smt/full/mod.rs +++ b/src/merkle/smt/full/mod.rs @@ -249,6 +249,15 @@ impl SparseMerkleTree for Smt { } } + fn get_value(&self, key: &RpoDigest) -> Word { + let leaf_pos = LeafIndex::::from(*key).value(); + + self.leaves + .get(&leaf_pos) + .map(|leaf| leaf.get_value(key).unwrap_or_default()) + .unwrap_or_default() + } + fn get_leaf(&self, key: &RpoDigest) -> Self::Leaf { let leaf_pos = LeafIndex::::from(*key).value(); diff --git a/src/merkle/smt/mod.rs b/src/merkle/smt/mod.rs index e6275cc..8278667 100644 --- a/src/merkle/smt/mod.rs +++ b/src/merkle/smt/mod.rs @@ -157,6 +157,9 @@ pub(crate) trait SparseMerkleTree { /// Inserts a leaf node, and returns the value at the key if already exists fn insert_value(&mut self, key: Self::Key, value: Self::Value) -> Option; + /// Returns the value at the specified key, without modifying the tree. + fn get_value(&self, key: &Self::Key) -> Self::Value; + /// Returns the leaf at the specified index. fn get_leaf(&self, key: &Self::Key) -> Self::Leaf; diff --git a/src/merkle/smt/simple/mod.rs b/src/merkle/smt/simple/mod.rs index 9f0fed1..a4ff136 100644 --- a/src/merkle/smt/simple/mod.rs +++ b/src/merkle/smt/simple/mod.rs @@ -288,6 +288,13 @@ impl SparseMerkleTree for SimpleSmt { } } + fn get_value(&self, key: &LeafIndex) -> Word { + let leaf_pos = key.value(); + + *self.leaves.get(&leaf_pos) + .unwrap_or(&Self::EMPTY_VALUE) + } + fn get_leaf(&self, key: &LeafIndex) -> Word { let leaf_pos = key.value(); match self.leaves.get(&leaf_pos) {