diff --git a/crates/starknet_committer/src/block_committer/commit_test.rs b/crates/starknet_committer/src/block_committer/commit_test.rs index 96b0a1b55ca..29aa99e6d14 100644 --- a/crates/starknet_committer/src/block_committer/commit_test.rs +++ b/crates/starknet_committer/src/block_committer/commit_test.rs @@ -20,10 +20,10 @@ use crate::block_committer::input::{ StateDiff, }; use crate::block_committer::state_diff_generator::generate_random_state_diff; -use crate::db::facts_db::db::FactsDb; use crate::db::facts_db::types::FactsDbInitialRead; +use crate::db::facts_db::FactsDb; use crate::db::forest_trait::{ForestReader, ForestWriter}; -use crate::db::index_db::db::IndexDb; +use crate::db::index_db::IndexDb; use crate::patricia_merkle_tree::types::CompiledClassHash; static FIRST_CONTRACT_ADDRESS: LazyLock = diff --git a/crates/starknet_committer/src/db/facts_db.rs b/crates/starknet_committer/src/db/facts_db.rs new file mode 100644 index 00000000000..51cd1826504 --- /dev/null +++ b/crates/starknet_committer/src/db/facts_db.rs @@ -0,0 +1,6 @@ +pub mod create_facts_tree; +pub mod db; +pub mod traversal; +pub mod types; + +pub use db::{FactsDb, FactsNodeLayout}; diff --git a/crates/starknet_committer/src/db/facts_db/create_facts_tree.rs b/crates/starknet_committer/src/db/facts_db/create_facts_tree.rs index a08c823dae3..314bdb35a03 100644 --- a/crates/starknet_committer/src/db/facts_db/create_facts_tree.rs +++ b/crates/starknet_committer/src/db/facts_db/create_facts_tree.rs @@ -7,7 +7,7 @@ use starknet_patricia::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndice use starknet_patricia_storage::db_object::HasStaticPrefix; use starknet_patricia_storage::storage_trait::Storage; -use crate::db::facts_db::db::FactsNodeLayout; +use crate::db::facts_db::FactsNodeLayout; use crate::db::trie_traversal::create_original_skeleton_tree; use crate::patricia_merkle_tree::tree::OriginalSkeletonTrieConfig; diff --git a/crates/starknet_committer/src/db/facts_db/create_facts_tree_test.rs b/crates/starknet_committer/src/db/facts_db/create_facts_tree_test.rs index cc5e3a211af..7c87d1f6b07 100644 --- a/crates/starknet_committer/src/db/facts_db/create_facts_tree_test.rs +++ b/crates/starknet_committer/src/db/facts_db/create_facts_tree_test.rs @@ -4,7 +4,7 @@ use starknet_patricia::patricia_merkle_tree::external_test_utils::MockLeaf; use crate::db::create_original_skeleton_tests::case_helpers::CreateTreeCase; use crate::db::create_original_skeleton_tests::{create_tree_cases, test_create_original_skeleton}; -use crate::db::facts_db::db::FactsNodeLayout; +use crate::db::facts_db::FactsNodeLayout; #[apply(create_tree_cases)] #[rstest] diff --git a/crates/starknet_committer/src/db/facts_db/mod.rs b/crates/starknet_committer/src/db/facts_db/mod.rs deleted file mode 100644 index 88a4c36bb04..00000000000 --- a/crates/starknet_committer/src/db/facts_db/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod create_facts_tree; -// TODO(Ariel): Move db.rs to this module and avoid db::fact_db::db path.. -pub mod db; -pub mod traversal; -pub mod types; diff --git a/crates/starknet_committer/src/db/facts_db/traversal.rs b/crates/starknet_committer/src/db/facts_db/traversal.rs index 49ac3f01bb9..9d909e320c0 100644 --- a/crates/starknet_committer/src/db/facts_db/traversal.rs +++ b/crates/starknet_committer/src/db/facts_db/traversal.rs @@ -12,8 +12,8 @@ use starknet_patricia::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndice use starknet_patricia_storage::db_object::HasStaticPrefix; use starknet_patricia_storage::storage_trait::Storage; -use crate::db::facts_db::db::FactsNodeLayout; use crate::db::facts_db::types::FactsSubTree; +use crate::db::facts_db::FactsNodeLayout; use crate::db::trie_traversal::get_roots_from_storage; #[cfg(test)] diff --git a/crates/starknet_committer/src/db/index_db/mod.rs b/crates/starknet_committer/src/db/index_db.rs similarity index 79% rename from crates/starknet_committer/src/db/index_db/mod.rs rename to crates/starknet_committer/src/db/index_db.rs index e9df11bd9f8..c6e3c99907f 100644 --- a/crates/starknet_committer/src/db/index_db/mod.rs +++ b/crates/starknet_committer/src/db/index_db.rs @@ -7,3 +7,5 @@ pub mod serde_tests; #[cfg(test)] pub mod test_utils; pub mod types; + +pub use db::{IndexDb, IndexNodeLayout}; diff --git a/crates/starknet_committer/src/db/index_db/create_index_tree_test.rs b/crates/starknet_committer/src/db/index_db/create_index_tree_test.rs index 8faecb5cf48..e01fa0d18f4 100644 --- a/crates/starknet_committer/src/db/index_db/create_index_tree_test.rs +++ b/crates/starknet_committer/src/db/index_db/create_index_tree_test.rs @@ -9,8 +9,8 @@ use starknet_types_core::felt::Felt; use crate::db::create_original_skeleton_tests::case_helpers::CreateTreeCase; use crate::db::create_original_skeleton_tests::{create_tree_cases, test_create_original_skeleton}; -use crate::db::index_db::db::IndexNodeLayout; use crate::db::index_db::test_utils::convert_facts_db_to_index_db; +use crate::db::index_db::IndexNodeLayout; use crate::hash_function::hash::TreeHashFunctionImpl; impl TreeHashFunction for TreeHashFunctionImpl { diff --git a/crates/starknet_committer/src/forest/skeleton_forest_test.rs b/crates/starknet_committer/src/forest/skeleton_forest_test.rs index d17cd1bd734..3a269f7dd79 100644 --- a/crates/starknet_committer/src/forest/skeleton_forest_test.rs +++ b/crates/starknet_committer/src/forest/skeleton_forest_test.rs @@ -34,11 +34,11 @@ use crate::block_committer::input::{ StarknetStorageValue, StateDiff, }; -use crate::db::facts_db::db::FactsDb; use crate::db::facts_db::types::FactsDbInitialRead; +use crate::db::facts_db::FactsDb; use crate::db::forest_trait::ForestReader; -use crate::db::index_db::db::IndexDb; use crate::db::index_db::test_utils::convert_facts_forest_db_to_index_db; +use crate::db::index_db::IndexDb; use crate::forest::original_skeleton_forest::{ForestSortedIndices, OriginalSkeletonForest}; use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState; use crate::patricia_merkle_tree::types::CompiledClassHash; diff --git a/crates/starknet_committer_and_os_cli/benches/main.rs b/crates/starknet_committer_and_os_cli/benches/main.rs index 0314f4fbfa3..2546cb33841 100644 --- a/crates/starknet_committer_and_os_cli/benches/main.rs +++ b/crates/starknet_committer_and_os_cli/benches/main.rs @@ -13,7 +13,7 @@ use criterion::{criterion_group, criterion_main, BatchSize, Criterion}; use starknet_api::core::ContractAddress; use starknet_committer::block_committer::input::StarknetStorageValue; use starknet_committer::db::external_test_utils::tree_computation_flow; -use starknet_committer::db::facts_db::db::FactsNodeLayout; +use starknet_committer::db::facts_db::FactsNodeLayout; use starknet_committer::hash_function::hash::TreeHashFunctionImpl; use starknet_committer::patricia_merkle_tree::tree::OriginalSkeletonTrieConfig; use starknet_committer_and_os_cli::committer_cli::commands::commit; diff --git a/crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs b/crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs index 8456d3c65fa..a089577a2d3 100644 --- a/crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs +++ b/crates/starknet_committer_and_os_cli/src/committer_cli/commands.rs @@ -1,5 +1,5 @@ use starknet_committer::block_committer::commit::{CommitBlockImpl, CommitBlockTrait}; -use starknet_committer::db::facts_db::db::FactsDb; +use starknet_committer::db::facts_db::FactsDb; use starknet_patricia_storage::map_storage::MapStorage; use tracing::info; use tracing::level_filters::LevelFilter; diff --git a/crates/starknet_committer_and_os_cli/src/committer_cli/filled_tree_output/filled_forest.rs b/crates/starknet_committer_and_os_cli/src/committer_cli/filled_tree_output/filled_forest.rs index 392c81b7f22..d567d47e6a3 100644 --- a/crates/starknet_committer_and_os_cli/src/committer_cli/filled_tree_output/filled_forest.rs +++ b/crates/starknet_committer_and_os_cli/src/committer_cli/filled_tree_output/filled_forest.rs @@ -1,5 +1,5 @@ use serde::Serialize; -use starknet_committer::db::facts_db::db::FactsDb; +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::errors::SerializationResult; diff --git a/crates/starknet_committer_and_os_cli/src/committer_cli/tests/python_tests.rs b/crates/starknet_committer_and_os_cli/src/committer_cli/tests/python_tests.rs index e1c869d3eab..68dc0411287 100644 --- a/crates/starknet_committer_and_os_cli/src/committer_cli/tests/python_tests.rs +++ b/crates/starknet_committer_and_os_cli/src/committer_cli/tests/python_tests.rs @@ -12,7 +12,7 @@ use starknet_committer::block_committer::input::{ }; use starknet_committer::block_committer::random_structs::DummyRandomValue; use starknet_committer::db::external_test_utils::single_tree_flow_test; -use starknet_committer::db::facts_db::db::FactsNodeLayout; +use starknet_committer::db::facts_db::FactsNodeLayout; use starknet_committer::forest::filled_forest::FilledForest; use starknet_committer::hash_function::hash::{ TreeHashFunctionImpl, diff --git a/crates/starknet_committer_and_os_cli/src/committer_cli/tests/regression_tests.rs b/crates/starknet_committer_and_os_cli/src/committer_cli/tests/regression_tests.rs index 343a932351d..86cbd6ed31f 100644 --- a/crates/starknet_committer_and_os_cli/src/committer_cli/tests/regression_tests.rs +++ b/crates/starknet_committer_and_os_cli/src/committer_cli/tests/regression_tests.rs @@ -7,7 +7,7 @@ use serde_json::{Map, Value}; use starknet_api::core::ContractAddress; use starknet_committer::block_committer::input::StarknetStorageValue; use starknet_committer::db::external_test_utils::single_tree_flow_test; -use starknet_committer::db::facts_db::db::FactsNodeLayout; +use starknet_committer::db::facts_db::FactsNodeLayout; use starknet_committer::hash_function::hash::TreeHashFunctionImpl; use starknet_committer::patricia_merkle_tree::tree::OriginalSkeletonTrieConfig; use tempfile::NamedTempFile; diff --git a/crates/starknet_committer_cli/src/commands.rs b/crates/starknet_committer_cli/src/commands.rs index a1f7254edee..f3a7bec9cc3 100644 --- a/crates/starknet_committer_cli/src/commands.rs +++ b/crates/starknet_committer_cli/src/commands.rs @@ -24,8 +24,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::facts_db::db::FactsDb; use starknet_committer::db::facts_db::types::FactsDbInitialRead; +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; diff --git a/crates/starknet_os_flow_tests/src/initial_state.rs b/crates/starknet_os_flow_tests/src/initial_state.rs index 275bcea306b..0a2015c1da1 100644 --- a/crates/starknet_os_flow_tests/src/initial_state.rs +++ b/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::facts_db::db::FactsDb; +use starknet_committer::db::facts_db::FactsDb; use starknet_patricia_storage::map_storage::MapStorage; use starknet_types_core::felt::Felt; diff --git a/crates/starknet_os_flow_tests/src/test_manager.rs b/crates/starknet_os_flow_tests/src/test_manager.rs index a99b17985f9..d3e1f315877 100644 --- a/crates/starknet_os_flow_tests/src/test_manager.rs +++ b/crates/starknet_os_flow_tests/src/test_manager.rs @@ -43,7 +43,7 @@ use starknet_committer::block_committer::input::{ StarknetStorageValue, StateDiff, }; -use starknet_committer::db::facts_db::db::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, diff --git a/crates/starknet_os_flow_tests/src/utils.rs b/crates/starknet_os_flow_tests/src/utils.rs index 07cde4d16ec..4f03e570363 100644 --- a/crates/starknet_os_flow_tests/src/utils.rs +++ b/crates/starknet_os_flow_tests/src/utils.rs @@ -46,8 +46,8 @@ use starknet_committer::block_committer::input::{ StateDiff, }; use starknet_committer::db::facts_db::create_facts_tree::get_leaves; -use starknet_committer::db::facts_db::db::FactsDb; use starknet_committer::db::facts_db::types::FactsDbInitialRead; +use starknet_committer::db::facts_db::FactsDb; use starknet_committer::db::forest_trait::ForestWriter; use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState; use starknet_committer::patricia_merkle_tree::tree::fetch_previous_and_new_patricia_paths;