From a7d10f98fa779383544356818de31afdef0372ba Mon Sep 17 00:00:00 2001 From: Shramee Srivastav Date: Thu, 5 Sep 2024 15:30:52 -0400 Subject: [PATCH] chore: upgrade scarb and cairo v2.8 (#221) --- runner-crate/Scarb.toml | 3 +- src/scarb.rs | 56 ++++++++++++++------- tests/fixture/cairo/runner-crate/Scarb.toml | 3 +- tests/fixture/cairo/testPass.cairo | 9 ++-- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/runner-crate/Scarb.toml b/runner-crate/Scarb.toml index 0d2637c3f..4ca173cb6 100644 --- a/runner-crate/Scarb.toml +++ b/runner-crate/Scarb.toml @@ -5,4 +5,5 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.3.0" +starknet = "2.8.0" +cairo_test = "2.8.0" diff --git a/src/scarb.rs b/src/scarb.rs index a85f64269..34e67b04e 100644 --- a/src/scarb.rs +++ b/src/scarb.rs @@ -1,7 +1,7 @@ use anyhow::Context; use cairo_lang_runner::{RunResultValue, SierraCasmRunner, StarknetState}; use cairo_lang_sierra::program::VersionedProgram; -use cairo_lang_test_plugin::TestCompilation; +use cairo_lang_test_plugin::{TestCompilation, TestCompilationMetadata}; use cairo_lang_test_runner::{CompiledTestRunner, RunProfilerConfig, TestRunConfig}; use camino::Utf8PathBuf; use console::style; @@ -10,7 +10,7 @@ use std::{env::current_dir, fs, path::PathBuf}; use itertools::Itertools; use scarb::{ core::{Config, TargetKind}, - ops::{self, collect_metadata, CompileOpts, MetadataOptions, FeaturesOpts, FeaturesSelector}, + ops::{self, collect_metadata, CompileOpts, FeaturesOpts, FeaturesSelector, MetadataOptions}, }; const AVAILABLE_GAS: usize = 999999999; @@ -64,9 +64,9 @@ pub fn scarb_run(file_path: &PathBuf) -> anyhow::Result { &MetadataOptions { version: 1, no_deps: false, - features: FeaturesOpts { + features: FeaturesOpts { features: FeaturesSelector::AllFeatures, - no_default_features: false, + no_default_features: false, }, }, &ws, @@ -154,9 +154,9 @@ pub fn scarb_test(file_path: &PathBuf) -> anyhow::Result { &MetadataOptions { version: 1, no_deps: false, - features: FeaturesOpts { + features: FeaturesOpts { features: FeaturesSelector::AllFeatures, - no_default_features: false, + no_default_features: false, }, }, &ws, @@ -184,12 +184,8 @@ pub fn scarb_test(file_path: &PathBuf) -> anyhow::Result { if target.kind != "test" { continue; } - let file_path = target_dir.join(format!("{}.test.json", target.name.clone())); - let test_compilation = serde_json::from_str::( - &fs::read_to_string(file_path.clone()) - .with_context(|| format!("failed to read file: {file_path}"))?, - ) - .with_context(|| format!("failed to deserialize compiled tests file: {file_path}"))?; + + let test_compilation = deserialize_test_compilation(&target_dir, target.name.clone())?; let config = TestRunConfig { filter: "".into(), @@ -208,6 +204,30 @@ pub fn scarb_test(file_path: &PathBuf) -> anyhow::Result { anyhow::Ok("".into()) } +fn deserialize_test_compilation( + target_dir: &Utf8PathBuf, + name: String, +) -> anyhow::Result { + let file_path = target_dir.join(format!("{}.test.json", name)); + let test_comp_metadata = serde_json::from_str::( + &fs::read_to_string(file_path.clone()) + .with_context(|| format!("failed to read file: {file_path}"))?, + ) + .with_context(|| format!("failed to deserialize compiled tests metadata file: {file_path}"))?; + + let file_path = target_dir.join(format!("{}.test.sierra.json", name)); + let sierra_program = serde_json::from_str::( + &fs::read_to_string(file_path.clone()) + .with_context(|| format!("failed to read file: {file_path}"))?, + ) + .with_context(|| format!("failed to deserialize compiled tests sierra file: {file_path}"))?; + + Ok(TestCompilation { + sierra_program: sierra_program.into_v1()?, + metadata: test_comp_metadata, + }) +} + // Prepares scarb config for exercise runner crate pub fn scarb_config(crate_path: PathBuf) -> Config { let path = Utf8PathBuf::from_path_buf(crate_path.join(PathBuf::from("Scarb.toml"))).unwrap(); @@ -223,19 +243,19 @@ pub fn compile(config: &Config, test_targets: bool) -> anyhow::Result<()> { include_target_names: vec![], include_target_kinds: vec![], exclude_target_kinds: vec![TargetKind::TEST], - features: FeaturesOpts { + features: FeaturesOpts { features: FeaturesSelector::AllFeatures, - no_default_features: false, - } + no_default_features: false, + }, }, true => CompileOpts { include_target_names: vec![], include_target_kinds: vec![TargetKind::TEST], exclude_target_kinds: vec![], - features: FeaturesOpts { + features: FeaturesOpts { features: FeaturesSelector::AllFeatures, - no_default_features: false, - } + no_default_features: false, + }, }, }; diff --git a/tests/fixture/cairo/runner-crate/Scarb.toml b/tests/fixture/cairo/runner-crate/Scarb.toml index 0d2637c3f..4ca173cb6 100644 --- a/tests/fixture/cairo/runner-crate/Scarb.toml +++ b/tests/fixture/cairo/runner-crate/Scarb.toml @@ -5,4 +5,5 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.3.0" +starknet = "2.8.0" +cairo_test = "2.8.0" diff --git a/tests/fixture/cairo/testPass.cairo b/tests/fixture/cairo/testPass.cairo index bc1596766..813192a1b 100644 --- a/tests/fixture/cairo/testPass.cairo +++ b/tests/fixture/cairo/testPass.cairo @@ -1,4 +1,7 @@ -#[test] -fn test_0_is_0() { - assert(0 == 0, 'should be equal to 0'); +#[cfg(test)] +mod tests { + #[test] + fn test_0_is_0() { + assert(0 == 0, 'should be equal to 0'); + } }