From 83b7c138dc2e4a2058d178dfa66eaa9b88ed8c3a Mon Sep 17 00:00:00 2001
From: viktorking7 <140458814+viktorking7@users.noreply.github.com>
Date: Sun, 8 Feb 2026 10:38:11 +0100
Subject: [PATCH 1/2] Update utils.rs

---
 vm/src/utils.rs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/vm/src/utils.rs b/vm/src/utils.rs
index 2fca1e3a2b..0fc70a8073 100644
--- a/vm/src/utils.rs
+++ b/vm/src/utils.rs
@@ -577,13 +577,13 @@ pub mod test_utils {
             tracker.insert_value(&MaybeRelocatable::from($key), &MaybeRelocatable::from($val));
             )*
             let mut dict_manager = DictManager::new();
-            dict_manager.trackers.insert(2, tracker);
+            dict_manager.trackers.insert($tracker_num, tracker);
             $exec_scopes.insert_value("dict_manager", crate::stdlib::rc::Rc::new(core::cell::RefCell::new(dict_manager)))
         };
         ($exec_scopes:expr, $tracker_num:expr) => {
             let  tracker = DictTracker::new_empty(relocatable!($tracker_num, 0));
             let mut dict_manager = DictManager::new();
-            dict_manager.trackers.insert(2, tracker);
+            dict_manager.trackers.insert($tracker_num, tracker);
             $exec_scopes.insert_value("dict_manager", crate::stdlib::rc::Rc::new(core::cell::RefCell::new(dict_manager)))
         };
 
@@ -597,13 +597,13 @@ pub mod test_utils {
             tracker.insert_value(&MaybeRelocatable::from($key), &MaybeRelocatable::from($val));
             )*
             let mut dict_manager = DictManager::new();
-            dict_manager.trackers.insert(2, tracker);
+            dict_manager.trackers.insert($tracker_num, tracker);
             $exec_scopes.insert_value("dict_manager", crate::stdlib::rc::Rc::new(core::cell::RefCell::new(dict_manager)))
         };
         ($exec_scopes:expr, $tracker_num:expr,$default:expr) => {
             let tracker = DictTracker::new_default_dict(relocatable!($tracker_num, 0), &MaybeRelocatable::from($default), None);
             let mut dict_manager = DictManager::new();
-            dict_manager.trackers.insert(2, tracker);
+            dict_manager.trackers.insert($tracker_num, tracker);
             $exec_scopes.insert_value("dict_manager", crate::stdlib::rc::Rc::new(core::cell::RefCell::new(dict_manager)))
         };
     }
@@ -922,6 +922,21 @@ mod test {
         );
     }
 
+    #[test]
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+    fn dict_manager_macro_uses_tracker_num() {
+        let tracker_num = 7;
+        let tracker = DictTracker::new_empty(relocatable!(tracker_num, 0));
+        let mut dict_manager = DictManager::new();
+        dict_manager.trackers.insert(tracker_num, tracker);
+        let mut exec_scopes = ExecutionScopes::new();
+        dict_manager!(exec_scopes, tracker_num);
+        assert_matches::assert_matches!(
+            exec_scopes.get_dict_manager(),
+            Ok(x) if x == Rc::new(RefCell::new(dict_manager))
+        );
+    }
+
     #[test]
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn dict_manager_default_macro() {

From 3cf9c7d0a3c2a04457784f5c00865ace1c61888a Mon Sep 17 00:00:00 2001
From: viktorking7 <140458814+viktorking7@users.noreply.github.com>
Date: Mon, 9 Feb 2026 22:06:49 +0100
Subject: [PATCH 2/2] Update utils.rs

---
 vm/src/utils.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/vm/src/utils.rs b/vm/src/utils.rs
index 0fc70a8073..128beed05d 100644
--- a/vm/src/utils.rs
+++ b/vm/src/utils.rs
@@ -922,21 +922,6 @@ mod test {
         );
     }
 
-    #[test]
-    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
-    fn dict_manager_macro_uses_tracker_num() {
-        let tracker_num = 7;
-        let tracker = DictTracker::new_empty(relocatable!(tracker_num, 0));
-        let mut dict_manager = DictManager::new();
-        dict_manager.trackers.insert(tracker_num, tracker);
-        let mut exec_scopes = ExecutionScopes::new();
-        dict_manager!(exec_scopes, tracker_num);
-        assert_matches::assert_matches!(
-            exec_scopes.get_dict_manager(),
-            Ok(x) if x == Rc::new(RefCell::new(dict_manager))
-        );
-    }
-
     #[test]
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn dict_manager_default_macro() {