From e8a5290a81da270aab1f040a34a45cc58ee9c3cd Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 11 Mar 2024 15:25:39 -0300 Subject: [PATCH 1/4] Remove add_additional_hash_builtin --- vm/src/vm/runners/cairo_runner.rs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/vm/src/vm/runners/cairo_runner.rs b/vm/src/vm/runners/cairo_runner.rs index 4dcd533cc9..70f3788350 100644 --- a/vm/src/vm/runners/cairo_runner.rs +++ b/vm/src/vm/runners/cairo_runner.rs @@ -1267,22 +1267,6 @@ impl CairoRunner { Ok(()) } - //NOTE: No longer needed in 0.11 - /// Add (or replace if already present) a custom hash builtin. Returns a Relocatable - /// with the new builtin base as the segment index. - pub fn add_additional_hash_builtin(&self, vm: &mut VirtualMachine) -> Relocatable { - // Create, initialize and insert the new custom hash runner. - let mut builtin: BuiltinRunner = HashBuiltinRunner::new(Some(32), true).into(); - builtin.initialize_segments(&mut vm.segments); - let segment_index = builtin.base() as isize; - vm.builtin_runners.push(builtin); - - Relocatable { - segment_index, - offset: 0, - } - } - // Iterates over the program builtins in reverse, calling BuiltinRunner::final_stack on each of them and returns the final pointer // This method is used by cairo-vm-py to replace starknet functionality pub fn get_builtins_final_stack( From 0c81c000bd6d7a1a9ee2abf293d8de2078de735e Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 11 Mar 2024 15:26:16 -0300 Subject: [PATCH 2/4] Remove disable_trace --- vm/src/vm/vm_core.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/vm/src/vm/vm_core.rs b/vm/src/vm/vm_core.rs index 4d4238a7ca..4e3aea5dff 100644 --- a/vm/src/vm/vm_core.rs +++ b/vm/src/vm/vm_core.rs @@ -942,9 +942,6 @@ impl VirtualMachine { Err(VirtualMachineError::NoSignatureBuiltin) } - pub fn disable_trace(&mut self) { - self.trace = None - } #[cfg(feature = "with_tracer")] pub fn relocate_segments(&self) -> Result, MemoryError> { From 0353708ac224766c89e529b89c0396d6e538d57f Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 11 Mar 2024 15:29:43 -0300 Subject: [PATCH 3/4] Add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1547001753..87b1715a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## Cairo-VM Changelog #### Upcoming Changes + +* BREAKING: Remove `CairoRunner::add_additional_hash_builtin` & `VirtualMachine::disable_trace`[#1658](https://github.com/lambdaclass/cairo-vm/pull/1658) + * feat: add a `--tracer` option which hosts a web server that shows the line by line execution of cairo code along with memory registers [#1265](https://github.com/lambdaclass/cairo-vm/pull/1265) * feat: Make air public inputs deserializable [#1648](https://github.com/lambdaclass/cairo-vm/pull/1648) From 68baa8098efd4f4eca29bf7a3e147f04a52d32c5 Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 11 Mar 2024 15:30:45 -0300 Subject: [PATCH 4/4] Remove tests --- vm/src/vm/runners/cairo_runner.rs | 26 -------------------------- vm/src/vm/vm_core.rs | 9 --------- 2 files changed, 35 deletions(-) diff --git a/vm/src/vm/runners/cairo_runner.rs b/vm/src/vm/runners/cairo_runner.rs index 70f3788350..3833f606af 100644 --- a/vm/src/vm/runners/cairo_runner.rs +++ b/vm/src/vm/runners/cairo_runner.rs @@ -4794,32 +4794,6 @@ mod tests { assert_eq!(bitwise_builtin.stop_ptr, Some(5)); } - /// Test that add_additional_hash_builtin() creates an additional builtin. - #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] - fn add_additional_hash_builtin() { - let program = program!(); - let cairo_runner = cairo_runner!(program); - let mut vm = vm!(); - - let num_builtins = vm.builtin_runners.len(); - cairo_runner.add_additional_hash_builtin(&mut vm); - assert_eq!(vm.builtin_runners.len(), num_builtins + 1); - - let builtin = vm - .builtin_runners - .last() - .expect("missing last builtin runner"); - match builtin { - BuiltinRunner::Hash(builtin) => { - assert_eq!(builtin.base(), 0); - assert_eq!(builtin.ratio(), Some(32)); - assert!(builtin.included); - } - _ => unreachable!(), - } - } - #[test] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] fn run_from_entrypoint_custom_program_test() { diff --git a/vm/src/vm/vm_core.rs b/vm/src/vm/vm_core.rs index 4e3aea5dff..dfa7a1d496 100644 --- a/vm/src/vm/vm_core.rs +++ b/vm/src/vm/vm_core.rs @@ -3837,15 +3837,6 @@ mod tests { assert_eq!(builtins[1].name(), BITWISE_BUILTIN_NAME); } - #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] - fn disable_trace() { - let mut vm = VirtualMachine::new(true); - assert!(vm.trace.is_some()); - vm.disable_trace(); - assert!(vm.trace.is_none()); - } - #[test] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] fn get_range_for_continuous_memory() {