feat: Move Transaction from transaction_execution.rs to transaction.rs

crates/blockifier/src/blockifier/stateful_validator.rs

@@ -17,8 +17,7 @@ use crate::state::errors::StateError;
 use crate::state::state_api::StateReader;
 use crate::transaction::account_transaction::AccountTransaction;
 use crate::transaction::errors::{TransactionExecutionError, TransactionPreValidationError};
-use crate::transaction::transaction_execution::Transaction;
-use crate::transaction::transactions::ValidatableTransaction;
+use crate::transaction::transactions::{Transaction, ValidatableTransaction};
 
 #[cfg(test)]
 #[path = "stateful_validator_test.rs"]

crates/blockifier/src/blockifier/transaction_executor.rs

@@ -22,8 +22,7 @@ use crate::state::errors::StateError;
 use crate::state::state_api::StateReader;
 use crate::transaction::errors::TransactionExecutionError;
 use crate::transaction::objects::TransactionExecutionInfo;
-use crate::transaction::transaction_execution::Transaction;
-use crate::transaction::transactions::{ExecutableTransaction, ExecutionFlags};
+use crate::transaction::transactions::{ExecutableTransaction, ExecutionFlags, Transaction};
 
 #[cfg(test)]
 #[path = "transaction_executor_test.rs"]

crates/blockifier/src/blockifier/transaction_executor_test.rs

@@ -26,8 +26,7 @@ use crate::transaction::test_utils::{
     account_invoke_tx, block_context, calculate_class_info_for_testing, create_test_init_data,
     emit_n_events_tx, l1_resource_bounds, TestInitData,
 };
-use crate::transaction::transaction_execution::Transaction;
-use crate::transaction::transactions::L1HandlerTransaction;
+use crate::transaction::transactions::{L1HandlerTransaction, Transaction};
 use crate::{declare_tx_args, deploy_account_tx_args, invoke_tx_args, nonce};
 
 fn tx_executor_test_body<S: StateReader>(

crates/blockifier/src/concurrency/worker_logic.rs

@@ -20,8 +20,7 @@ use crate::state::cached_state::{
 };
 use crate::state::state_api::{StateReader, UpdatableState};
 use crate::transaction::objects::{TransactionExecutionInfo, TransactionExecutionResult};
-use crate::transaction::transaction_execution::Transaction;
-use crate::transaction::transactions::{ExecutableTransaction, ExecutionFlags};
+use crate::transaction::transactions::{ExecutableTransaction, ExecutionFlags, Transaction};
 
 #[cfg(test)]
 #[path = "worker_logic_test.rs"]

crates/blockifier/src/concurrency/worker_logic_test.rs

@@ -36,7 +36,7 @@ use crate::transaction::test_utils::{
     account_invoke_tx, calculate_class_info_for_testing, emit_n_events_tx, max_fee,
     max_resource_bounds,
 };
-use crate::transaction::transaction_execution::Transaction;
+use crate::transaction::transactions::Transaction;
 use crate::{declare_tx_args, invoke_tx_args, nonce, storage_key};
 
 fn trivial_calldata_invoke_tx(

crates/blockifier/src/test_utils/transfers_generator.rs

@@ -17,7 +17,7 @@ use crate::test_utils::invoke::invoke_tx;
 use crate::test_utils::{CairoVersion, NonceManager, BALANCE, MAX_FEE};
 use crate::transaction::account_transaction::AccountTransaction;
 use crate::transaction::constants::TRANSFER_ENTRY_POINT_NAME;
-use crate::transaction::transaction_execution::Transaction;
+use crate::transaction::transactions::Transaction;
 
 const N_ACCOUNTS: u16 = 10000;
 const N_TXS: usize = 1000;

crates/blockifier/src/transaction.rs

@@ -6,7 +6,6 @@ pub mod errors;
 pub mod objects;
 #[cfg(any(feature = "testing", test))]
 pub mod test_utils;
-pub mod transaction_execution;
 pub mod transaction_types;
 pub mod transaction_utils;
 pub mod transactions;