blockifier: add constructor logic to state reader and contract manager (#10301)

Author: ArniStarkware

crates/apollo_batcher/src/block_builder.rs

@@ -725,11 +725,11 @@ impl BlockBuilderFactory {
         let class_reader = Some(ClassReader { reader: self.class_manager_client.clone(), runtime });
         let apollo_reader =
             ApolloReader::new_with_class_reader(self.storage_reader.clone(), height, class_reader);
-        let state_reader = StateReaderAndContractManager {
-            state_reader: apollo_reader,
-            contract_class_manager: self.contract_class_manager.clone(),
-            class_cache_metrics: BATCHER_CLASS_CACHE_METRICS,
-        };
+        let state_reader = StateReaderAndContractManager::new(
+            apollo_reader,
+            self.contract_class_manager.clone(),
+            BATCHER_CLASS_CACHE_METRICS,
+        );
 
         let executor = ConcurrentTransactionExecutor::start_block(
             state_reader,

crates/apollo_gateway/src/stateful_transaction_validator.rs

@@ -80,11 +80,11 @@ impl StatefulTransactionValidatorFactoryTrait for StatefulTransactionValidatorFa
             })?;
         let latest_block_info = get_latest_block_info(&state_reader)?;
 
-        let state_reader_and_contract_manager = StateReaderAndContractManager {
+        let state_reader_and_contract_manager = StateReaderAndContractManager::new(
             state_reader,
-            contract_class_manager: self.contract_class_manager.clone(),
-            class_cache_metrics: GATEWAY_CLASS_CACHE_METRICS,
-        };
+            self.contract_class_manager.clone(),
+            GATEWAY_CLASS_CACHE_METRICS,
+        );
 
         let state = CachedState::new(state_reader_and_contract_manager);
         let mut versioned_constants = VersionedConstants::get_versioned_constants(

crates/blockifier/src/state/state_reader_and_contract_manager.rs

@@ -20,8 +20,18 @@ pub trait FetchCompiledClasses: StateReader {
 
 pub struct StateReaderAndContractManager<S: FetchCompiledClasses> {
     pub state_reader: S,
-    pub contract_class_manager: ContractClassManager,
-    pub class_cache_metrics: CacheMetrics,
+    contract_class_manager: ContractClassManager,
+    class_cache_metrics: CacheMetrics,
+}
+
+impl<S: FetchCompiledClasses> StateReaderAndContractManager<S> {
+    pub fn new(
+        state_reader: S,
+        contract_class_manager: ContractClassManager,
+        class_cache_metrics: CacheMetrics,
+    ) -> Self {
+        Self { state_reader, contract_class_manager, class_cache_metrics }
+    }
 }
 
 impl<S: FetchCompiledClasses> StateReaderAndContractManager<S> {

crates/blockifier/src/test_utils/initial_test_state.rs

@@ -200,12 +200,12 @@ pub fn test_state_inner_with_contract_manager(
 }
 
 pub fn state_reader_and_contract_manager_for_testing<Reader: FetchCompiledClasses>(
-    reader: Reader,
-    manager: ContractClassManager,
+    state_reader: Reader,
+    contract_class_manager: ContractClassManager,
 ) -> StateReaderAndContractManager<Reader> {
-    StateReaderAndContractManager {
-        state_reader: reader,
-        contract_class_manager: manager,
-        class_cache_metrics: BLOCKIFIER_CLASS_CACHE_METRICS,
-    }
+    StateReaderAndContractManager::new(
+        state_reader,
+        contract_class_manager,
+        BLOCKIFIER_CLASS_CACHE_METRICS,
+    )
 }

crates/native_blockifier/src/py_block_executor.rs

@@ -428,11 +428,11 @@ impl PyBlockExecutor {
         self.storage.validate_aligned(next_block_number.0);
         let apollo_reader = ApolloReader::new(self.storage.reader().clone(), next_block_number);
 
-        StateReaderAndContractManager {
-            state_reader: apollo_reader,
-            contract_class_manager: self.contract_class_manager.clone(),
-            class_cache_metrics: NATIVE_BLOCKIFIER_CLASS_CACHE_METRICS,
-        }
+        StateReaderAndContractManager::new(
+            apollo_reader,
+            self.contract_class_manager.clone(),
+            NATIVE_BLOCKIFIER_CLASS_CACHE_METRICS,
+        )
     }
 
     pub fn create_for_testing_with_storage(storage: impl Storage + Send + 'static) -> Self {