Move vm creation to before entrypoint initalization

Author: JulianGCalderon

vm/src/vm/runners/cairo_runner_2.rs

@@ -81,28 +81,30 @@ impl CairoRunner2 {
             }
         }
 
+        let mut virtual_machine = VirtualMachineBuilder::default()
+            .builtin_runners(builtin_runners)
+            .segments(memory_segment_manager)
+            .build();
+
         // TODO: implement main entrypoint initialization
         let pc = (|| todo!())();
         let ap = (|| todo!())();
         let fp = (|| todo!())();
 
         let run_context = RunContext::new(pc, ap, fp);
 
-        for builtin_runner in &mut builtin_runners {
-            builtin_runner.add_validation_rule(&mut memory_segment_manager.memory)
+        for builtin_runner in &mut virtual_machine.builtin_runners {
+            builtin_runner.add_validation_rule(&mut virtual_machine.segments.memory)
         }
 
-        memory_segment_manager
+        virtual_machine.set_run_context(run_context);
+
+        virtual_machine
+            .segments
             .memory
             .validate_existing_memory()
             .map_err(RunnerError::MemoryValidationError)?;
 
-        let virtual_machine = VirtualMachineBuilder::default()
-            .builtin_runners(builtin_runners)
-            .segments(memory_segment_manager)
-            .run_context(run_context)
-            .build();
-
         Ok(Self {
             executable,
             virtual_machine,

vm/src/vm/vm_core.rs

@@ -1067,6 +1067,11 @@ impl VirtualMachine {
         self.run_context.set_pc(pc)
     }
 
+    #[doc(hidden)]
+    pub fn set_run_context(&mut self, run_context: RunContext) {
+        self.run_context = run_context;
+    }
+
     pub fn get_segment_used_size(&self, index: usize) -> Option<usize> {
         self.segments.get_segment_used_size(index)
     }