Use CairoRunnerBuilder for cairo_run, but as a placeholder

Author: JulianGCalderon

cairo1-run/src/cairo_run.rs

@@ -44,7 +44,7 @@ use cairo_vm::{
     },
     vm::{
         errors::{runner_errors::RunnerError, vm_errors::VirtualMachineError},
-        runners::cairo_runner::{CairoRunner, RunResources, RunnerMode},
+        runners::cairo_runner::{CairoRunner, CairoRunnerBuilder, RunResources, RunnerMode},
         vm_core::VirtualMachine,
     },
     Felt252,
@@ -250,14 +250,16 @@ pub fn cairo_run_program(
         RunnerMode::ExecutionMode
     };
 
-    let mut runner = CairoRunner::new_v2(
+    let mut runner_builder = CairoRunnerBuilder::new(
         &program,
         cairo_run_config.layout,
         cairo_run_config.dynamic_layout_params.clone(),
         runner_mode,
-        cairo_run_config.trace_enabled,
-        false,
     )?;
+    runner_builder.enable_trace(cairo_run_config.trace_enabled);
+
+    let mut runner = runner_builder.build()?;
+
     let end = runner.initialize(cairo_run_config.proof_mode)?;
     load_arguments(&mut runner, &cairo_run_config, main_func)?;
 

vm/src/vm/runners/cairo_runner.rs

@@ -524,6 +524,12 @@ impl CairoRunnerBuilder {
             .builtin_runners(self.builtin_runners)
             .segments(self.memory)
             .instruction_cache(self.instructions)
+            .disable_trace_padding(self.disable_trace_padding)
+            .trace(if self.enable_trace {
+                Some(Vec::<TraceEntry>::new())
+            } else {
+                None
+            })
             .build();
 
         Ok(CairoRunner {

vm/src/vm/vm_core.rs

@@ -1363,6 +1363,7 @@ pub struct VirtualMachineBuilder {
     instruction_cache: Vec<Option<Instruction>>,
     skip_instruction_execution: bool,
     run_finished: bool,
+    disable_trace_padding: bool,
     #[cfg(feature = "test_utils")]
     pub(crate) hooks: crate::vm::hooks::Hooks,
 }
@@ -1386,6 +1387,7 @@ impl Default for VirtualMachineBuilder {
             #[cfg(feature = "test_utils")]
             hooks: Default::default(),
             instruction_cache: Vec::new(),
+            disable_trace_padding: false,
         }
     }
 }
@@ -1411,6 +1413,11 @@ impl VirtualMachineBuilder {
         self
     }
 
+    pub fn disable_trace_padding(mut self, value: bool) -> VirtualMachineBuilder {
+        self.disable_trace_padding = value;
+        self
+    }
+
     pub fn current_step(mut self, current_step: usize) -> VirtualMachineBuilder {
         self.current_step = current_step;
         self
@@ -1458,7 +1465,7 @@ impl VirtualMachineBuilder {
             #[cfg(feature = "test_utils")]
             hooks: self.hooks,
             relocation_table: None,
-            disable_trace_padding: false,
+            disable_trace_padding: self.disable_trace_padding,
         }
     }
 }