Remove builtin names from VirtualMachine.builtin_runners (#921)

* Remove name from Vm.builtin_runners * Fix tests * Fix tests, add FIXMes * Clippy * Remove clone
lambdaclass · Mar 27, 2023 · cc55445 · cc55445
1 parent 77fe09e
commit cc55445
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 293 deletions.
diff --git a/src/hint_processor/builtin_hint_processor/signature.rs b/src/hint_processor/builtin_hint_processor/signature.rs
@@ -44,7 +44,6 @@ pub fn verify_ecdsa_signature(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::vm::runners::builtin_runner::SIGNATURE_BUILTIN_NAME;
     use crate::vm::vm_memory::memory_segments::MemorySegmentManager;
     use crate::{
         any_box,
@@ -75,10 +74,8 @@ mod tests {
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn verify_ecdsa_signature_valid() {
         let mut vm = vm!();
-        vm.builtin_runners = vec![(
-            SIGNATURE_BUILTIN_NAME,
-            SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into(),
-        )];
+        vm.builtin_runners =
+            vec![SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into()];
         vm.segments = segments![
             ((1, 0), (0, 0)),
             (
@@ -104,10 +101,8 @@ mod tests {
     #[test]
     fn verify_ecdsa_signature_invalid_ecdsa_ptr() {
         let mut vm = vm!();
-        vm.builtin_runners = vec![(
-            SIGNATURE_BUILTIN_NAME,
-            SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into(),
-        )];
+        vm.builtin_runners =
+            vec![SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into()];
         vm.segments = segments![
             ((1, 0), (3, 0)),
             (
@@ -133,10 +128,8 @@ mod tests {
     #[test]
     fn verify_ecdsa_signature_invalid_input_cell() {
         let mut vm = vm!();
-        vm.builtin_runners = vec![(
-            SIGNATURE_BUILTIN_NAME,
-            SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into(),
-        )];
+        vm.builtin_runners =
+            vec![SignatureBuiltinRunner::new(&EcdsaInstanceDef::default(), true).into()];
         vm.segments = segments![
             ((1, 0), (0, 3)),
             (

diff --git a/src/serde/deserialize_program.rs b/src/serde/deserialize_program.rs
@@ -17,7 +17,7 @@ use serde::{de, de::MapAccess, de::SeqAccess, Deserialize, Deserializer, Seriali
 use serde_json::Number;
 
 // This enum is used to deserialize program builtins into &str and catch non-valid names
-#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone, Eq)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone, Eq, Hash)]
 #[allow(non_camel_case_types)]
 pub enum BuiltinName {
     output,

diff --git a/src/utils.rs b/src/utils.rs
@@ -214,10 +214,7 @@ pub mod test_utils {
     macro_rules! vm_with_range_check {
         () => {{
             let mut vm = VirtualMachine::new(false);
-            vm.builtin_runners = vec![(
-                "range_check",
-                RangeCheckBuiltinRunner::new(8, 8, true).into(),
-            )];
+            vm.builtin_runners = vec![RangeCheckBuiltinRunner::new(8, 8, true).into()];
             vm
         }};
     }