Optimize raw Sierra deserialization (#109)

Author: maciektr

Cargo.lock

@@ -15,7 +15,8 @@ cairo-lang-starknet-sierra-1_0_0 = { package = "universal-sierra-compiler-cairo-
 cairo-lang-sierra-to-casm = "2.12.3"
 cairo-lang-sierra = "2.12.3"
 cairo-lang-starknet-classes = "2.12.3"
-serde_json = "1.0.145"
+serde_core = "1"
+serde_json = "1"
 clap = "4.5.48"
 anyhow = "1.0.100"
 console = "0.16.1"

Cargo.toml

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use cairo_lang_sierra::program::Program;
 use cairo_lang_sierra_to_casm::compiler::{CairoProgramDebugInfo, SierraToCasmConfig};
 use cairo_lang_sierra_to_casm::metadata::{calc_metadata, MetadataComputationConfig};
@@ -22,26 +22,19 @@ pub struct CompileRaw {
 
 /// Compiles Sierra of the plain Cairo code.
 #[tracing::instrument(skip_all, level = "info")]
-pub fn compile(sierra_program: Value) -> Result<Value> {
-    let span = trace_span!("deserialize_sierra");
-    let sierra_program: Program = {
-        let _g = span.enter();
-        serde_json::from_value(sierra_program)
-            .context("Unable to deserialize Sierra program. Make sure it is in a correct format")?
-    };
-
+pub fn compile(sierra_program: &Program) -> Result<Value> {
     let metadata_config = MetadataComputationConfig::default();
     let span = trace_span!("calc_metadata");
     let metadata = {
         let _g = span.enter();
-        calc_metadata(&sierra_program, metadata_config)?
+        calc_metadata(sierra_program, metadata_config)?
     };
 
     let span = trace_span!("compile_sierra_to_casm");
     let cairo_program = {
         let _g = span.enter();
         cairo_lang_sierra_to_casm::compiler::compile(
-            &sierra_program,
+            sierra_program,
             &metadata,
             SierraToCasmConfig {
                 gas_usage_check: true,

src/commands/compile_raw.rs

@@ -1,4 +1,5 @@
 use anyhow::{Context, Error, Result};
+use cairo_lang_sierra::program::Program;
 use clap::{Parser, Subcommand};
 use console::style;
 use serde_json::{to_writer, Value};
@@ -33,10 +34,9 @@ fn print_error_message(error: &Error) {
 }
 
 #[tracing::instrument(skip_all, level = "info")]
-fn read_json(file_path: PathBuf) -> Result<Value> {
+fn read_json<T: for<'de> serde_core::de::Deserialize<'de>>(file_path: PathBuf) -> Result<T> {
     let sierra_file = File::open(file_path).context("Unable to open json file")?;
     let sierra_file_reader = BufReader::new(sierra_file);
-
     serde_json::from_reader(sierra_file_reader).context("Unable to read json file")
 }
 
@@ -71,9 +71,11 @@ fn main_execution() -> Result<bool> {
             output_casm(&casm_json, compile_contract.output_path)?;
         }
         Commands::CompileRaw(compile_raw) => {
-            let sierra_json = read_json(compile_raw.sierra_path)?;
+            let sierra_json: Program = read_json(compile_raw.sierra_path).context(
+                "Unable to deserialize Sierra program. Make sure it is in a correct format",
+            )?;
 
-            let cairo_program_json = commands::compile_raw::compile(sierra_json)?;
+            let cairo_program_json = commands::compile_raw::compile(&sierra_json)?;
 
             output_casm(&cairo_program_json, compile_raw.output_path)?;
         }

src/main.rs

@@ -1,16 +1,8 @@
+use cairo_lang_sierra::program::Program;
 use std::fs::File;
 use test_case::test_case;
 use universal_sierra_compiler::compile_raw;
 
-#[test]
-fn wrong_json() {
-    let sierra_json = serde_json::json!({
-        "wrong": "data"
-    });
-
-    let cairo_program = compile_raw(sierra_json);
-    assert!(cairo_program.is_err());
-}
 #[test_case("1_7_0_trace_hint"; "sierra 1.7.0 with trace hint")]
 #[test_case("1_7_0"; "sierra 1.7.0")]
 #[test_case("1_6_0"; "sierra 1.6.0")]
@@ -19,8 +11,8 @@ fn wrong_json() {
 fn compile_raw_sierra(sierra_version: &str) {
     let file =
         File::open("tests/data/sierra_raw/sierra_".to_string() + sierra_version + ".json").unwrap();
-    let artifact = serde_json::from_reader(file).unwrap();
-    let compiled = compile_raw(artifact);
+    let artifact: Program = serde_json::from_reader(file).unwrap();
+    let compiled = compile_raw(&artifact);
 
     assert!(compiled.is_ok());
 }