Refactor universal-sierra-compiler-api

commit-id:e0444c34

Author: ksew1

Cargo.lock

@@ -28,7 +28,7 @@ use std::cell::{Ref, RefCell};
 use std::collections::HashMap;
 use std::io::Read;
 use std::sync::Arc;
-use universal_sierra_compiler_api::{SierraType, compile_sierra};
+use universal_sierra_compiler_api::compile_contract_sierra;
 use url::Url;
 
 #[derive(Debug)]
@@ -239,13 +239,10 @@ impl StateReader for ForkStateReader {
                     SierraVersion::extract_from_program(&flattened_class.sierra_program)
                         .expect("Unable to extract Sierra version from Sierra program");
 
-                match compile_sierra::<String>(&sierra_contract_class, &SierraType::Contract) {
+                match compile_contract_sierra(&sierra_contract_class) {
                     Ok(casm_contract_class_raw) => Ok(RunnableCompiledClass::V1(
-                        CompiledClassV1::try_from_json_string(
-                            &casm_contract_class_raw,
-                            sierra_version,
-                        )
-                        .expect("Unable to create RunnableCompiledClass::V1"),
+                        CompiledClassV1::try_from((casm_contract_class_raw, sierra_version))
+                            .expect("Unable to create RunnableCompiledClass::V1"),
                     )),
                     Err(err) => Err(StateReadError(err.to_string())),
                 }

crates/cheatnet/src/forking/state.rs

@@ -68,11 +68,9 @@ pub fn get_class_hash(sierra_class: &SierraClass) -> Result<ClassHash> {
 }
 
 fn get_contract_class(contract_artifact: &StarknetContractArtifacts) -> RunnableCompiledClass {
-    let contract_class = CompiledClassV1::try_from_json_string(
-        &contract_artifact.casm,
-        get_current_sierra_version(),
-    )
-    .expect("Failed to read contract class from json");
+    let contract_class =
+        CompiledClassV1::try_from((contract_artifact.casm.clone(), get_current_sierra_version()))
+            .expect("Failed to read contract class from json");
 
     #[cfg(feature = "cairo-native")]
     return match &contract_artifact.executor {

crates/cheatnet/src/runtime_extensions/forge_runtime_extension/cheatcodes/declare.rs

@@ -23,7 +23,7 @@ use std::sync::{Arc, Mutex};
 use test_case_summary::{AnyTestCaseSummary, Fuzzing};
 use tokio::sync::mpsc::{Sender, channel};
 use tokio::task::JoinHandle;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 
 pub mod build_trace_data;
 pub mod coverage_api;
@@ -114,7 +114,7 @@ pub fn maybe_generate_coverage(
 #[tracing::instrument(skip_all, level = "debug")]
 pub fn run_for_test_case(
     case: Arc<TestCaseWithResolvedConfig>,
-    casm_program: Arc<AssembledProgramWithDebugInfo>,
+    casm_program: Arc<RawCasmProgram>,
     forge_config: Arc<ForgeConfig>,
     versioned_program_path: Arc<Utf8PathBuf>,
     send: Sender<()>,
@@ -149,7 +149,7 @@ pub fn run_for_test_case(
 #[tracing::instrument(skip_all, level = "debug")]
 fn run_with_fuzzing(
     case: Arc<TestCaseWithResolvedConfig>,
-    casm_program: Arc<AssembledProgramWithDebugInfo>,
+    casm_program: Arc<RawCasmProgram>,
     forge_config: Arc<ForgeConfig>,
     versioned_program_path: Arc<Utf8PathBuf>,
     send: Sender<()>,

crates/forge-runner/src/lib.rs

@@ -19,7 +19,7 @@ use serde::Serialize;
 use starknet_types_core::felt::Felt;
 use std::collections::HashMap;
 use std::sync::Arc;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 
 pub mod raw;
 pub mod with_config;
@@ -66,10 +66,7 @@ impl TestDetails {
         builtins
     }
 
-    pub fn try_into_program(
-        &self,
-        casm_program: &AssembledProgramWithDebugInfo,
-    ) -> Result<Program> {
+    pub fn try_into_program(&self, casm_program: &RawCasmProgram) -> Result<Program> {
         let builtins = self.builtins();
 
         let assembled_program = &casm_program.assembled_cairo_program;
@@ -102,7 +99,7 @@ pub struct TestTarget<C> {
     pub tests_location: TestTargetLocation,
     pub sierra_program: ProgramArtifact,
     pub sierra_program_path: Arc<Utf8PathBuf>,
-    pub casm_program: Arc<AssembledProgramWithDebugInfo>,
+    pub casm_program: Arc<RawCasmProgram>,
     pub test_cases: Vec<TestCase<C>>,
 }
 

crates/forge-runner/src/package_tests.rs

@@ -6,7 +6,7 @@ use cheatnet::runtime_extensions::forge_config_extension::config::{
     RawAvailableResourceBoundsConfig, RawFuzzerConfig,
 };
 use starknet_api::block::BlockNumber;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 use url::Url;
 
 pub type TestTargetWithResolvedConfig = TestTarget<TestCaseResolvedConfig>;
@@ -29,10 +29,7 @@ impl TestCaseWithResolvedConfig {
         }
     }
 
-    pub fn try_into_program(
-        &self,
-        casm_program: &AssembledProgramWithDebugInfo,
-    ) -> Result<Program> {
+    pub fn try_into_program(&self, casm_program: &RawCasmProgram) -> Result<Program> {
         self.test_details.try_into_program(casm_program)
     }
 }

crates/forge-runner/src/package_tests/with_config_resolved.rs

@@ -44,7 +44,7 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use tokio::sync::mpsc::Sender;
 use tokio::task::JoinHandle;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 
 pub mod config_run;
 mod execution;
@@ -63,7 +63,7 @@ pub use syscall_handler::syscall_handler_offset;
 #[tracing::instrument(skip_all, level = "debug")]
 pub fn run_test(
     case: Arc<TestCaseWithResolvedConfig>,
-    casm_program: Arc<AssembledProgramWithDebugInfo>,
+    casm_program: Arc<RawCasmProgram>,
     forge_config: Arc<ForgeConfig>,
     versioned_program_path: Arc<Utf8PathBuf>,
     send: Sender<()>,
@@ -100,7 +100,7 @@ pub fn run_test(
 pub(crate) fn run_fuzz_test(
     case: Arc<TestCaseWithResolvedConfig>,
     program: Program,
-    casm_program: Arc<AssembledProgramWithDebugInfo>,
+    casm_program: Arc<RawCasmProgram>,
     forge_config: Arc<ForgeConfig>,
     versioned_program_path: Arc<Utf8PathBuf>,
     send: Sender<()>,
@@ -167,7 +167,7 @@ pub enum RunResult {
 pub fn run_test_case(
     case: &TestCaseWithResolvedConfig,
     program: &Program,
-    casm_program: &AssembledProgramWithDebugInfo,
+    casm_program: &RawCasmProgram,
     runtime_config: &RuntimeConfig,
     fuzzer_rng: Option<Arc<Mutex<StdRng>>>,
     versioned_program_path: &Utf8Path,

crates/forge-runner/src/running.rs

@@ -18,7 +18,7 @@ use starknet_api::block::{
 };
 use starknet_types_core::felt::Felt;
 use std::default::Default;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 
 struct PhantomStateReader;
 
@@ -61,7 +61,7 @@ impl StateReader for PhantomStateReader {
 #[tracing::instrument(skip_all, level = "debug")]
 pub fn run_config_pass(
     test_details: &TestDetails,
-    casm_program: &AssembledProgramWithDebugInfo,
+    casm_program: &RawCasmProgram,
     tracked_resource: &ForgeTrackedResource,
 ) -> Result<RawForgeConfig> {
     let program = test_details.try_into_program(casm_program)?;

crates/forge-runner/src/running/config_run.rs

@@ -1,11 +1,9 @@
 use cairo_lang_casm::hints::Hint;
 use cairo_vm::serde::deserialize_program::{ApTracking, FlowTrackingData, HintParams};
 use std::collections::HashMap;
-use universal_sierra_compiler_api::AssembledCairoProgramWithSerde;
+use universal_sierra_compiler_api::representation::AssembledCairoProgram;
 
-pub fn hints_by_representation(
-    assembled_program: &AssembledCairoProgramWithSerde,
-) -> HashMap<String, Hint> {
+pub fn hints_by_representation(assembled_program: &AssembledCairoProgram) -> HashMap<String, Hint> {
     assembled_program
         .hints
         .iter()
@@ -16,7 +14,7 @@ pub fn hints_by_representation(
 
 #[must_use]
 pub fn hints_to_params(
-    assembled_program: &AssembledCairoProgramWithSerde,
+    assembled_program: &AssembledCairoProgram,
 ) -> HashMap<usize, Vec<HintParams>> {
     assembled_program
         .hints

crates/forge-runner/src/running/hints.rs

@@ -15,7 +15,7 @@ use cairo_vm::vm::runners::cairo_runner::CairoRunner;
 use cheatnet::constants::build_test_entry_point;
 use starknet_api::deprecated_contract_class::EntryPointOffset;
 use std::collections::HashMap;
-use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
+use universal_sierra_compiler_api::representation::RawCasmProgram;
 
 // Based on structure from https://github.com/starkware-libs/sequencer/blob/e417a9e7d50cbd78065d357763df2fbc2ad41f7c/crates/blockifier/src/execution/entry_point_execution.rs#L39
 // Logic of `initialize_execution_context` had to be modified so this struct ended up modified as well.
@@ -96,7 +96,7 @@ pub fn entry_point_initial_budget(syscall_hint_processor: &SyscallHintProcessor)
 
 pub fn build_test_call_and_entry_point(
     test_details: &TestDetails,
-    casm_program: &AssembledProgramWithDebugInfo,
+    casm_program: &RawCasmProgram,
     program: &Program,
 ) -> (ExecutableCallEntryPoint, EntryPointV1) {
     let sierra_instruction_idx = test_details.sierra_entry_point_statement_idx;