starknet_committer: rename to reader config (#10782)

Author: yoavGrs

crates/starknet_committer/src/block_committer/commit.rs

@@ -8,9 +8,9 @@ use crate::block_committer::errors::BlockCommitmentError;
 use crate::block_committer::input::{
     contract_address_into_node_index,
     Config,
-    ConfigImpl,
     Input,
     InputContext,
+    ReaderConfig,
     StateDiff,
 };
 use crate::block_committer::timing_util::{Action, TimeMeasurement};
@@ -26,7 +26,7 @@ type BlockCommitmentResult<T> = Result<T, BlockCommitmentError>;
 
 // TODO(Yoav): Include InputContext and ForestReader as arguments of the Layer, when it's ready.
 pub async fn commit_block<I: InputContext, Reader: ForestReader<I>>(
-    input: Input<ConfigImpl, I>,
+    input: Input<ReaderConfig, I>,
     trie_reader: &mut Reader,
     mut time_measurement: Option<&mut TimeMeasurement>,
 ) -> BlockCommitmentResult<FilledForest> {

crates/starknet_committer/src/block_committer/input.rs

@@ -130,12 +130,12 @@ pub trait Config: Debug + Eq + PartialEq {
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ConfigImpl {
+pub struct ReaderConfig {
     warn_on_trivial_modifications: bool,
     log_level: LevelFilter,
 }
 
-impl Config for ConfigImpl {
+impl Config for ReaderConfig {
     fn warn_on_trivial_modifications(&self) -> bool {
         self.warn_on_trivial_modifications
     }
@@ -145,13 +145,13 @@ impl Config for ConfigImpl {
     }
 }
 
-impl ConfigImpl {
+impl ReaderConfig {
     pub fn new(warn_on_trivial_modifications: bool, log_level: LevelFilter) -> Self {
         Self { warn_on_trivial_modifications, log_level }
     }
 }
 
-impl Default for ConfigImpl {
+impl Default for ReaderConfig {
     fn default() -> Self {
         Self { warn_on_trivial_modifications: false, log_level: LevelFilter::INFO }
     }

crates/starknet_committer/src/block_committer/timing_util.rs

@@ -7,9 +7,9 @@ use starknet_api::hash::HashOutput;
 use starknet_types_core::felt::Felt;
 use tracing::info;
 
-use crate::block_committer::input::{ConfigImpl, FactsDbInitialRead, Input};
+use crate::block_committer::input::{FactsDbInitialRead, Input, ReaderConfig};
 
-pub type FactsDbInputImpl = Input<ConfigImpl, FactsDbInitialRead>;
+pub type FactsDbInputImpl = Input<ReaderConfig, FactsDbInitialRead>;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum Action {

crates/starknet_committer/src/db/facts_db/db.rs

@@ -20,8 +20,8 @@ use starknet_patricia_storage::storage_trait::{
 use crate::block_committer::input::{
     contract_address_into_node_index,
     Config,
-    ConfigImpl,
     FactsDbInitialRead,
+    ReaderConfig,
     StarknetStorageValue,
 };
 use crate::db::facts_db::create_facts_tree::{
@@ -142,7 +142,7 @@ impl<S: Storage> ForestReader<FactsDbInitialRead> for FactsDb<S> {
         storage_updates: &'a HashMap<ContractAddress, LeafModifications<StarknetStorageValue>>,
         classes_updates: &'a LeafModifications<CompiledClassHash>,
         forest_sorted_indices: &'a ForestSortedIndices<'a>,
-        config: ConfigImpl,
+        config: ReaderConfig,
     ) -> ForestResult<(OriginalSkeletonForest<'a>, HashMap<NodeIndex, ContractState>)> {
         let (contracts_trie, original_contracts_trie_leaves) = self
             .create_contracts_trie(

crates/starknet_committer/src/db/forest_trait.rs

@@ -7,7 +7,7 @@ use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
 use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
 use starknet_patricia_storage::storage_trait::{DbHashMap, DbKey, DbValue, Storage};
 
-use crate::block_committer::input::{ConfigImpl, InputContext, StarknetStorageValue};
+use crate::block_committer::input::{InputContext, ReaderConfig, StarknetStorageValue};
 use crate::forest::filled_forest::FilledForest;
 use crate::forest::forest_errors::ForestResult;
 use crate::forest::original_skeleton_forest::{ForestSortedIndices, OriginalSkeletonForest};
@@ -56,7 +56,7 @@ pub trait ForestReader<I: InputContext> {
         classes_updates: &'a LeafModifications<CompiledClassHash>,
         forest_sorted_indices: &'a ForestSortedIndices<'a>,
         // TODO(Yoav): Change to 'impl Config' or delete this trait
-        config: ConfigImpl,
+        config: ReaderConfig,
     ) -> ForestResult<(OriginalSkeletonForest<'a>, HashMap<NodeIndex, ContractState>)>;
 }
 

crates/starknet_committer/src/forest/skeleton_forest_test.rs

@@ -26,9 +26,9 @@ use tracing::level_filters::LevelFilter;
 use crate::block_committer::commit::get_all_modified_indices;
 use crate::block_committer::input::{
     contract_address_into_node_index,
-    ConfigImpl,
     FactsDbInitialRead,
     Input,
+    ReaderConfig,
     StarknetStorageKey,
     StarknetStorageValue,
     StateDiff,
@@ -148,7 +148,7 @@ pub(crate) fn create_contract_state_leaf_entry(val: u128) -> (DbKey, DbValue) {
             contracts_trie_root_hash: HashOutput(Felt::from(861_u128 + 248_u128)),
             classes_trie_root_hash: HashOutput(Felt::from(155_u128 + 248_u128)),
         }),
-        config: ConfigImpl::new(true, LevelFilter::DEBUG),
+        config: ReaderConfig::new(true, LevelFilter::DEBUG),
     },
     MapStorage(DbHashMap::from([
         // Roots.
@@ -297,7 +297,7 @@ pub(crate) fn create_contract_state_leaf_entry(val: u128) -> (DbKey, DbValue) {
         vec![7, 6, 0],
 )]
 async fn test_create_original_skeleton_forest(
-    #[case] input: Input<ConfigImpl, FactsDbInitialRead>,
+    #[case] input: Input<ReaderConfig, FactsDbInitialRead>,
     #[case] storage: MapStorage,
     #[case] expected_forest: OriginalSkeletonForest<'_>,
     #[case] expected_original_contracts_trie_leaves: HashMap<ContractAddress, ContractState>,
@@ -324,7 +324,7 @@ async fn test_create_original_skeleton_forest(
             &actual_storage_updates,
             &actual_classes_updates,
             &forest_sorted_indices,
-            ConfigImpl::new(false, LevelFilter::DEBUG),
+            ReaderConfig::new(false, LevelFilter::DEBUG),
         )
         .await
         .unwrap();

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/cast.rs

@@ -3,9 +3,9 @@ use std::collections::HashMap;
 use starknet_api::core::{ClassHash, ContractAddress, Nonce};
 use starknet_api::hash::{HashOutput, StateRoots};
 use starknet_committer::block_committer::input::{
-    ConfigImpl,
     FactsDbInitialRead,
     Input,
+    ReaderConfig,
     StarknetStorageKey,
     StarknetStorageValue,
     StateDiff,
@@ -18,7 +18,7 @@ use starknet_types_core::felt::Felt;
 
 use crate::committer_cli::parse_input::raw_input::RawInput;
 
-pub type FactsDbInputImpl = Input<ConfigImpl, FactsDbInitialRead>;
+pub type FactsDbInputImpl = Input<ReaderConfig, FactsDbInitialRead>;
 
 #[derive(Debug, PartialEq)]
 pub struct CommitterFactsDbInputImpl {

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/raw_input.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use serde_repr::Deserialize_repr;
-use starknet_committer::block_committer::input::ConfigImpl;
+use starknet_committer::block_committer::input::ReaderConfig;
 use tracing::level_filters::LevelFilter;
 type RawFelt = [u8; 32];
 
@@ -43,7 +43,7 @@ pub(crate) enum PythonLogLevel {
     Debug = 10,
 }
 
-impl From<RawConfigImpl> for ConfigImpl {
+impl From<RawConfigImpl> for ReaderConfig {
     fn from(raw_config: RawConfigImpl) -> Self {
         let log_level = match raw_config.log_level {
             PythonLogLevel::NotSet => LevelFilter::TRACE,
@@ -52,7 +52,7 @@ impl From<RawConfigImpl> for ConfigImpl {
             PythonLogLevel::Warning => LevelFilter::WARN,
             PythonLogLevel::Error | PythonLogLevel::Critical => LevelFilter::ERROR,
         };
-        ConfigImpl::new(raw_config.warn_on_trivial_modifications, log_level)
+        ReaderConfig::new(raw_config.warn_on_trivial_modifications, log_level)
     }
 }
 

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/read_test.rs

@@ -5,9 +5,9 @@ use pretty_assertions::assert_eq;
 use starknet_api::core::{ClassHash, ContractAddress, Nonce};
 use starknet_api::hash::{HashOutput, StateRoots};
 use starknet_committer::block_committer::input::{
-    ConfigImpl,
     FactsDbInitialRead,
     Input,
+    ReaderConfig,
     StarknetStorageKey,
     StarknetStorageValue,
     StateDiff,
@@ -220,7 +220,7 @@ fn test_simple_input_parsing() {
             contracts_trie_root_hash: expected_contracts_trie_root_hash,
             classes_trie_root_hash: expected_classes_trie_root_hash,
         }),
-        config: ConfigImpl::new(true, LevelFilter::DEBUG),
+        config: ReaderConfig::new(true, LevelFilter::DEBUG),
     };
     assert_eq!(
         parse_input(input).unwrap(),

crates/starknet_committer_cli/src/commands.rs

@@ -7,9 +7,9 @@ use rand::{Rng, SeedableRng};
 use starknet_api::hash::{HashOutput, StateRoots};
 use starknet_committer::block_committer::commit::commit_block;
 use starknet_committer::block_committer::input::{
-    ConfigImpl,
     FactsDbInitialRead,
     Input,
+    ReaderConfig,
     StarknetStorageKey,
     StateDiff,
 };
@@ -33,7 +33,7 @@ use crate::args::{
     DEFAULT_DATA_PATH,
 };
 
-pub type InputImpl = Input<ConfigImpl, FactsDbInitialRead>;
+pub type InputImpl = Input<ReaderConfig, FactsDbInitialRead>;
 
 const FLAVOR_PERIOD_MANY_WINDOW: usize = 10;
 const FLAVOR_PERIOD_PERIOD: usize = 500;
@@ -352,7 +352,7 @@ pub async fn run_storage_benchmark<S: Storage>(
                 contracts_trie_root_hash,
                 classes_trie_root_hash,
             }),
-            config: ConfigImpl::default(),
+            config: ReaderConfig::default(),
         };
 
         time_measurement.start_measurement(Action::EndToEnd);