committer: move facts db struct (#10307)

Author: yoavGrs

crates/starknet_committer/src/db.rs

@@ -1 +1,2 @@
+pub mod facts_db;
 pub mod forest_trait;

crates/starknet_committer/src/db/facts_db.rs

@@ -0,0 +1,61 @@
+use std::collections::HashMap;
+
+use starknet_api::core::ContractAddress;
+use starknet_api::hash::HashOutput;
+use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
+use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
+use starknet_patricia_storage::storage_trait::Storage;
+
+use crate::block_committer::input::{ConfigImpl, StarknetStorageValue};
+use crate::db::forest_trait::{ForestReader, ForestWriter};
+use crate::forest::filled_forest::FilledForest;
+use crate::forest::forest_errors::ForestResult;
+use crate::forest::original_skeleton_forest::{ForestSortedIndices, OriginalSkeletonForest};
+use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
+use crate::patricia_merkle_tree::types::CompiledClassHash;
+
+pub struct FactsDb<S: Storage> {
+    // TODO(Yoav): Define StorageStats trait and impl it here. Then, make the storage field
+    // private.
+    pub storage: S,
+}
+
+impl<S: Storage> FactsDb<S> {
+    pub fn new(storage: S) -> Self {
+        Self { storage }
+    }
+
+    pub fn consume_storage(self) -> S {
+        self.storage
+    }
+}
+
+impl<'a, S: Storage> ForestReader<'a> for FactsDb<S> {
+    fn read(
+        &mut self,
+        contracts_trie_root_hash: HashOutput,
+        classes_trie_root_hash: HashOutput,
+        storage_updates: &'a HashMap<ContractAddress, LeafModifications<StarknetStorageValue>>,
+        classes_updates: &'a LeafModifications<CompiledClassHash>,
+        forest_sorted_indices: &'a ForestSortedIndices<'a>,
+        config: ConfigImpl,
+    ) -> ForestResult<(OriginalSkeletonForest<'a>, HashMap<NodeIndex, ContractState>)> {
+        // TODO(Yoav): Move here OriginalSkeletonForest constructor  with all the (facts)
+        // storage-related functions.
+        OriginalSkeletonForest::create(
+            &mut self.storage,
+            contracts_trie_root_hash,
+            classes_trie_root_hash,
+            storage_updates,
+            classes_updates,
+            forest_sorted_indices,
+            &config,
+        )
+    }
+}
+
+impl<S: Storage> ForestWriter for FactsDb<S> {
+    fn write(&mut self, filled_forest: &FilledForest) -> usize {
+        filled_forest.write_to_storage(&mut self.storage)
+    }
+}

crates/starknet_committer/src/db/forest_trait.rs

@@ -4,7 +4,6 @@ use starknet_api::core::ContractAddress;
 use starknet_api::hash::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
 use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
-use starknet_patricia_storage::storage_trait::Storage;
 
 use crate::block_committer::input::{ConfigImpl, StarknetStorageValue};
 use crate::forest::filled_forest::FilledForest;
@@ -34,49 +33,3 @@ pub trait ForestWriter {
 }
 
 pub trait ForestStorage<'a>: ForestReader<'a> + ForestWriter {}
-
-pub struct FactsDb<S: Storage> {
-    // TODO(Yoav): Define StorageStats trait and impl it here. Then, make the storage field
-    // private.
-    pub storage: S,
-}
-
-impl<S: Storage> FactsDb<S> {
-    pub fn new(storage: S) -> Self {
-        Self { storage }
-    }
-
-    pub fn consume_storage(self) -> S {
-        self.storage
-    }
-}
-
-impl<'a, S: Storage> ForestReader<'a> for FactsDb<S> {
-    fn read(
-        &mut self,
-        contracts_trie_root_hash: HashOutput,
-        classes_trie_root_hash: HashOutput,
-        storage_updates: &'a HashMap<ContractAddress, LeafModifications<StarknetStorageValue>>,
-        classes_updates: &'a LeafModifications<CompiledClassHash>,
-        forest_sorted_indices: &'a ForestSortedIndices<'a>,
-        config: ConfigImpl,
-    ) -> ForestResult<(OriginalSkeletonForest<'a>, HashMap<NodeIndex, ContractState>)> {
-        // TODO(Yoav): Move here OriginalSkeletonForest constructor  with all the (facts)
-        // storage-related functions.
-        OriginalSkeletonForest::create(
-            &mut self.storage,
-            contracts_trie_root_hash,
-            classes_trie_root_hash,
-            storage_updates,
-            classes_updates,
-            forest_sorted_indices,
-            &config,
-        )
-    }
-}
-
-impl<S: Storage> ForestWriter for FactsDb<S> {
-    fn write(&mut self, filled_forest: &FilledForest) -> usize {
-        filled_forest.write_to_storage(&mut self.storage)
-    }
-}

crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs

@@ -1,6 +1,6 @@
 use starknet_committer::block_committer::commit::commit_block;
 use starknet_committer::block_committer::input::Config;
-use starknet_committer::db::forest_trait::FactsDb;
+use starknet_committer::db::facts_db::FactsDb;
 use starknet_patricia_storage::map_storage::MapStorage;
 use tracing::info;
 use tracing::level_filters::LevelFilter;

crates/starknet_committer_and_os_cli/src/committer_cli/filled_tree_output/filled_forest.rs

@@ -1,5 +1,6 @@
 use serde::Serialize;
-use starknet_committer::db::forest_trait::{FactsDb, ForestWriter};
+use starknet_committer::db::facts_db::FactsDb;
+use starknet_committer::db::forest_trait::ForestWriter;
 use starknet_committer::forest::filled_forest::FilledForest;
 use starknet_patricia_storage::map_storage::MapStorage;
 

crates/starknet_committer_cli/src/commands.rs

@@ -14,7 +14,8 @@ use starknet_committer::block_committer::input::{
 };
 use starknet_committer::block_committer::state_diff_generator::generate_random_state_diff;
 use starknet_committer::block_committer::timing_util::{Action, TimeMeasurement};
-use starknet_committer::db::forest_trait::{FactsDb, ForestWriter};
+use starknet_committer::db::facts_db::FactsDb;
+use starknet_committer::db::forest_trait::ForestWriter;
 use starknet_patricia_storage::storage_trait::{AsyncStorage, DbKey, Storage, StorageStats};
 use starknet_types_core::felt::Felt;
 use tokio::task::JoinSet;

crates/starknet_os_flow_tests/src/initial_state.rs

@@ -31,7 +31,7 @@ use starknet_api::transaction::constants::DEPLOY_CONTRACT_FUNCTION_ENTRY_POINT_N
 use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, ValidResourceBounds};
 use starknet_api::{calldata, deploy_account_tx_args, invoke_tx_args};
 use starknet_committer::block_committer::input::StateDiff;
