blockifier: box ValidateTransactionError in TransactionExecutionError

Author: dorimedini-starkware

crates/apollo_rpc_execution/src/execution_test.rs

@@ -818,7 +818,7 @@ fn blockifier_error_mapping() {
 
     let child = blockifier::execution::errors::EntryPointExecutionError::RecursionDepthExceeded;
     let blockifier_err = BlockifierTransactionExecutionError::ValidateTransactionError {
-        error: child,
+        error: Box::new(child),
         class_hash,
         storage_address,
         selector,

crates/blockifier/src/test_utils.rs

@@ -260,7 +260,7 @@ macro_rules! check_tx_execution_error_inner {
         } else {
             match $error {
                 TransactionExecutionError::ValidateTransactionError { error, .. } => {
-                    $crate::check_entry_point_execution_error!(&error, $expected_hint)
+                    $crate::check_entry_point_execution_error!(&*(error.as_ref()), $expected_hint)
                 }
                 _ => panic!("Unexpected structure for error: {:?}", $error),
             }

crates/blockifier/src/transaction/account_transaction.rs

@@ -919,7 +919,7 @@ impl ValidatableTransaction for AccountTransaction {
         let validate_call_info = validate_call
             .execute(state, &mut context, remaining_validation_gas)
             .map_err(|error| TransactionExecutionError::ValidateTransactionError {
-                error,
+                error: Box::new(error),
                 class_hash,
                 storage_address,
                 selector: validate_selector,

crates/blockifier/src/transaction/errors.rs

@@ -117,7 +117,7 @@ pub enum TransactionExecutionError {
     TransactionTooLarge { max_capacity: Box<BouncerWeights>, tx_size: Box<BouncerWeights> },
     #[error("{}", gen_tx_execution_error_trace(self))]
     ValidateTransactionError {
-        error: EntryPointExecutionError,
+        error: Box<EntryPointExecutionError>,
         class_hash: ClassHash,
         storage_address: ContractAddress,
         selector: EntryPointSelector,

crates/blockifier/src/transaction/transactions_test.rs

@@ -2242,12 +2242,14 @@ fn check_native_validate_error(
     validate_constructor: bool,
 ) {
     let syscall_error = match error {
-        TransactionExecutionError::ValidateTransactionError {
-            error: EntryPointExecutionError::NativeUnrecoverableError(boxed_syscall_error),
-            ..
-        } => {
-            assert!(!validate_constructor);
-            boxed_syscall_error
+        TransactionExecutionError::ValidateTransactionError { error: boxed_error, .. } => {
+            match *boxed_error {
+                EntryPointExecutionError::NativeUnrecoverableError(boxed_syscall_error) => {
+                    assert!(!validate_constructor);
+                    boxed_syscall_error
+                }
+                _ => panic!("Unexpected error: {:?}", boxed_error),
+            }
         }
         TransactionExecutionError::ContractConstructorExecutionFailed(
             ConstructorEntryPointExecutionError::ExecutionError { error: boxed_error, .. },
@@ -2333,7 +2335,7 @@ fn test_validate_accounts_tx(
     match cairo_version {
         CairoVersion::Cairo0 | CairoVersion::Cairo1(RunnableCairo1::Casm) => {
             check_tx_execution_error_for_custom_hint!(
-                &error,
+                error,
                 "Unauthorized syscall call_contract in execution mode Validate.",
                 validate_constructor,
             );