Use_BTreeMap_in_pie_additional_data (#2162)

Author: YairVaknin-starkware

vm/src/tests/cairo_pie_test.rs

@@ -9,7 +9,7 @@ use wasm_bindgen_test::*;
 use crate::{
     cairo_run::{cairo_run, CairoRunConfig},
     hint_processor::builtin_hint_processor::builtin_hint_processor_definition::BuiltinHintProcessor,
-    stdlib::collections::{BTreeMap, HashMap},
+    stdlib::collections::BTreeMap,
     types::relocatable::Relocatable,
     vm::runners::{
         cairo_pie::{
@@ -83,8 +83,8 @@ fn pedersen_test() {
         (
             BuiltinName::output,
             BuiltinAdditionalData::Output(OutputBuiltinAdditionalData {
-                pages: HashMap::new(),
-                attributes: HashMap::new(),
+                pages: BTreeMap::new(),
+                attributes: BTreeMap::new(),
             }),
         ),
         (
@@ -156,7 +156,7 @@ fn common_signature() {
     // additional_data
     let expected_additional_data = BTreeMap::from([(
         BuiltinName::ecdsa,
-        BuiltinAdditionalData::Signature(HashMap::from([(
+        BuiltinAdditionalData::Signature(BTreeMap::from([(
             Relocatable::from((2, 0)),
             (
                 felt_str!(

vm/src/vm/runners/builtin_runner/output.rs

@@ -1,4 +1,4 @@
-use crate::stdlib::{collections::HashMap, prelude::*};
+use crate::stdlib::{collections::BTreeMap, prelude::*};
 use crate::types::builtin_name::BuiltinName;
 use crate::types::relocatable::{MaybeRelocatable, Relocatable};
 use crate::vm::errors::memory_errors::MemoryError;
@@ -32,8 +32,8 @@ impl OutputBuiltinRunner {
         OutputBuiltinRunner {
             base: 0,
             base_offset: 0,
-            pages: HashMap::default(),
-            attributes: HashMap::default(),
+            pages: BTreeMap::default(),
+            attributes: BTreeMap::default(),
             stop_ptr: None,
             included,
         }
@@ -42,8 +42,8 @@ impl OutputBuiltinRunner {
     pub fn new_state(&mut self, base: usize, base_offset: usize, included: bool) {
         self.base = base;
         self.base_offset = base_offset;
-        self.pages = HashMap::default();
-        self.attributes = HashMap::default();
+        self.pages = BTreeMap::default();
+        self.attributes = BTreeMap::default();
         self.stop_ptr = None;
         self.included = included;
     }
@@ -209,7 +209,6 @@ impl Default for OutputBuiltinRunner {
 mod tests {
     use super::*;
     use crate::relocatable;
-    use crate::stdlib::collections::HashMap;
 
     use crate::{
         utils::test_utils::*,
@@ -477,8 +476,8 @@ mod tests {
         assert_eq!(
             builtin.get_additional_data(),
             BuiltinAdditionalData::Output(OutputBuiltinAdditionalData {
-                pages: HashMap::default(),
-                attributes: HashMap::default()
+                pages: BTreeMap::default(),
+                attributes: BTreeMap::default()
             })
         )
     }
@@ -500,8 +499,8 @@ mod tests {
         let new_state = OutputBuiltinState {
             base: 10,
             base_offset: 0,
-            pages: HashMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
-            attributes: HashMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
+            pages: BTreeMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
+            attributes: BTreeMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
         };
         builtin.set_state(new_state.clone());
 
@@ -518,8 +517,8 @@ mod tests {
         let mut builtin = OutputBuiltinRunner {
             base: 10,
             base_offset: 0,
-            pages: HashMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
-            attributes: HashMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
+            pages: BTreeMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
+            attributes: BTreeMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
             stop_ptr: Some(10),
             included: true,
         };
@@ -553,7 +552,7 @@ mod tests {
 
         assert_eq!(
             builtin.pages,
-            HashMap::from([(1, PublicMemoryPage { start: 0, size: 3 }),])
+            BTreeMap::from([(1, PublicMemoryPage { start: 0, size: 3 }),])
         )
     }
 
@@ -580,7 +579,7 @@ mod tests {
         let values = vec![0, 12, 30];
         builtin.add_attribute(name.clone(), values.clone());
 
-        assert_eq!(builtin.attributes, HashMap::from([(name, values)]));
+        assert_eq!(builtin.attributes, BTreeMap::from([(name, values)]));
     }
 
     #[test]
@@ -624,8 +623,8 @@ mod tests {
         let builtin_a = OutputBuiltinRunner {
             base: 0,
             base_offset: 0,
-            pages: HashMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
-            attributes: HashMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
+            pages: BTreeMap::from([(1, PublicMemoryPage { start: 0, size: 3 })]),
+            attributes: BTreeMap::from([("gps_fact_topology".to_string(), vec![0, 2, 0])]),
             stop_ptr: None,
             included: true,
         };

vm/src/vm/runners/builtin_runner/signature.rs

@@ -1,6 +1,11 @@
 use crate::air_private_input::{PrivateInput, PrivateInputSignature, SignatureInput};
 use crate::math_utils::div_mod;
-use crate::stdlib::{cell::RefCell, collections::HashMap, prelude::*, rc::Rc};
+use crate::stdlib::{
+    cell::RefCell,
+    collections::{BTreeMap, HashMap},
+    prelude::*,
+    rc::Rc,
+};
 
 use crate::types::builtin_name::BuiltinName;
 use crate::types::instance_definitions::ecdsa_instance_def::CELLS_PER_SIGNATURE;
@@ -162,7 +167,7 @@ impl SignatureBuiltinRunner {
 
     pub fn get_additional_data(&self) -> BuiltinAdditionalData {
         // Convert signatures to Felt tuple
-        let signatures: HashMap<Relocatable, (Felt252, Felt252)> = self
+        let signatures: BTreeMap<Relocatable, (Felt252, Felt252)> = self
             .signatures
             .borrow()
             .iter()
@@ -523,7 +528,7 @@ mod tests {
             },
         )]);
         builtin.signatures = Rc::new(RefCell::new(signatures));
-        let signatures = HashMap::from([(
+        let signatures = BTreeMap::from([(
             Relocatable::from((4, 0)),
             (felt_str!("45678"), felt_str!("1239")),
         )]);

vm/src/vm/runners/cairo_pie.rs

@@ -75,8 +75,8 @@ impl From<&Vec<usize>> for PublicMemoryPage {
 }
 
 // HashMap value based on starknet/core/os/output.cairo usage
-pub type Attributes = HashMap<String, Vec<usize>>;
-pub type Pages = HashMap<usize, PublicMemoryPage>;
+pub type Attributes = BTreeMap<String, Vec<usize>>;
+pub type Pages = BTreeMap<usize, PublicMemoryPage>;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct OutputBuiltinAdditionalData {
@@ -96,7 +96,7 @@ pub enum BuiltinAdditionalData {
     Output(OutputBuiltinAdditionalData),
     // Signatures are composed of (r, s) tuples
     #[serde(with = "serde_impl::signature_additional_data")]
-    Signature(HashMap<Relocatable, (Felt252, Felt252)>),
+    Signature(BTreeMap<Relocatable, (Felt252, Felt252)>),
     None,
 }
 
@@ -765,7 +765,7 @@ pub(super) mod serde_impl {
         use super::*;
 
         pub fn serialize<S>(
-            values: &HashMap<Relocatable, (Felt252, Felt252)>,
+            values: &BTreeMap<Relocatable, (Felt252, Felt252)>,
             serializer: S,
         ) -> Result<S::Ok, S::Error>
         where
@@ -787,30 +787,30 @@ pub(super) mod serde_impl {
 
         pub fn deserialize<'de, D>(
             d: D,
-        ) -> Result<HashMap<Relocatable, (Felt252, Felt252)>, D::Error>
+        ) -> Result<BTreeMap<Relocatable, (Felt252, Felt252)>, D::Error>
         where
             D: Deserializer<'de>,
         {
             let number_map = Vec::<((Number, Number), (Number, Number))>::deserialize(d)?;
-            let mut res = HashMap::with_capacity(number_map.len());
-            for ((index, offset), (r, s)) in number_map.into_iter() {
-                let addr = Relocatable::from((
-                    index
+            number_map
+                .into_iter()
+                .map(|((index, offset), (r, s))| {
+                    let idx = index
                         .as_u64()
                         .ok_or_else(|| D::Error::custom("Invalid address"))?
-                        as isize,
-                    offset
+                        as isize;
+                    let off = offset
                         .as_u64()
                         .ok_or_else(|| D::Error::custom("Invalid address"))?
-                        as usize,
-                ));
-                let r = Felt252::from_dec_str(r.as_str())
-                    .map_err(|_| D::Error::custom("Invalid Felt252 value"))?;
-                let s = Felt252::from_dec_str(s.as_str())
-                    .map_err(|_| D::Error::custom("Invalid Felt252 value"))?;
-                res.insert(addr, (r, s));
-            }
-            Ok(res)
+                        as usize;
+                    let addr = Relocatable::from((idx, off));
+                    let r = Felt252::from_dec_str(r.as_str())
+                        .map_err(|_| D::Error::custom("Invalid Felt252 value"))?;
+                    let s = Felt252::from_dec_str(s.as_str())
+                        .map_err(|_| D::Error::custom("Invalid Felt252 value"))?;
+                    Ok((addr, (r, s)))
+                })
+                .collect::<Result<BTreeMap<_, _>, D::Error>>()
         }
     }
 

vm/src/vm/runners/cairo_runner.rs

@@ -1072,7 +1072,7 @@ impl CairoRunner {
             .unwrap_or(self.vm.current_step);
         let n_memory_holes = self.get_memory_holes()?;
 
-        let mut builtin_instance_counter = HashMap::new();
+        let mut builtin_instance_counter = BTreeMap::new();
         for builtin_runner in &self.vm.builtin_runners {
             builtin_instance_counter.insert(
                 builtin_runner.name(),
@@ -1083,7 +1083,7 @@ impl CairoRunner {
         Ok(ExecutionResources {
             n_steps,
             n_memory_holes,
-            builtin_instance_counter: builtin_instance_counter.into_iter().collect(),
+            builtin_instance_counter,
         })
     }