From d556d2580710ee9fafde7f398895f58ac3e2f1b0 Mon Sep 17 00:00:00 2001 From: fmoletta <99273364+fmoletta@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:25:14 -0300 Subject: [PATCH] Remove unused `CairoRunner` field `original_steps` (#1742) * Remove `CairoRunner` field `original_steps` * Add changelog entry --- CHANGELOG.md | 2 ++ vm/src/vm/runners/cairo_runner.rs | 23 +++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd630557ad..4d3af62faf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ #### Upcoming Changes +* BREAKING: Remove unused `CairoRunner` field `original_steps`[#1742](https://github.com/lambdaclass/cairo-vm/pull/1742) + * feat: Add `--run_from_cairo_pie` to `cairo-vm-cli` + workflow [#1730](https://github.com/lambdaclass/cairo-vm/pull/1730) * Serialize directly into writer in `CairoPie::write_zip_file`[#1736](https://github.com/lambdaclass/cairo-vm/pull/1736) diff --git a/vm/src/vm/runners/cairo_runner.rs b/vm/src/vm/runners/cairo_runner.rs index 30d0270a4a..0fd7603b14 100644 --- a/vm/src/vm/runners/cairo_runner.rs +++ b/vm/src/vm/runners/cairo_runner.rs @@ -155,7 +155,6 @@ pub struct CairoRunner { segments_finalized: bool, execution_public_memory: Option>, runner_mode: RunnerMode, - pub original_steps: Option, pub relocated_memory: Vec>, pub exec_scopes: ExecutionScopes, pub relocated_trace: Option>, @@ -200,7 +199,6 @@ impl CairoRunner { run_ended: false, segments_finalized: false, runner_mode: mode.clone(), - original_steps: None, relocated_memory: Vec::new(), exec_scopes: ExecutionScopes::new(), execution_public_memory: if mode != RunnerMode::ExecutionMode { @@ -1041,14 +1039,11 @@ impl CairoRunner { &self, vm: &VirtualMachine, ) -> Result { - let n_steps = match self.original_steps { - Some(x) => x, - None => vm - .trace - .as_ref() - .map(|x| x.len()) - .unwrap_or(vm.current_step), - }; + let n_steps = vm + .trace + .as_ref() + .map(|x| x.len()) + .unwrap_or(vm.current_step); let n_memory_holes = self.get_memory_holes(vm)?; let mut builtin_instance_counter = HashMap::new(); @@ -3906,10 +3901,10 @@ mod tests { fn get_execution_resources_empty_builtins() { let program = program!(); - let mut cairo_runner = cairo_runner!(program); + let cairo_runner = cairo_runner!(program); let mut vm = vm!(); - cairo_runner.original_steps = Some(10); + vm.current_step = 10; vm.segments.segment_used_sizes = Some(vec![4]); assert_eq!( cairo_runner.get_execution_resources(&vm), @@ -3926,10 +3921,10 @@ mod tests { fn get_execution_resources() { let program = program!(); - let mut cairo_runner = cairo_runner!(program); + let cairo_runner = cairo_runner!(program); let mut vm = vm!(); - cairo_runner.original_steps = Some(10); + vm.current_step = 10; vm.segments.segment_used_sizes = Some(vec![4]); vm.builtin_runners = vec![{ let mut builtin = OutputBuiltinRunner::new(true);