Revert "Add --run_from_cairo_pie to cairo-vm-cli + workflow (#1730)"

This reverts commit 0df3f34.

Author: Pedro Fontana

.github/workflows/rust.yml

@@ -724,43 +724,3 @@ jobs:
 
     - name: Run script
       run: ./vm/src/tests/compare_factorial_outputs_all_layouts.sh
-
-  compare-run-from-cairo-pie-all-outputs:
-    name: Compare all outputs from running Cairo PIEs
-    needs: [ build-programs, build-release, run-cairo-release ]
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Python3 Build
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
-        cache: 'pip'
-      
-    - name: Install cairo-lang and deps
-      run: pip install -r requirements.txt
-      
-    - name: Fetch release binary
-      uses: actions/cache/restore@v3
-      with:
-        key: cli-bin-rel-${{ github.sha }}
-        path: target/release/cairo-vm-cli
-        fail-on-cache-miss: true
-    
-    - name: Fetch traces for cairo-vm
-      uses: actions/cache/restore@v3
-      with:
-        path: |
-          cairo_programs/**/*.memory
-          cairo_programs/**/*.trace
-          cairo_programs/**/*.air_public_input
-          cairo_programs/**/*.air_private_input
-          cairo_programs/**/*.pie.zip
-        key: cairo_test_programs-release-trace-cache-${{ github.sha }}
-        fail-on-cache-miss: true
-   
-    - name: Run comparison
-      run: ./vm/src/tests/compare_all_pie_outputs.sh
-

.gitignore

