chore: use builtins iter to define os_order_iter

crates/gateway/src/compilation.rs

@@ -14,7 +14,7 @@ use starknet_sierra_compile::errors::CompilationUtilError;
 use starknet_sierra_compile::utils::into_contract_class_for_compilation;
 
 use crate::errors::{GatewayError, GatewayResult};
-use crate::utils::{is_subsequence, IntoOsOrderEnumIteratorExt};
+use crate::utils::{is_subsequence, IntoIterExt};
 
 #[cfg(test)]
 #[path = "compilation_test.rs"]

crates/gateway/src/utils.rs

@@ -178,12 +178,14 @@ pub fn is_subsequence<T: Eq>(subsequence: &[T], sequence: &[T]) -> bool {
     offset == subsequence.len()
 }
 
-// TODO(Arni): Remove the traitIntoEnumIteratorExt once EnumIter is implemented in starknet API.
-// Make sure the order is saved or address the different order.
-impl IntoOsOrderEnumIteratorExt for Builtin {
+// TODO(Arni): Remove the IntoIterExt once IntoIterEnum is implemented in starknet API.
+pub trait IntoIterExt {
+    fn iter() -> impl Iterator<Item = Builtin>;
+}
+
+impl IntoIterExt for Builtin {
     fn iter() -> impl Iterator<Item = Builtin> {
-        // The OS expects this order for the builtins.
-        vec![
+        let mut builtins_vector: Vec<Builtin> = vec![
             Builtin::Pedersen,
             Builtin::RangeCheck,
             Builtin::Ecdsa,
@@ -192,12 +194,22 @@ impl IntoOsOrderEnumIteratorExt for Builtin {
             Builtin::Poseidon,
             Builtin::SegmentArena,
             Builtin::Keccak,
-        ]
-        .into_iter()
+        ];
+        builtins_vector.sort_by_key(builtin_order);
+        builtins_vector.into_iter().into_iter()
     }
 }
 
-pub trait IntoOsOrderEnumIteratorExt {
-    /// Returns an iterator over all the builtins in the order the Starknet OS expects.
-    fn iter() -> impl Iterator<Item = Builtin>;
+// The OS expects this order for the builtins.
+fn builtin_order(builtin: &Builtin) -> usize {
+    match builtin {
+        Builtin::Pedersen => 0,
+        Builtin::RangeCheck => 1,
+        Builtin::Ecdsa => 2,
+        Builtin::Bitwise => 3,
+        Builtin::EcOp => 4,
+        Builtin::Poseidon => 5,
+        Builtin::SegmentArena => 6,
+        Builtin::Keccak => 7,
+    }
 }

crates/gateway/src/utils_test.rs

@@ -2,7 +2,7 @@ use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::transaction::Builtin;
 
-use crate::utils::{is_subsequence, IntoOsOrderEnumIteratorExt};
+use crate::utils::{is_subsequence, IntoIterExt};
 
 #[rstest]
 #[case::empty(