Remove constants parameter

Author: JulianGCalderon

hint_accountant/src/main.rs

@@ -52,12 +52,11 @@ fn run() {
     }
     let mut vm = VirtualMachine::new(false, false);
     let mut hint_executor = BuiltinHintProcessor::new_empty();
-    let (ap_tracking_data, reference_ids, references, mut exec_scopes, constants) = (
+    let (ap_tracking_data, reference_ids, references, mut exec_scopes) = (
         ApTracking::default(),
         HashMap::new(),
         Vec::new(),
         ExecutionScopes::new(),
-        HashMap::new(),
     );
     let missing_hints: HashSet<_> = whitelists
         .into_iter()
@@ -74,7 +73,7 @@ fn run() {
                 )
                 .expect("this implementation is infallible");
             matches!(
-                hint_executor.execute_hint(&mut vm, &mut exec_scopes, &hint_data, &constants,),
+                hint_executor.execute_hint(&mut vm, &mut exec_scopes, &hint_data),
                 Err(HintError::UnknownHint(_)),
             )
         })

vm/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs

@@ -189,7 +189,6 @@ impl HintProcessorLogic for BuiltinHintProcessor {
         vm: &mut VirtualMachine,
         exec_scopes: &mut ExecutionScopes,
         hint_data: &Box<dyn Any>,
-        _constants: &HashMap<String, Felt252>,
     ) -> Result<(), HintError> {
         let hint_data = hint_data
             .downcast_ref::<HintProcessorData>()
@@ -1451,24 +1450,14 @@ mod tests {
         let hint_data =
             HintProcessorData::new_default(String::from("enter_scope_custom_a"), HashMap::new());
         assert_matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, exec_scopes, &any_box!(hint_data),),
             Ok(())
         );
         assert_eq!(exec_scopes.data.len(), 2);
         let hint_data =
             HintProcessorData::new_default(String::from("enter_scope_custom_a"), HashMap::new());
         assert_matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, exec_scopes, &any_box!(hint_data),),
             Ok(())
         );
         assert_eq!(exec_scopes.data.len(), 3);

vm/src/hint_processor/cairo_1_hint_processor/hint_processor.rs

