diff --git a/crates/blockifier/src/test_utils/cairo_compile.rs b/crates/blockifier/src/test_utils/cairo_compile.rs index 6193b0d2d6..4521af4bbf 100644 --- a/crates/blockifier/src/test_utils/cairo_compile.rs +++ b/crates/blockifier/src/test_utils/cairo_compile.rs @@ -1,10 +1,13 @@ -use std::process::Command; +use std::path::{Path, PathBuf}; +use std::process::{Command, Output}; use std::{env, fs}; use cached::proc_macro::cached; use serde::{Deserialize, Serialize}; const CAIRO0_PIP_REQUIREMENTS_FILE: &str = "tests/requirements.txt"; +const CAIRO1_REPO_RELATIVE_PATH_OVERRIDE_ENV_VAR: &str = "CAIRO1_REPO_RELATIVE_PATH"; +const DEFAULT_CAIRO1_REPO_RELATIVE_PATH: &str = "../../../cairo"; /// Objects for simple deserialization of Cargo.toml to fetch the Cairo1 compiler version. /// The compiler itself isn't actually a dependency, so we compile by using the version of the @@ -55,6 +58,30 @@ pub fn cairo1_compiler_version() -> String { } } +/// Returns the path to the local Cairo1 compiler repository. +/// Returns /, where the relative path can be +/// overridden by the environment variable (otherwise, the default is used). +fn local_cairo1_compiler_repo_path() -> PathBuf { + // Location of blockifier's Cargo.toml. + let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); + + Path::new(&manifest_dir).join(match std::env::var(CAIRO1_REPO_RELATIVE_PATH_OVERRIDE_ENV_VAR) { + Ok(cairo1_repo_relative_path) => cairo1_repo_relative_path, + Err(_) => DEFAULT_CAIRO1_REPO_RELATIVE_PATH.into(), + }) +} + +/// Runs a command. If it has succeeded, it returns the command's output; otherwise, it panics with +/// stderr output. +fn run_and_verify_output(command: &mut Command) -> Output { + let output = command.output().unwrap(); + if !output.status.success() { + let stderr_output = String::from_utf8(output.stderr).unwrap(); + panic!("{stderr_output}"); + } + output +} + /// Compiles a Cairo0 program using the deprecated compiler. pub fn cairo0_compile(path: String, extra_arg: Option, debug_info: bool) -> Vec { verify_cairo0_compiler_deps(); @@ -74,6 +101,7 @@ pub fn cairo0_compile(path: String, extra_arg: Option, debug_info: bool) /// Compiles a Cairo1 program using the compiler version set in the Cargo.toml. pub fn cairo1_compile(_path: String) -> Vec { + verify_cairo1_compiler_deps(); todo!(); } @@ -103,3 +131,14 @@ fn verify_cairo0_compiler_deps() { CAIRO0_PIP_REQUIREMENTS_FILE ); } + +fn verify_cairo1_compiler_deps() { + // Checkout the required version in the compiler repo. + run_and_verify_output(Command::new("git").args([ + "-C", + // TODO(Dori, 1/6/2024): Handle CI case (repo path will be different). + local_cairo1_compiler_repo_path().to_str().unwrap(), + "checkout", + &format!("v{}", cairo1_compiler_version()), + ])); +}