@@ -11,7 +11,6 @@
 **/*.air_public_input
 **/*.air_private_input
 **/*.pie.zip
-**/*.pie
 **/*.swp
 bench/results
 .python-version

Makefile

@@ -329,9 +329,6 @@ compare_air_private_input: $(CAIRO_RS_AIR_PRIVATE_INPUT) $(CAIRO_AIR_PRIVATE_INP
 compare_pie: $(CAIRO_RS_PIE) $(CAIRO_PIE)
 	cd vm/src/tests; ./compare_vm_state.sh pie
 
-compare_all_pie_outputs: $(CAIRO_RS_PIE)
-	cd vm/src/tests; ./compare_all_pie_outputs.sh
-
 # Run with nightly enable the `doc_cfg` feature wich let us provide clear explaination about which parts of the code are behind a feature flag
 docs:
 	RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --verbose --release --locked --no-deps --all-features --open
@@ -341,7 +338,6 @@ clean:
 	rm -f $(TEST_DIR)/*.memory
 	rm -f $(TEST_DIR)/*.trace
 	rm -f $(TEST_DIR)/*.pie.zip
-	rm -f $(TEST_DIR)/*.pie
 	rm -f $(BENCH_DIR)/*.json
 	rm -f $(BAD_TEST_DIR)/*.json
 	rm -f $(PRINT_TEST_DIR)/*.json

README.md

@@ -174,12 +174,10 @@ The cairo-vm-cli supports the following optional arguments:
 
 - `--air_private_input <AIR_PRIVATE_INPUT>`: Receives the name of a file and outputs the AIR private inputs into it. Can only be used if proof_mode, trace_file & memory_file are also enabled.
 
-- `--cairo_pie_output <CAIRO_PIE_OUTPUT>`: Receives the name of a file and outputs the Cairo PIE into it. Can only be used if proof_mode is not enabled.
+- `--cairo_pie_output <CAIRO_PIE_OUTPUT>`: Receives the name of a file and outputs the Cairo PIE into it. Can only be used if proof_mode, is not enabled.
 
 - `--allow_missing_builtins`: Disables the check that all builtins used by the program need to be included in the selected layout. Enabled by default when in proof_mode.
 
-- `run_from_cairo_pie`: Runs a Cairo PIE instead of a compiled json file. The name of the file will be the first argument received by the CLI (as if it were to run a normal compiled program). Can only be used if proof_mode is not enabled.
-
 For example, to obtain the air public inputs from a fibonacci program run, we can run :
 
 ```bash

cairo-vm-cli/src/main.rs

@@ -10,10 +10,8 @@ use cairo_vm::types::layout_name::LayoutName;
 use cairo_vm::vm::errors::cairo_run_errors::CairoRunError;
 use cairo_vm::vm::errors::trace_errors::TraceError;
 use cairo_vm::vm::errors::vm_errors::VirtualMachineError;
-use cairo_vm::vm::runners::cairo_pie::CairoPie;
 #[cfg(feature = "with_tracer")]
 use cairo_vm::vm::runners::cairo_runner::CairoRunner;
-use cairo_vm::vm::runners::cairo_runner::RunResources;
 #[cfg(feature = "with_tracer")]
 use cairo_vm::vm::vm_core::VirtualMachine;
 #[cfg(feature = "with_tracer")]
@@ -70,13 +68,6 @@ struct Args {
     #[structopt(long = "tracer")]
     #[cfg(feature = "with_tracer")]
     tracer: bool,
-    #[structopt(
-        long = "run_from_cairo_pie",
-        // We need to add these air_private_input & air_public_input or else
-        // passing run_from_cairo_pie + either of these without proof_mode will not fail
-        conflicts_with_all = ["proof_mode", "air_private_input", "air_public_input"]
-    )]
-    run_from_cairo_pie: bool,
 }
 
 #[derive(Debug, Error)]
@@ -162,7 +153,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
     let args = Args::try_parse_from(args)?;
 
     let trace_enabled = args.trace_file.is_some() || args.air_public_input.is_some();
-
+    let mut hint_executor = BuiltinHintProcessor::new_empty();
     let cairo_run_config = cairo_run::CairoRunConfig {
         entrypoint: &args.entrypoint,
         trace_enabled,
@@ -174,26 +165,16 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
         ..Default::default()
     };
 
-    let (cairo_runner, mut vm) = match {
-        if args.run_from_cairo_pie {
-            let pie = CairoPie::read_zip_file(&args.filename)?;
-            let mut hint_processor = BuiltinHintProcessor::new(
-                Default::default(),
-                RunResources::new(pie.execution_resources.n_steps),
-            );
-            cairo_run::cairo_run_pie(&pie, &cairo_run_config, &mut hint_processor)
-        } else {
-            let program_content = std::fs::read(args.filename).map_err(Error::IO)?;
-            let mut hint_processor = BuiltinHintProcessor::new_empty();
-            cairo_run::cairo_run(&program_content, &cairo_run_config, &mut hint_processor)
-        }
-    } {
-        Ok(runner) => runner,
-        Err(error) => {
-            eprintln!("{error}");
-            return Err(Error::Runner(error));
-        }
-    };
+    let program_content = std::fs::read(args.filename).map_err(Error::IO)?;
+
+    let (cairo_runner, mut vm) =
+        match cairo_run::cairo_run(&program_content, &cairo_run_config, &mut hint_executor) {
+            Ok(runner) => runner,
+            Err(error) => {
+                eprintln!("{error}");
+                return Err(Error::Runner(error));
+            }
+        };
 
     if args.print_output {
         let mut output_buffer = "Program Output:\n".to_string();

vm/src/tests/cairo_pie_comparator.py

@@ -23,3 +23,5 @@
     # Compare binary files
     with cairo_lang_pie_zip.open("memory.bin", 'r') as f1,  cairo_vm_pie_zip.open("memory.bin", 'r') as f2:
         memory_comparator.compare_memory_file_contents(f1.read(), f2.read())
+
+    print(f"Comparison succesful for {filename1} vs {filename2}")

vm/src/tests/compare_all_pie_outputs.sh

@@ -137,6 +137,7 @@ impl CairoPie {
     #[cfg(feature = "std")]
     pub fn read_zip_file(file_path: &Path) -> Result<CairoPie, std::io::Error> {
         use std::io::Read;
+
         use zip::ZipArchive;
 
         let file = File::open(file_path)?;