starknet_committer: move random structs from cli

Author: yoavGrs

Cargo.lock

@@ -7,14 +7,19 @@ license.workspace = true
 description = "Computes and manages Starknet state."
 
 [dependencies]
+ethnum.workspace = true
 hex.workspace = true
 pretty_assertions.workspace = true
+rand.workspace = true
+rand_distr.workspace = true
 rstest.workspace = true
 serde_json.workspace = true
 starknet-types-core = { workspace = true, features = ["hash"] }
 starknet_api.workspace = true
 starknet_patricia.workspace = true
 starknet_patricia_storage.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["rt"] }
 tracing.workspace = true
@@ -25,3 +30,8 @@ starknet_patricia = { workspace = true, features = ["testing"] }
 
 [lints]
 workspace = true
+
+# Optional dependencies required for tests and the testing feature.
+# See [here](https://github.com/bnjbvr/cargo-machete/issues/128).
+[package.metadata.cargo-machete]
+ignored = ["strum_macros"]

crates/starknet_committer/Cargo.toml

@@ -1,3 +1,4 @@
 pub mod commit;
 pub mod errors;
 pub mod input;
+pub mod random_structs;

crates/starknet_committer/src/block_committer.rs

@@ -7,16 +7,6 @@ use rand::Rng;
 use rand_distr::num_traits::ToPrimitive;
 use rand_distr::{Distribution, Geometric};
 use starknet_api::core::{ClassHash, ContractAddress, Nonce, PATRICIA_KEY_UPPER_BOUND};
-use starknet_committer::block_committer::input::StarknetStorageValue;
-use starknet_committer::forest::filled_forest::FilledForest;
-use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use starknet_committer::patricia_merkle_tree::types::{
-    ClassesTrie,
-    CompiledClassHash,
-    ContractsTrie,
-    StorageTrie,
-    StorageTrieMap,
-};
 use starknet_patricia::felt::u256_from_felt;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::external_test_utils::{
@@ -37,6 +27,17 @@ use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
 use starknet_types_core::felt::Felt;
 use strum::IntoEnumIterator;
 
+use crate::block_committer::input::StarknetStorageValue;
+use crate::forest::filled_forest::FilledForest;
+use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
+use crate::patricia_merkle_tree::types::{
+    ClassesTrie,
+    CompiledClassHash,
+    ContractsTrie,
+    StorageTrie,
+    StorageTrieMap,
+};
+
 pub trait RandomValue {
     fn random<R: Rng>(rng: &mut R, max: Option<U256>) -> Self;
 }

crates/starknet_committer_and_os_cli/src/committer_cli/tests/utils/random_structs.rs renamed to crates/starknet_committer/src/block_committer/random_structs.rs

@@ -45,8 +45,6 @@ starknet_committer.workspace = true
 starknet_os = { workspace = true, features = ["deserialize", "testing"] }
 starknet_patricia = { workspace = true, features = ["testing"] }
 starknet_patricia_storage.workspace = true
-strum.workspace = true
-strum_macros.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tracing-subscriber.workspace = true
@@ -60,4 +58,4 @@ path = "benches/main.rs"
 # Optional dependencies required for tests and the testing feature.
 # See [here](https://github.com/bnjbvr/cargo-machete/issues/128).
 [package.metadata.cargo-machete]
-ignored = ["hex", "strum_macros"]
+ignored = ["hex"]

crates/starknet_committer_and_os_cli/Cargo.toml

@@ -16,7 +16,7 @@ use starknet_committer::patricia_merkle_tree::tree::OriginalSkeletonStorageTrieC
 use starknet_committer_and_os_cli::committer_cli::commands::commit;
 use starknet_committer_and_os_cli::committer_cli::parse_input::cast::CommitterInputImpl;
 use starknet_committer_and_os_cli::committer_cli::parse_input::read::parse_input;
-use starknet_committer_and_os_cli::committer_cli::tests::utils::parse_from_python::TreeFlowInput;
+use starknet_committer_and_os_cli::committer_cli::tests::parse_from_python::TreeFlowInput;
 use starknet_patricia::patricia_merkle_tree::external_test_utils::tree_computation_flow;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
 use starknet_patricia::patricia_merkle_tree::types::NodeIndex;

crates/starknet_committer_and_os_cli/benches/main.rs

@@ -1,4 +1,4 @@
+pub mod parse_from_python;
 pub mod python_tests;
 #[cfg(test)]
 pub mod regression_tests;
-pub mod utils;

crates/starknet_committer_and_os_cli/src/committer_cli/tests.rs

@@ -9,6 +9,7 @@ use starknet_committer::block_committer::input::{
     StarknetStorageValue,
     StateDiff,
 };
+use starknet_committer::block_committer::random_structs::DummyRandomValue;
 use starknet_committer::forest::filled_forest::FilledForest;
 use starknet_committer::hash_function::hash::TreeHashFunctionImpl;
 use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState;
@@ -34,12 +35,13 @@ use starknet_types_core::hash::{Pedersen, StarkHash};
 use thiserror;
 use tracing::{debug, error, info, warn};
 
-use super::utils::parse_from_python::TreeFlowInput;
 use crate::committer_cli::filled_tree_output::filled_forest::SerializedForest;
 use crate::committer_cli::parse_input::cast::CommitterInputImpl;
 use crate::committer_cli::parse_input::read::parse_input;
-use crate::committer_cli::tests::utils::parse_from_python::parse_input_single_storage_tree_flow_test;
-use crate::committer_cli::tests::utils::random_structs::DummyRandomValue;
+use crate::committer_cli::tests::parse_from_python::{
+    parse_input_single_storage_tree_flow_test,
+    TreeFlowInput,
+};
 use crate::shared_utils::types::{PythonTestError, PythonTestResult, PythonTestRunner};
 
 pub type CommitterPythonTestError = PythonTestError<CommitterSpecificTestError>;

crates/starknet_committer_and_os_cli/src/committer_cli/tests/utils/parse_from_python.rs renamed to crates/starknet_committer_and_os_cli/src/committer_cli/tests/parse_from_python.rs

@@ -10,11 +10,13 @@ use starknet_committer::patricia_merkle_tree::tree::OriginalSkeletonStorageTrieC
 use starknet_patricia::patricia_merkle_tree::external_test_utils::single_tree_flow_test;
 use tempfile::NamedTempFile;
 
-use super::utils::parse_from_python::parse_input_single_storage_tree_flow_test;
 use crate::committer_cli::commands::commit;
 use crate::committer_cli::parse_input::cast::CommitterInputImpl;
 use crate::committer_cli::parse_input::read::parse_input;
-use crate::committer_cli::tests::utils::parse_from_python::TreeFlowInput;
+use crate::committer_cli::tests::parse_from_python::{
+    parse_input_single_storage_tree_flow_test,
+    TreeFlowInput,
+};
 
 // TODO(Aner, 20/06/2024): these tests needs to be fixed to be run correctly in the CI:
 // 1. Fix the test to measure cpu_time and not wall_time.