starknet_patricia: no original skeleton trait

Author: nimrod-starkware

crates/starknet_patricia/src/patricia_merkle_tree/original_skeleton_tree/tree.rs

@@ -10,40 +10,29 @@ pub type OriginalSkeletonNodeMap = HashMap<NodeIndex, OriginalSkeletonNode>;
 pub type OriginalSkeletonTreeResult<T> = Result<T, OriginalSkeletonTreeError>;
 
 /// Consider a Patricia-Merkle Tree which should be updated with new leaves.
-/// This trait represents the structure of the subtree which will be modified in the
+/// This struct represents the structure of the subtree which will be modified in the
 /// update. It also contains the hashes (for edge siblings - also the edge data) of the unmodified
 /// nodes on the Merkle paths from the updated leaves to the root.
-pub trait OriginalSkeletonTree<'a>: Sized {
-    fn get_nodes(&self) -> &OriginalSkeletonNodeMap;
-
-    fn get_nodes_mut(&mut self) -> &mut OriginalSkeletonNodeMap;
-
-    #[allow(dead_code)]
-    fn get_sorted_leaf_indices(&self) -> SortedLeafIndices<'a>;
-}
-
 // TODO(Dori, 1/7/2024): Make this a tuple struct.
 #[derive(Debug, PartialEq)]
 pub struct OriginalSkeletonTreeImpl<'a> {
     pub nodes: HashMap<NodeIndex, OriginalSkeletonNode>,
     pub sorted_leaf_indices: SortedLeafIndices<'a>,
 }
 
-impl<'a> OriginalSkeletonTree<'a> for OriginalSkeletonTreeImpl<'a> {
-    fn get_nodes(&self) -> &OriginalSkeletonNodeMap {
+impl<'a> OriginalSkeletonTreeImpl<'a> {
+    pub(crate) fn get_nodes(&self) -> &OriginalSkeletonNodeMap {
         &self.nodes
     }
 
-    fn get_nodes_mut(&mut self) -> &mut OriginalSkeletonNodeMap {
+    pub(crate) fn get_nodes_mut(&mut self) -> &mut OriginalSkeletonNodeMap {
         &mut self.nodes
     }
 
-    fn get_sorted_leaf_indices(&self) -> SortedLeafIndices<'a> {
+    pub(crate) fn get_sorted_leaf_indices(&self) -> SortedLeafIndices<'a> {
         self.sorted_leaf_indices
     }
-}
 
-impl<'a> OriginalSkeletonTreeImpl<'a> {
     pub fn create_unmodified(root_hash: HashOutput) -> Self {
         Self {
             nodes: HashMap::from([(

crates/starknet_patricia/src/patricia_merkle_tree/traversal.rs

@@ -24,7 +24,7 @@ pub enum TraversalError {
 }
 
 /// An enum that specifies how to treat unmodified children during the construction of the
-/// [crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTree]..
+/// [crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTreeImpl]..
 pub enum UnmodifiedChildTraversal {
     // Indicates that the child must be read since we don't have the data to create an original
     // tree node.
@@ -113,7 +113,7 @@ pub trait SubTreeTrait<'a>: Sized {
     }
 
     /// Decide whether to traverse an unmodified child during the construction of the
-    /// [crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTree].
+    /// [crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTreeImpl].
     fn should_traverse_unmodified_child(data: Self::NodeData) -> UnmodifiedChildTraversal;
 
     /// Returns the full [DbKey] of the root node.

crates/starknet_patricia/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs

@@ -5,7 +5,7 @@ use crate::patricia_merkle_tree::node_data::leaf::{LeafModifications, SkeletonLe
 use crate::patricia_merkle_tree::original_skeleton_tree::node::OriginalSkeletonNode;
 use crate::patricia_merkle_tree::original_skeleton_tree::tree::{
     OriginalSkeletonNodeMap,
-    OriginalSkeletonTree,
+    OriginalSkeletonTreeImpl,
 };
 use crate::patricia_merkle_tree::original_skeleton_tree::utils::split_leaves;
 use crate::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndices};
@@ -73,7 +73,7 @@ impl UpdatedSkeletonTree {
     /// original skeleton and leaf modifications, without being dependant in any descendants
     /// (i.e., modified leaves, and unmodified nodes).
     pub(crate) fn finalize_bottom_layer<'a>(
-        original_skeleton: &impl OriginalSkeletonTree<'a>,
+        original_skeleton: &OriginalSkeletonTreeImpl<'a>,
         leaf_modifications: &LeafModifications<SkeletonLeaf>,
     ) -> UpdatedSkeletonNodeMap {
         leaf_modifications
@@ -92,7 +92,7 @@ impl UpdatedSkeletonTree {
     /// Finalize the tree middle layers (i.e., not the bottom layer defined above).
     pub(crate) fn finalize_middle_layers<'a>(
         &mut self,
-        original_skeleton: &mut impl OriginalSkeletonTree<'a>,
+        original_skeleton: &mut OriginalSkeletonTreeImpl<'a>,
     ) -> TempSkeletonNode {
         let sorted_leaf_indices = original_skeleton.get_sorted_leaf_indices();
         if original_skeleton.get_nodes().is_empty() {
@@ -397,7 +397,7 @@ impl UpdatedSkeletonTree {
     }
 
     pub(crate) fn create_unmodified<'a>(
-        original_skeleton: &impl OriginalSkeletonTree<'a>,
+        original_skeleton: &OriginalSkeletonTreeImpl<'a>,
     ) -> UpdatedSkeletonTreeResult<Self> {
         let original_root_node = original_skeleton
             .get_nodes()

crates/starknet_patricia/src/patricia_merkle_tree/updated_skeleton_tree/tree.rs

@@ -4,7 +4,7 @@ use starknet_api::hash::HashOutput;
 
 use crate::patricia_merkle_tree::node_data::leaf::{LeafModifications, SkeletonLeaf};
 use crate::patricia_merkle_tree::original_skeleton_tree::node::OriginalSkeletonNode;
-use crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTree;
+use crate::patricia_merkle_tree::original_skeleton_tree::tree::OriginalSkeletonTreeImpl;
 use crate::patricia_merkle_tree::types::NodeIndex;
 use crate::patricia_merkle_tree::updated_skeleton_tree::create_tree_helper::TempSkeletonNode;
 use crate::patricia_merkle_tree::updated_skeleton_tree::errors::UpdatedSkeletonTreeError;
@@ -29,7 +29,7 @@ pub struct UpdatedSkeletonTree {
 
 impl UpdatedSkeletonTree {
     pub fn create<'a>(
-        original_skeleton: &mut impl OriginalSkeletonTree<'a>,
+        original_skeleton: &mut OriginalSkeletonTreeImpl<'a>,
         leaf_modifications: &LeafModifications<SkeletonLeaf>,
     ) -> UpdatedSkeletonTreeResult<Self> {
         if leaf_modifications.is_empty() {