@@ -1285,8 +1285,6 @@ impl HintProcessorLogic for Cairo1HintProcessor {
         exec_scopes: &mut ExecutionScopes,
         //Data structure that can be downcasted to the structure generated by compile_hint
         hint_data: &Box<dyn Any>,
-        //Constant values extracted from the program specification.
-        _constants: &HashMap<String, Felt252>,
     ) -> Result<(), HintError> {
         let hints: &Vec<Hint> = hint_data.downcast_ref().ok_or(HintError::WrongHintData)?;
         for hint in hints {

vm/src/hint_processor/hint_processor_definition.rs

@@ -29,8 +29,6 @@ pub trait HintProcessorLogic {
         exec_scopes: &mut ExecutionScopes,
         //Data structure that can be downcasted to the structure generated by compile_hint
         hint_data: &Box<dyn Any>,
-        //Constant values extracted from the program specification.
-        constants: &HashMap<String, Felt252>,
     ) -> Result<(), HintError>;
 
     //Transforms hint data outputed by the VM into whichever format will be later used by execute_hint
@@ -67,10 +65,8 @@ pub trait HintProcessorLogic {
         exec_scopes: &mut ExecutionScopes,
         //Data structure that can be downcasted to the structure generated by compile_hint
         hint_data: &Box<dyn Any>,
-        //Constant values extracted from the program specification.
-        constants: &HashMap<String, Felt252>,
     ) -> Result<HintExtension, HintError> {
-        self.execute_hint(vm, exec_scopes, hint_data, constants)?;
+        self.execute_hint(vm, exec_scopes, hint_data)?;
         Ok(HintExtension::default())
     }
 }

vm/src/tests/run_deprecated_contract_class_simplified.rs

@@ -82,8 +82,6 @@ impl HintProcessorLogic for SimplifiedOsHintProcessor {
         _exec_scopes: &mut crate::types::exec_scope::ExecutionScopes,
         //Data structure that can be downcasted to the structure generated by compile_hint
         _hint_data: &Box<dyn core::any::Any>,
-        //Constant values extracted from the program specification.
-        _constants: &HashMap<String, Felt252>,
     ) -> Result<(), crate::vm::errors::hint_errors::HintError> {
         // Empty impl as we are using `execute_hint_extensive` instead for this case
         Ok(())
@@ -95,19 +93,15 @@ impl HintProcessorLogic for SimplifiedOsHintProcessor {
         exec_scopes: &mut crate::types::exec_scope::ExecutionScopes,
         //Data structure that can be downcasted to the structure generated by compile_hint
         hint_data: &Box<dyn core::any::Any>,
-        //Constant values extracted from the program specification.
-        constants: &HashMap<String, Felt252>,
     ) -> Result<
         crate::hint_processor::hint_processor_definition::HintExtension,
         crate::vm::errors::hint_errors::HintError,
     > {
         // First attempt to execute with builtin hint processor
-        match self.builtin_hint_processor.execute_hint_extensive(
-            vm,
-            exec_scopes,
-            hint_data,
-            constants,
-        ) {
+        match self
+            .builtin_hint_processor
+            .execute_hint_extensive(vm, exec_scopes, hint_data)
+        {
             Err(HintError::UnknownHint(_)) => {}
             res => return res,
         }

vm/src/utils.rs

@@ -478,38 +478,23 @@ pub mod test_utils {
             let constants: &HashMap<String, Felt252> = $constants;
             hint_data.constants = crate::stdlib::rc::Rc::new(constants.clone());
             let mut hint_processor = BuiltinHintProcessor::new_empty();
-            hint_processor.execute_hint(
-                &mut $vm,
-                $exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::default(),
-            )
+            hint_processor.execute_hint(&mut $vm, $exec_scopes, &any_box!(hint_data))
         }};
         ($vm:expr, $ids_data:expr, $hint_code:expr, $exec_scopes:expr) => {{
             let hint_data = HintProcessorData::new_default(
                 crate::stdlib::string::ToString::to_string($hint_code),
                 $ids_data,
             );
             let mut hint_processor = BuiltinHintProcessor::new_empty();
-            hint_processor.execute_hint(
-                &mut $vm,
-                $exec_scopes,
-                &any_box!(hint_data),
-                &crate::stdlib::collections::HashMap::new(),
-            )
+            hint_processor.execute_hint(&mut $vm, $exec_scopes, &any_box!(hint_data))
         }};
         ($vm:expr, $ids_data:expr, $hint_code:expr) => {{
             let hint_data = HintProcessorData::new_default(
                 crate::stdlib::string::ToString::to_string($hint_code),
                 $ids_data,
             );
             let mut hint_processor = BuiltinHintProcessor::new_empty();
-            hint_processor.execute_hint(
-                &mut $vm,
-                exec_scopes_ref!(),
-                &any_box!(hint_data),
-                &crate::stdlib::collections::HashMap::new(),
-            )
+            hint_processor.execute_hint(&mut $vm, exec_scopes_ref!(), &any_box!(hint_data))
         }};
     }
     pub(crate) use run_hint;

vm/src/vm/runners/cairo_runner.rs

@@ -709,6 +709,7 @@ impl CairoRunner {
                     .unwrap_or(&[]),
                 #[cfg(feature = "extensive_hints")]
                 &mut hint_ranges,
+                #[cfg(feature = "test_utils")]
                 &self.program.constants,
             )?;
 
@@ -765,6 +766,7 @@ impl CairoRunner {
                 hint_data,
                 #[cfg(feature = "extensive_hints")]
                 &mut hint_ranges,
+                #[cfg(feature = "test_utils")]
                 &self.program.constants,
             )?;
         }

vm/src/vm/vm_core.rs

@@ -526,11 +526,10 @@ impl VirtualMachine {
         hint_processor: &mut dyn HintProcessor,
         exec_scopes: &mut ExecutionScopes,
         hint_datas: &[Box<dyn Any>],
-        constants: &HashMap<String, Felt252>,
     ) -> Result<(), VirtualMachineError> {
         for (hint_index, hint_data) in hint_datas.iter().enumerate() {
             hint_processor
-                .execute_hint(self, exec_scopes, hint_data, constants)
+                .execute_hint(self, exec_scopes, hint_data)
                 .map_err(|err| VirtualMachineError::Hint(Box::new((hint_index, err))))?
         }
         Ok(())
@@ -543,7 +542,6 @@ impl VirtualMachine {
         exec_scopes: &mut ExecutionScopes,
         hint_datas: &mut Vec<Box<dyn Any>>,
         hint_ranges: &mut HashMap<Relocatable, HintRange>,
-        constants: &HashMap<String, Felt252>,
     ) -> Result<(), VirtualMachineError> {
         // Check if there is a hint range for the current pc
         if let Some((s, l)) = hint_ranges.get(&self.run_context.pc) {
@@ -556,7 +554,6 @@ impl VirtualMachine {
                         self,
                         exec_scopes,
                         hint_datas.get(idx).ok_or(VirtualMachineError::Unexpected)?,
-                        constants,
                     )
                     .map_err(|err| VirtualMachineError::Hint(Box::new((idx - s, err))))?;
                 // Update the hint_ranges & hint_datas with the hints added by the executed hint
@@ -617,15 +614,14 @@ impl VirtualMachine {
         #[cfg(feature = "extensive_hints")] hint_datas: &mut Vec<Box<dyn Any>>,
         #[cfg(not(feature = "extensive_hints"))] hint_datas: &[Box<dyn Any>],
         #[cfg(feature = "extensive_hints")] hint_ranges: &mut HashMap<Relocatable, HintRange>,
-        constants: &HashMap<String, Felt252>,
+        #[cfg(feature = "test_utils")] constants: &HashMap<String, Felt252>,
     ) -> Result<(), VirtualMachineError> {
         self.step_hint(
             hint_processor,
             exec_scopes,
             hint_datas,
             #[cfg(feature = "extensive_hints")]
             hint_ranges,
-            constants,
         )?;
 
         #[cfg(feature = "test_utils")]
@@ -3271,6 +3267,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new(),
             ),
             Ok(())
@@ -3508,6 +3505,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new(),
             ),
             Ok(())
@@ -3592,6 +3590,7 @@ mod tests {
                     &mut Vec::new(),
                     #[cfg(feature = "extensive_hints")]
                     &mut HashMap::new(),
+                    #[cfg(feature = "test_utils")]
                     &HashMap::new()
                 ),
                 Ok(())
@@ -3701,6 +3700,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new()
             ),
             Ok(())
@@ -3724,6 +3724,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new()
             ),
             Ok(())
@@ -3748,6 +3749,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new()
             ),
             Ok(())
@@ -4325,6 +4327,7 @@ mod tests {
                         Relocatable::from((0, 0)),
                         (0_usize, NonZeroUsize::new(1).unwrap())
                     )]),
+                    #[cfg(feature = "test_utils")]
                     &HashMap::new(),
                 ),
                 Ok(())
@@ -5348,6 +5351,7 @@ mod tests {
                 &mut Vec::new(),
                 #[cfg(feature = "extensive_hints")]
                 &mut HashMap::new(),
+                #[cfg(feature = "test_utils")]
                 &HashMap::new()
             ),
             Ok(())
@@ -5435,6 +5439,7 @@ mod tests {
                     &mut Vec::new(),
                     #[cfg(feature = "extensive_hints")]
                     &mut HashMap::new(),
+                    #[cfg(feature = "test_utils")]
                     &HashMap::new()
                 ),
                 Ok(())