starknet_committer: abstract original tree creation

Author: ArielElp

crates/starknet_committer/src/db.rs

@@ -4,3 +4,4 @@ pub mod external_test_utils;
 pub mod facts_db;
 pub mod forest_trait;
 pub mod index_db;
+pub mod trie_traversal;

crates/starknet_committer/src/db/db_layout.rs

@@ -1,13 +1,26 @@
+use starknet_api::hash::HashOutput;
 use starknet_patricia::patricia_merkle_tree::filled_tree::node::FilledNode;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::Leaf;
+use starknet_patricia::patricia_merkle_tree::traversal::SubTreeTrait;
+use starknet_patricia::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndices};
+use starknet_patricia_storage::db_object::HasStaticPrefix;
 use starknet_patricia_storage::errors::DeserializationError;
 use starknet_patricia_storage::storage_trait::DbValue;
 
-pub trait NodeLayout<L: Leaf> {
+use crate::db::index_db::leaves::TrieType;
+
+pub trait NodeLayout<'a, L: Leaf> {
     type ChildData: Copy;
     type DeserializationContext;
+    type SubTree: SubTreeTrait<'a, NodeData = Self::ChildData, NodeContext = Self::DeserializationContext>;
     fn deserialize_node(
         value: &DbValue,
         deserialize_context: &Self::DeserializationContext,
     ) -> Result<FilledNode<L, Self::ChildData>, DeserializationError>;
+    fn create_subtree(
+        sorted_leaf_indices: SortedLeafIndices<'a>,
+        root_index: NodeIndex,
+        root_hash: HashOutput,
+    ) -> Self::SubTree;
+    fn generate_key_context(trie_type: TrieType) -> <L as HasStaticPrefix>::KeyContext;
 }

crates/starknet_committer/src/db/external_test_utils.rs

@@ -15,10 +15,11 @@ use starknet_patricia::patricia_merkle_tree::updated_skeleton_tree::tree::{
     UpdatedSkeletonTree,
     UpdatedSkeletonTreeImpl,
 };
-use starknet_patricia_storage::db_object::HasStaticPrefix;
+use starknet_patricia_storage::db_object::{EmptyKeyContext, HasStaticPrefix};
 use starknet_patricia_storage::map_storage::MapStorage;
 
-use crate::db::facts_db::create_facts_tree::create_original_skeleton_tree;
+use crate::db::facts_db::db::FactsNodeLayout;
+use crate::db::trie_traversal::create_original_skeleton_tree;
 
 pub async fn tree_computation_flow<L, TH>(
     leaf_modifications: LeafModifications<L>,
@@ -28,17 +29,17 @@ pub async fn tree_computation_flow<L, TH>(
 ) -> FilledTreeImpl<L>
 where
     TH: TreeHashFunction<L> + 'static,
-    L: Leaf + HasStaticPrefix<KeyContext = ()> + 'static,
+    L: Leaf + HasStaticPrefix<KeyContext = EmptyKeyContext> + 'static,
 {
     let mut sorted_leaf_indices: Vec<NodeIndex> = leaf_modifications.keys().copied().collect();
     let sorted_leaf_indices = SortedLeafIndices::new(&mut sorted_leaf_indices);
-    let mut original_skeleton = create_original_skeleton_tree(
+    let mut original_skeleton = create_original_skeleton_tree::<L, FactsNodeLayout>(
         storage,
         root_hash,
         sorted_leaf_indices,
         &config,
         &leaf_modifications,
-        &(),
+        &EmptyKeyContext,
     )
     .await
     .expect("Failed to create the original skeleton tree");
@@ -66,7 +67,7 @@ where
 }
 
 pub async fn single_tree_flow_test<
-    L: Leaf + HasStaticPrefix<KeyContext = ()> + 'static,
+    L: Leaf + HasStaticPrefix<KeyContext = EmptyKeyContext> + 'static,
     TH: TreeHashFunction<L> + 'static,
 >(
     leaf_modifications: LeafModifications<L>,
@@ -90,7 +91,7 @@ pub async fn single_tree_flow_test<
     let json_hash = &json!(hash_result.0.to_hex_string());
     result_map.insert("root_hash", json_hash);
     // Serlialize the storage modifications.
-    let json_storage = &json!(filled_tree.serialize(&()));
+    let json_storage = &json!(filled_tree.serialize(&EmptyKeyContext));
     result_map.insert("storage_changes", json_storage);
     serde_json::to_string(&result_map).expect("serialization failed")
 }