feat: consolidate CairoRunner ctors

Author: dorimedini-starkware

CHANGELOG.md

@@ -12,6 +12,8 @@ Both branches support Stwo prover opcodes (Blake2s, QM31) since v2.0.0.
 
 #### Upcoming Changes
 
+* feat: consolidate CairoRunner ctors [#2368](https://github.com/starkware-libs/cairo-vm/pull/2368)
+
 * feat: create and use CairoRunConfig as ctor arg for CairoRunner ctors [#2367](https://github.com/starkware-libs/cairo-vm/pull/2367)
 
 * feat: move runner_mode to be a field in StwoCairoRunConfig [#2366](https://github.com/starkware-libs/cairo-vm/pull/2366)

bench/criterion_benchmark.rs

@@ -27,23 +27,20 @@ fn build_many_runners(c: &mut Criterion) {
     let program = Program::from_bytes(program.as_slice(), Some("main")).unwrap();
     c.bench_function("build runner", |b| {
         b.iter_with_large_drop(|| {
-            _ = black_box(
-                CairoRunner::new(
-                    black_box(&program),
-                    black_box(
-                        &Cairo0RunConfig {
-                            layout: LayoutName::starknet_with_keccak,
-                            proof_mode: false,
-                            trace_enabled: false,
-                            disable_trace_padding: false,
-                            ..Default::default()
-                        }
-                        .run_config()
-                        .unwrap(),
-                    ),
-                )
-                .unwrap(),
-            );
+            _ = black_box(CairoRunner::new(
+                black_box(&program),
+                black_box(
+                    &Cairo0RunConfig {
+                        layout: LayoutName::starknet_with_keccak,
+                        proof_mode: false,
+                        trace_enabled: false,
+                        disable_trace_padding: false,
+                        ..Default::default()
+                    }
+                    .run_config()
+                    .unwrap(),
+                ),
+            ));
         })
     });
 }
@@ -67,7 +64,6 @@ fn load_program_data(c: &mut Criterion) {
                     .run_config()
                     .unwrap(),
                 )
-                .unwrap()
             },
             |mut runner| _ = black_box(runner.initialize(false).unwrap()),
             BatchSize::SmallInput,

bench/iai_benchmark.rs

@@ -46,8 +46,7 @@ fn build_runner() {
         }
         .run_config()
         .unwrap(),
-    )
-    .unwrap();
+    );
     core::mem::drop(black_box(runner));
 }
 
@@ -69,7 +68,6 @@ fn build_runner_helper() -> CairoRunner {
         .run_config()
         .unwrap(),
     )
-    .unwrap()
 }
 
 #[library_benchmark]

cairo-vm-cli/src/main.rs

@@ -291,8 +291,7 @@ mod tests {
             }
             .run_config()
             .unwrap(),
-        )
-        .unwrap();
+        );
         let end = cairo_runner
             .initialize(false)
             .map_err(CairoRunError::Runner)?;

cairo1-run/src/cairo_run.rs

@@ -277,7 +277,7 @@ pub fn cairo_run_program(
         )?
     };
 
-    let mut runner = CairoRunner::new_v2(&program, &cairo_run_config.run_config()?);
+    let mut runner = CairoRunner::new(&program, &cairo_run_config.run_config()?);
     let end = runner.initialize(cairo_run_config.proof_mode)?;
     load_arguments(&mut runner, &cairo_run_config, main_func)?;
 

vm/src/cairo_run.rs

