blockifier: box ExecutionError in ctor error

Author: dorimedini-starkware

crates/apollo_rpc_execution/src/execution_test.rs

@@ -785,7 +785,7 @@ fn blockifier_error_mapping() {
 
     let blockifier_err = BlockifierTransactionExecutionError::ContractConstructorExecutionFailed(
         ConstructorEntryPointExecutionError::ExecutionError {
-            error: child,
+            error: Box::new(child),
             class_hash,
             contract_address: storage_address,
             constructor_selector: None,

crates/blockifier/src/execution/errors.rs

@@ -121,7 +121,7 @@ pub enum ConstructorEntryPointExecutionError {
     )]
     ExecutionError {
         #[source]
-        error: EntryPointExecutionError,
+        error: Box<EntryPointExecutionError>,
         class_hash: ClassHash,
         contract_address: ContractAddress,
         constructor_selector: Option<EntryPointSelector>,
@@ -135,7 +135,7 @@ impl ConstructorEntryPointExecutionError {
         selector: Option<EntryPointSelector>,
     ) -> Self {
         Self::ExecutionError {
-            error,
+            error: Box::new(error),
             class_hash: ctor_context.class_hash,
             contract_address: ctor_context.storage_address,
             constructor_selector: selector,

crates/blockifier/src/test_utils.rs

@@ -253,7 +253,7 @@ macro_rules! check_tx_execution_error_inner {
                 TransactionExecutionError::ContractConstructorExecutionFailed(
                     ConstructorEntryPointExecutionError::ExecutionError { 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/transactions_test.rs

@@ -2168,13 +2168,11 @@ fn test_deploy_account_tx(
     assert_matches!(
         error,
         TransactionExecutionError::ContractConstructorExecutionFailed(
-            ConstructorEntryPointExecutionError::ExecutionError {
-                error: EntryPointExecutionError::StateError(
-                    StateError::UnavailableContractAddress(_)
-                ),
-                ..
-            }
+            ConstructorEntryPointExecutionError::ExecutionError { error, .. }
         )
+        if matches!(*error, EntryPointExecutionError::StateError(
+            StateError::UnavailableContractAddress(_)
+        ))
     );
 }
 
@@ -2208,14 +2206,13 @@ fn test_fail_deploy_account_undeclared_class_hash(
     assert_matches!(
         error,
         TransactionExecutionError::ContractConstructorExecutionFailed(
-            ConstructorEntryPointExecutionError::ExecutionError {
-                error: EntryPointExecutionError::StateError(
-                    StateError::UndeclaredClassHash(class_hash)
-                ),
-                ..
-            }
+            ConstructorEntryPointExecutionError::ExecutionError { error, .. }
+        )
+        if matches!(
+            *error,
+            EntryPointExecutionError::StateError(StateError::UndeclaredClassHash(class_hash))
+            if class_hash == undeclared_hash
         )
-        if class_hash == undeclared_hash
     );
 }
 
@@ -2231,21 +2228,21 @@ fn check_native_validate_error(
             ..
         } => {
             assert!(!validate_constructor);
-            *boxed_syscall_error
+            boxed_syscall_error
         }
         TransactionExecutionError::ContractConstructorExecutionFailed(
-            ConstructorEntryPointExecutionError::ExecutionError {
-                error: EntryPointExecutionError::NativeUnrecoverableError(boxed_syscall_error),
-                ..
-            },
-        ) => {
-            assert!(validate_constructor);
-            *boxed_syscall_error
-        }
-        _ => panic!("Unexpected error: {:?}", error),
+            ConstructorEntryPointExecutionError::ExecutionError { error: boxed_error, .. },
+        ) => match *boxed_error {
+            EntryPointExecutionError::NativeUnrecoverableError(boxed_syscall_error) => {
+                assert!(validate_constructor);
+                boxed_syscall_error
+            }
+            _ => panic!("Unexpected error: {:?}", boxed_error),
+        },
+        _ => panic!("Unexpected error: {:?}", &error),
     };
     assert_matches!(
-        syscall_error,
+        *syscall_error,
         SyscallExecutionError::SyscallExecutorBase(
             SyscallExecutorBaseError::InvalidSyscallInExecutionMode { .. }
         )