Fix tests

lambdaclass · Apr 25, 2024 · f26c383 · f26c383
1 parent bd5b551
commit f26c383
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/vm/src/hint_processor/builtin_hint_processor/blake2s_utils.rs b/vm/src/hint_processor/builtin_hint_processor/blake2s_utils.rs
@@ -367,7 +367,7 @@ mod tests {
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
             Err(HintError::IdentifierNotRelocatable(bx))
-            if *bx == ("output".to_string(), (1,0).into())
+            if *bx == "output".to_string()
         );
     }
 

diff --git a/vm/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs b/vm/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs
@@ -1003,7 +1003,7 @@ mod tests {
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
             Err(HintError::IdentifierNotInteger(bx))
-            if *bx == ("len".to_string(), (1,1).into())
+            if bx.as_ref() == "len"
         );
     }
 

diff --git a/vm/src/hint_processor/builtin_hint_processor/find_element_hint.rs b/vm/src/hint_processor/builtin_hint_processor/find_element_hint.rs
@@ -270,7 +270,7 @@ mod tests {
         let ids_data = ids_data!["array_ptr", "elm_size", "n_elms", "index", "key"];
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::FIND_ELEMENT),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("key".to_string(), (1,4).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "key".to_string()
         );
     }
 
@@ -283,7 +283,7 @@ mod tests {
         )]));
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::FIND_ELEMENT),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("elm_size".to_string(), (1,1).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "elm_size".to_string()
         );
     }
 
@@ -321,7 +321,7 @@ mod tests {
             init_vm_ids_data(HashMap::from([("n_elms".to_string(), relocatable)]));
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::FIND_ELEMENT),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("n_elms".to_string(), (1,2).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "n_elms".to_string()
         );
     }
 
@@ -364,7 +364,7 @@ mod tests {
             init_vm_ids_data(HashMap::from([("key".to_string(), relocatable)]));
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::FIND_ELEMENT),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("key".to_string(), (1,4).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "key".to_string()
         );
     }
 
@@ -403,7 +403,7 @@ mod tests {
         )]));
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::SEARCH_SORTED_LOWER),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("elm_size".to_string(), (1,1).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "elm_size".to_string()
         );
     }
 
@@ -429,7 +429,7 @@ mod tests {
         )]));
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::SEARCH_SORTED_LOWER),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("n_elms".to_string(), (1,2).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "n_elms".to_string()
         );
     }
 

diff --git a/vm/src/hint_processor/builtin_hint_processor/math_utils.rs b/vm/src/hint_processor/builtin_hint_processor/math_utils.rs
@@ -894,7 +894,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,4).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "a".to_string()
         );
     }
 
@@ -912,7 +912,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,4).into())
+            Err(HintError::IdentifierNotInteger(bx)) if bx.as_ref() == "a"
         );
     }
 
@@ -1068,7 +1068,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,3).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "a".to_string()
         );
     }
 
@@ -1103,7 +1103,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,3).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "a".to_string()
         );
     }
 
@@ -1156,7 +1156,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::ASSERT_LE_FELT, &mut exec_scopes, &constants),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,0).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "a".to_string()
         );
     }
 
@@ -1182,7 +1182,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code::ASSERT_LE_FELT, &mut exec_scopes, &constants),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("b".to_string(), (1,1).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "b".to_string()
         );
     }
 
@@ -1412,7 +1412,7 @@ mod tests {
         let ids_data = ids_data!["value"];
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("value".to_string(), (1,4).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "value".to_string()
         );
     }
 
@@ -2234,7 +2234,7 @@ mod tests {
                     )
                 ])
             ),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("value".to_string(), (1,3).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "value".to_string()
         );
     }
 
@@ -2404,7 +2404,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("a".to_string(), (1,1).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "a".to_string()
         );
     }
 
@@ -2421,7 +2421,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("b".to_string(), (1,2).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "b".to_string()
         );
     }
 
@@ -2439,7 +2439,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("b".to_string(), (1,2).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "b".to_string()
         );
     }
 

diff --git a/vm/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs b/vm/src/hint_processor/builtin_hint_processor/memcpy_hint_utils.rs
@@ -96,7 +96,7 @@ mod tests {
 
         assert_matches!(
             get_integer_from_var_name(var_name, &vm, &ids_data, &ApTracking::default()),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == (var_name.to_string(), (1,0).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == var_name.to_string()
         );
     }
 }
diff --git a/vm/src/hint_processor/builtin_hint_processor/memset_utils.rs b/vm/src/hint_processor/builtin_hint_processor/memset_utils.rs
@@ -100,7 +100,7 @@ mod tests {
         let ids_data = ids_data!["n"];
         assert_matches!(
             run_hint!(vm, ids_data, hint_code),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("n".to_string(), (1,1).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "n".to_string()
         );
     }
 

diff --git a/vm/src/hint_processor/builtin_hint_processor/squash_dict_utils.rs b/vm/src/hint_processor/builtin_hint_processor/squash_dict_utils.rs
@@ -700,7 +700,7 @@ mod tests {
         //Execute the hint
         assert_matches!(
             run_hint!(vm, ids_data, hint_code, &mut exec_scopes),
-            Err(HintError::IdentifierNotInteger(bx)) if *bx == ("n_used_accesses".to_string(), (1,0).into())
+            Err(HintError::IdentifierNotInteger(bx)) if *bx == "n_used_accesses".to_string()
         );
     }
 

diff --git a/vm/src/hint_processor/hint_processor_utils.rs b/vm/src/hint_processor/hint_processor_utils.rs
@@ -62,13 +62,13 @@ pub fn get_maybe_relocatable_from_reference(
         vm,
         &hint_reference.offset1,
         &hint_reference.ap_tracking_data,
-        &ap_tracking,
+        ap_tracking,
     )?;
     let offset2 = get_offset_value(
         vm,
         &hint_reference.offset2,
         &hint_reference.ap_tracking_data,
-        &ap_tracking,
+        ap_tracking,
     )?;
     let mut val = offset1.add(&offset2).ok()?;
     if hint_reference.inner_dereference && hint_reference.outer_dereference {
@@ -91,13 +91,13 @@ pub fn compute_addr_from_reference(
         vm,
         &hint_reference.offset1,
         &hint_reference.ap_tracking_data,
-        &ap_tracking,
+        ap_tracking,
     )?;
     let offset2 = get_offset_value(
         vm,
         &hint_reference.offset2,
         &hint_reference.ap_tracking_data,
-        &ap_tracking,
+        ap_tracking,
     )?;
     let mut val = offset1.add(&offset2).ok()?;
     if hint_reference.inner_dereference {