blockifier_reexecution: merge rpc_state_reader into state_reader

crates/blockifier_reexecution/Cargo.toml

@@ -14,7 +14,6 @@ cairo_native = ["blockifier/cairo_native"]
 apollo_compile_to_casm.workspace = true
 apollo_compile_to_casm_types.workspace = true
 apollo_config.workspace = true
-apollo_rpc.workspace = true
 apollo_rpc_execution.workspace = true
 apollo_sierra_compilation_config.workspace = true
 assert_matches.workspace = true

crates/blockifier_reexecution/src/errors.rs

@@ -8,7 +8,7 @@ use starknet_api::block::GasPrice;
 use starknet_api::StarknetApiError;
 use thiserror::Error;
 
-use crate::rpc_state_reader::rpc_objects::{RpcErrorCode, RpcErrorResponse};
+use crate::state_reader::rpc_objects::{RpcErrorCode, RpcErrorResponse};
 
 #[derive(Debug, Error)]
 pub enum RPCStateReaderError {

crates/blockifier_reexecution/src/lib.rs

@@ -1,7 +1,6 @@
 pub mod cli;
 pub mod compile;
 pub mod errors;
-pub mod rpc_state_reader;
 pub mod serde_utils;
 pub mod state_reader;
 pub mod utils;
@@ -12,10 +11,10 @@ use blockifier::context::BlockContext;
 use blockifier::state::cached_state::StateMaps;
 use blockifier::state::contract_class_manager::ContractClassManager;
 use errors::ReexecutionResult;
-use rpc_state_reader::config::RpcStateReaderConfig;
 use starknet_api::block::BlockNumber;
 use starknet_api::core::ChainId;
 use starknet_api::transaction::Transaction;
+use state_reader::config::RpcStateReaderConfig;
 use state_reader::rpc_state_reader::ConsecutiveRpcStateReaders;
 
 /// Executes a single transaction at the given block number using the RPC state reader.

crates/blockifier_reexecution/src/main.rs

@@ -10,7 +10,7 @@ use blockifier_reexecution::cli::{
     TransactionInput,
     FULL_RESOURCES_DIR,
 };
-use blockifier_reexecution::rpc_state_reader::config::RpcStateReaderConfig;
+use blockifier_reexecution::state_reader::config::RpcStateReaderConfig;
 use blockifier_reexecution::state_reader::offline_state_reader::OfflineConsecutiveStateReaders;
 use blockifier_reexecution::state_reader::reexecution_state_reader::ConsecutiveReexecutionStateReaders;
 use blockifier_reexecution::state_reader::rpc_state_reader::ConsecutiveRpcStateReaders;

crates/blockifier_reexecution/src/state_reader.rs

@@ -1,9 +1,13 @@
+pub mod config;
 pub mod offline_state_reader;
 #[cfg(test)]
 mod offline_state_reader_test;
 #[cfg(test)]
 mod raw_rpc_json_test;
 pub mod reexecution_state_reader;
+pub mod rpc_objects;
 pub mod rpc_state_reader;
+#[cfg(test)]
+mod rpc_state_reader_basic_test;
 #[cfg(all(test, feature = "blockifier_regression_https_testing"))]
 mod rpc_state_reader_test;

crates/blockifier_reexecution/src/state_reader/raw_rpc_json_test.rs

@@ -16,8 +16,8 @@ use starknet_api::{class_hash, compiled_class_hash, contract_address, felt, nonc
 use starknet_core::types::ContractClass;
 
 use crate::compile::legacy_to_contract_class_v0;
-use crate::rpc_state_reader::rpc_objects::BlockHeader;
 use crate::serde_utils::deserialize_transaction_json_to_starknet_api_tx;
+use crate::state_reader::rpc_objects::BlockHeader;
 
 #[fixture]
 fn block_header() -> BlockHeader {

crates/blockifier_reexecution/src/rpc_state_reader/rpc_objects.rs → crates/blockifier_reexecution/src/state_reader/rpc_objects.rs

@@ -44,20 +44,20 @@ pub enum BlockId {
     Number(BlockNumber),
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 pub struct GetNonceParams {
     pub block_id: BlockId,
     pub contract_address: ContractAddress,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 pub struct GetStorageAtParams {
     pub contract_address: ContractAddress,
     pub key: StorageKey,
     pub block_id: BlockId,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 pub struct GetClassHashAtParams {
     pub contract_address: ContractAddress,
     pub block_id: BlockId,