From 4fa0a51b19695994d2fbd7a9af4ba1466f9518fa Mon Sep 17 00:00:00 2001 From: Qyriad Date: Mon, 4 Nov 2024 13:56:41 -0700 Subject: [PATCH] SubtreeLeaf::from_smt_leaf() was only used in tests --- src/merkle/smt/mod.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/merkle/smt/mod.rs b/src/merkle/smt/mod.rs index 7022257..b1d325e 100644 --- a/src/merkle/smt/mod.rs +++ b/src/merkle/smt/mod.rs @@ -627,16 +627,6 @@ pub struct SubtreeLeaf { pub hash: RpoDigest, } -impl SubtreeLeaf { - #[cfg_attr(not(test), allow(dead_code))] - fn from_smt_leaf(leaf: &crate::merkle::SmtLeaf) -> Self { - Self { - col: leaf.index().index.value(), - hash: leaf.hash(), - } - } -} - /// Helper struct to organize the return value of [`SparseMerkleTree::sorted_pairs_to_leaves()`]. #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct PairComputations { @@ -777,6 +767,13 @@ mod test { Felt, Word, ONE, }; + fn smtleaf_to_subtree_leaf(leaf: &SmtLeaf) -> SubtreeLeaf { + SubtreeLeaf { + col: leaf.index().index.value(), + hash: leaf.hash(), + } + } + #[test] fn test_sorted_pairs_to_leaves() { let entries: Vec<(RpoDigest, Word)> = vec![ @@ -825,7 +822,7 @@ mod test { // Subtree 2. vec![next_leaf()], ] - .map(|subtree| subtree.into_iter().map(SubtreeLeaf::from_smt_leaf).collect()) + .map(|subtree| subtree.into_iter().map(smtleaf_to_subtree_leaf).collect()) .to_vec(); assert_eq!(control_leaves_iter.next(), None); control_subtree_leaves