From f9dd3254cd3e0a87947da49e560df9a30af205a9 Mon Sep 17 00:00:00 2001
From: Arni Hod <arnon@starkware.co>
Date: Mon, 5 Aug 2024 09:17:05 +0300
Subject: [PATCH] refactor: move the panic catch into the compile sierra to
 casm method

---
 crates/gateway/src/compilation.rs             | 11 +----------
 crates/starknet_sierra_compile/src/compile.rs | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/crates/gateway/src/compilation.rs b/crates/gateway/src/compilation.rs
index 0e71fa8bf3b..5bb911cd18c 100644
--- a/crates/gateway/src/compilation.rs
+++ b/crates/gateway/src/compilation.rs
@@ -1,12 +1,9 @@
-use std::panic;
-
 use blockifier::execution::contract_class::{ClassInfo, ContractClass, ContractClassV1};
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_lang_starknet_classes::contract_class::ContractClass as CairoLangContractClass;
 use starknet_api::core::CompiledClassHash;
 use starknet_api::rpc_transaction::RpcDeclareTransaction;
 use starknet_sierra_compile::compile::SierraToCasmCompiler;
-use starknet_sierra_compile::errors::CompilationUtilError;
 use starknet_sierra_compile::utils::into_contract_class_for_compilation;
 
 use crate::errors::{GatewayError, GatewayResult};
@@ -49,13 +46,7 @@ impl GatewayCompiler {
         &self,
         cairo_lang_contract_class: CairoLangContractClass,
     ) -> Result<CasmContractClass, GatewayError> {
-        let catch_unwind_result = panic::catch_unwind(|| {
-            self.sierra_to_casm_compiler.compile_sierra_to_casm(cairo_lang_contract_class)
-        });
-        let casm_contract_class =
-            catch_unwind_result.map_err(|_| CompilationUtilError::CompilationPanic)??;
-
-        Ok(casm_contract_class)
+        Ok(self.sierra_to_casm_compiler.compile_sierra_to_casm(cairo_lang_contract_class)?)
     }
 }
 
diff --git a/crates/starknet_sierra_compile/src/compile.rs b/crates/starknet_sierra_compile/src/compile.rs
index 73baa677a38..54c9843c2e7 100644
--- a/crates/starknet_sierra_compile/src/compile.rs
+++ b/crates/starknet_sierra_compile/src/compile.rs
@@ -1,3 +1,5 @@
+use std::panic;
+
 use cairo_lang_starknet_classes::allowed_libfuncs::ListSelector;
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_lang_starknet_classes::contract_class::ContractClass;
@@ -18,6 +20,18 @@ impl SierraToCasmCompiler {
     pub fn compile_sierra_to_casm(
         &self,
         contract_class: ContractClass,
+    ) -> Result<CasmContractClass, CompilationUtilError> {
+        let catch_unwind_result =
+            panic::catch_unwind(|| self.compile_sierra_to_casm_inner(contract_class));
+        let casm_contract_class =
+            catch_unwind_result.map_err(|_| CompilationUtilError::CompilationPanic)??;
+
+        Ok(casm_contract_class)
+    }
+
+    fn compile_sierra_to_casm_inner(
+        &self,
+        contract_class: ContractClass,
     ) -> Result<CasmContractClass, CompilationUtilError> {
         contract_class.validate_version_compatible(ListSelector::DefaultList)?;