blockifier_reexecution: merge rpc_state_reader into state_reader

Author: lev-starkware

crates/blockifier_reexecution/Cargo.toml

@@ -9,6 +9,7 @@ description = "Tool for re-executing historical Starknet blocks to verify transa
 [features]
 blockifier_regression_https_testing = []
 cairo_native = ["blockifier/cairo_native"]
+testing = []
 
 [dependencies]
 apollo_compile_to_casm.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;