blockifier_reexecution: move files location

Author: AvivYossef-starkware

crates/apollo_http_server/src/http_server.rs

@@ -22,7 +22,7 @@ use axum::extract::State;
 use axum::http::HeaderMap;
 use axum::routing::{get, post};
 use axum::{async_trait, Json, Router};
-use blockifier_reexecution::state_reader::serde_utils::deserialize_transaction_json_to_starknet_api_tx;
+use blockifier_reexecution::serde_utils::deserialize_transaction_json_to_starknet_api_tx;
 use serde::de::Error;
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::serde_utils::bytes_from_hex_str;

…fier_reexecution/src/state_reader/cli.rs crates/blockifier_reexecution/src/cli.rscrates/blockifier_reexecution/src/state_reader/cli.rs renamed to crates/blockifier_reexecution/src/cli.rs crates/blockifier_reexecution/src/state_reader/cli.rs renamed to crates/blockifier_reexecution/src/cli.rs

@@ -5,7 +5,7 @@ use clap::{Args, Parser, Subcommand};
 use starknet_api::block::BlockNumber;
 use starknet_api::core::{chain_id_from_hex_str, ChainId};
 
-use crate::state_reader::errors::{ReexecutionError, ReexecutionResult};
+use crate::errors::{ReexecutionError, ReexecutionResult};
 
 pub const FULL_RESOURCES_DIR: &str = "./crates/blockifier_reexecution/resources";
 

…_reexecution/src/state_reader/compile.rs …es/blockifier_reexecution/src/compile.rscrates/blockifier_reexecution/src/state_reader/compile.rs renamed to crates/blockifier_reexecution/src/compile.rs crates/blockifier_reexecution/src/state_reader/compile.rs renamed to crates/blockifier_reexecution/src/compile.rs

@@ -1 +1,6 @@
+pub mod cli;
+pub mod compile;
+mod errors;
+pub mod serde_utils;
 pub mod state_reader;
+pub mod utils;

…r_reexecution/src/state_reader/errors.rs …tes/blockifier_reexecution/src/errors.rscrates/blockifier_reexecution/src/state_reader/errors.rs renamed to crates/blockifier_reexecution/src/errors.rs crates/blockifier_reexecution/src/state_reader/errors.rs renamed to crates/blockifier_reexecution/src/errors.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use apollo_gateway_config::config::RpcStateReaderConfig;
 use blockifier::blockifier::config::ContractClassManagerConfig;
 use blockifier::state::contract_class_manager::ContractClassManager;
-use blockifier_reexecution::state_reader::cli::{
+use blockifier_reexecution::cli::{
     parse_block_numbers_args,
     BlockifierReexecutionCliArgs,
     Command,

crates/blockifier_reexecution/src/lib.rs

@@ -8,7 +8,7 @@ use starknet_api::transaction::{
     Transaction,
 };
 
-use crate::state_reader::errors::ReexecutionResult;
+use crate::errors::ReexecutionResult;
 
 /// In old transaction, the resource bounds names are lowercase.
 /// need to convert to uppercase for deserialization to work.

crates/blockifier_reexecution/src/main.rs

@@ -1,14 +1,9 @@
-pub mod cli;
-pub mod compile;
-mod errors;
 pub mod offline_state_reader;
 #[cfg(test)]
-pub mod raw_rpc_json_test;
-pub mod reexecution_state_reader;
+mod offline_state_reader_test;
 #[cfg(test)]
-pub mod reexecution_test;
-#[cfg(all(test, feature = "blockifier_regression_https_testing"))]
-pub mod rpc_https_test;
+mod raw_rpc_json_test;
+pub mod reexecution_state_reader;
 pub mod rpc_state_reader;
-pub mod serde_utils;
-pub mod utils;
+#[cfg(all(test, feature = "blockifier_regression_https_testing"))]
+mod rpc_state_reader_test;

…xecution/src/state_reader/serde_utils.rs …lockifier_reexecution/src/serde_utils.rscrates/blockifier_reexecution/src/state_reader/serde_utils.rs renamed to crates/blockifier_reexecution/src/serde_utils.rs crates/blockifier_reexecution/src/state_reader/serde_utils.rs renamed to crates/blockifier_reexecution/src/serde_utils.rs

@@ -26,17 +26,14 @@ use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
 use starknet_core::types::ContractClass as StarknetContractClass;
 use starknet_types_core::felt::Felt;
 
-use crate::state_reader::compile::{
-    legacy_to_contract_class_v0,
-    sierra_to_versioned_contract_class_v1,
-};
-use crate::state_reader::errors::ReexecutionResult;
+use crate::compile::{legacy_to_contract_class_v0, sierra_to_versioned_contract_class_v1};
+use crate::errors::ReexecutionResult;
 use crate::state_reader::reexecution_state_reader::{
     ConsecutiveReexecutionStateReaders,
     ReexecutionStateReader,
 };
 use crate::state_reader::rpc_state_reader::StarknetContractClassMapping;
-use crate::state_reader::utils::{get_chain_info, ReexecutionStateMaps};
+use crate::utils::{get_chain_info, ReexecutionStateMaps};
 
 pub struct OfflineReexecutionData {
     offline_state_reader_prev_block: OfflineStateReader,

crates/blockifier_reexecution/src/state_reader.rs

@@ -3,7 +3,7 @@ use blockifier::state::contract_class_manager::ContractClassManager;
 use rstest::rstest;
 use starknet_api::block::BlockNumber;
 
-use crate::state_reader::cli::get_block_numbers_for_reexecution;
+use crate::cli::get_block_numbers_for_reexecution;
 use crate::state_reader::offline_state_reader::OfflineConsecutiveStateReaders;
 use crate::state_reader::reexecution_state_reader::ConsecutiveReexecutionStateReaders;