-use starknet_committer::db::forest_trait::FactsDb;
+use starknet_committer::db::facts_db::FactsDb;
 use starknet_patricia_storage::map_storage::MapStorage;
 use starknet_types_core::felt::Felt;
 

crates/starknet_os_flow_tests/src/test_manager.rs

@@ -37,7 +37,7 @@ use starknet_api::test_utils::{NonceManager, CHAIN_ID_FOR_TESTS};
 use starknet_api::transaction::fields::{Calldata, Tip};
 use starknet_api::transaction::MessageToL1;
 use starknet_committer::block_committer::input::{IsSubset, StarknetStorageKey, StateDiff};
-use starknet_committer::db::forest_trait::FactsDb;
+use starknet_committer::db::facts_db::FactsDb;
 use starknet_os::hints::hint_implementation::state_diff_encryption::utils::compute_public_keys;
 use starknet_os::io::os_input::{
     OsBlockInput,

crates/starknet_os_flow_tests/src/utils.rs

@@ -45,7 +45,7 @@ use starknet_committer::block_committer::input::{
     StarknetStorageValue,
     StateDiff,
 };
-use starknet_committer::db::forest_trait::FactsDb;
+use starknet_committer::db::facts_db::FactsDb;
 use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use starknet_committer::patricia_merkle_tree::tree::fetch_previous_and_new_patricia_paths;
 use starknet_committer::patricia_merkle_tree::types::{