@@ -135,7 +135,7 @@ pub fn cairo_run_stwo(
     let _span = span!(Level::INFO, "cairo run stwo").entered();
 
     let proof_mode = cairo_run_config.runner_mode != RunnerMode::ExecutionMode;
-    let mut cairo_runner = CairoRunner::new_stwo(program, &cairo_run_config.run_config()?)?;
+    let mut cairo_runner = CairoRunner::new(program, &cairo_run_config.run_config()?);
     cairo_runner.exec_scopes = exec_scopes;
 
     let end = cairo_runner.initialize_stwo(allowed_builtins)?;
@@ -189,7 +189,7 @@ pub fn cairo_run_program_with_initial_scope(
         .allow_missing_builtins
         .unwrap_or(cairo_run_config.proof_mode);
 
-    let mut cairo_runner = CairoRunner::new(program, &cairo_run_config.run_config()?)?;
+    let mut cairo_runner = CairoRunner::new(program, &cairo_run_config.run_config()?);
 
     cairo_runner.exec_scopes = exec_scopes;
 
@@ -289,7 +289,7 @@ pub fn cairo_run_pie(
     let allow_missing_builtins = cairo_run_config.allow_missing_builtins.unwrap_or_default();
 
     let program = Program::from_stripped_program(&pie.metadata.program);
-    let mut cairo_runner = CairoRunner::new(&program, &cairo_run_config.run_config()?)?;
+    let mut cairo_runner = CairoRunner::new(&program, &cairo_run_config.run_config()?);
 
     let end = cairo_runner.initialize(allow_missing_builtins)?;
     cairo_runner.vm.finalize_segments_by_cairo_pie(pie);
@@ -343,7 +343,7 @@ pub fn cairo_run_pie(
 }
 
 /// Runs a Cairo PIE using the Stwo runtime API.
-/// Same as `cairo_run_pie` but uses `new_stwo` + `initialize_stwo` instead of layouts.
+/// Same as `cairo_run_pie` but uses [StwoCairoRunConfig] + `initialize_stwo` instead of layouts.
 /// Note: Cairo PIEs cannot be run in proof mode.
 /// WARNING: As the RunResources are part of the HintProcessor trait, the caller should make sure that
 /// the number of steps in the `RunResources` matches that of the `ExecutionResources` in the `CairoPie`.
@@ -364,14 +364,14 @@ pub fn cairo_run_pie_stwo(
     pie.run_validity_checks()?;
 
     let program = Program::from_stripped_program(&pie.metadata.program);
-    let mut cairo_runner = CairoRunner::new_stwo(
+    let mut cairo_runner = CairoRunner::new(
         &program,
         &StwoCairoRunConfig {
             runner_mode: RunnerMode::ExecutionMode,
             ..cairo_run_config.clone()
         }
         .run_config()?,
-    )?;
+    );
 
     let end = cairo_runner.initialize_stwo(allowed_builtins)?;
     cairo_runner.vm.finalize_segments_by_cairo_pie(pie);
@@ -442,7 +442,7 @@ pub fn cairo_run_fuzzed_program(
         .allow_missing_builtins
         .unwrap_or(cairo_run_config.proof_mode);
 
-    let mut cairo_runner = CairoRunner::new(&program, &cairo_run_config.run_config()?)?;
+    let mut cairo_runner = CairoRunner::new(&program, &cairo_run_config.run_config()?);
 
     let _end = cairo_runner.initialize(allow_missing_builtins)?;
 

vm/src/tests/cairo_run_test.rs

@@ -1069,8 +1069,7 @@ fn run_program_with_custom_mod_builtin_params(
     };
     let mut hint_processor = BuiltinHintProcessor::new_empty();
     let program = Program::from_bytes(data, Some(cairo_run_config.entrypoint)).unwrap();
-    let mut cairo_runner =
-        CairoRunner::new(&program, &cairo_run_config.run_config().unwrap()).unwrap();
+    let mut cairo_runner = CairoRunner::new(&program, &cairo_run_config.run_config().unwrap());
 
     let end = cairo_runner.initialize(false).unwrap();
     // Modify add_mod & mul_mod params

vm/src/tests/mod.rs

@@ -115,8 +115,7 @@ fn run_cairo_1_entrypoint(
         }
         .run_config()
         .unwrap(),
-    )
-    .unwrap();
+    );
 
     let program_builtins = get_casm_contract_builtins(&contract_class, entrypoint_offset);
     runner
@@ -226,8 +225,7 @@ fn run_cairo_1_entrypoint_with_run_resources(
         }
         .run_config()
         .unwrap(),
-    )
-    .unwrap();
+    );
 
     let program_builtins = get_casm_contract_builtins(&contract_class, entrypoint_offset);
     runner

vm/src/utils.rs

@@ -260,7 +260,6 @@ pub mod test_utils {
                 .run_config()
                 .unwrap(),
             )
-            .unwrap()
         };
         ($program:expr, $layout:expr) => {
             crate::vm::runners::cairo_runner::CairoRunner::new(
@@ -275,7 +274,6 @@ pub mod test_utils {
                 .run_config()
                 .unwrap(),
             )
-            .unwrap()
         };
         ($program:expr, $layout:expr, $proof_mode:expr) => {
             crate::vm::runners::cairo_runner::CairoRunner::new(
@@ -290,7 +288,6 @@ pub mod test_utils {
                 .run_config()
                 .unwrap(),
             )
-            .unwrap()
         };
         ($program:expr, $layout:expr, $proof_mode:expr, $trace_enabled:expr) => {
             crate::vm::runners::cairo_runner::CairoRunner::new(
@@ -305,7 +302,6 @@ pub mod test_utils {
                 .run_config()
                 .unwrap(),
             )
-            .unwrap()
         };
     }
     pub(crate) use cairo_runner;

vm/src/vm/runners/builtin_runner/modulo.rs

@@ -836,8 +836,7 @@ mod tests {
             }
             .run_config()
             .unwrap(),
-        )
-        .unwrap();
+        );
 
         let end = runner.initialize(false).unwrap();
         // Modify add_mod & mul_mod params