fix: retain Brillig solver when handling foreign calls in debugger

noir-lang · Oct 26, 2023 · 77d3d3d · 77d3d3d
1 parent 6919ba3
commit 77d3d3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/tooling/debugger/src/context.rs b/tooling/debugger/src/context.rs
@@ -70,6 +70,7 @@ impl<'a, B: BlackBoxFunctionSolver> DebugContext<'a, B> {
                     self.handle_acvm_status(status)
                 }
                 BrilligSolverStatus::ForeignCallWait(foreign_call) => {
+                    self.brillig_solver = Some(solver);
                     self.handle_foreign_call(foreign_call)
                 }
             },

diff --git a/tooling/debugger/src/repl.rs b/tooling/debugger/src/repl.rs
@@ -55,11 +55,6 @@ impl<'a, B: BlackBoxFunctionSolver> ReplDebugger<'a, B> {
         }
     }
 
-    fn handle_debug_command_result(&mut self, result: DebugCommandResult) {
-        self.last_result = result;
-        self.show_current_vm_status();
-    }
-
     fn print_location_path(&self, loc: Location) {
         let line_number = self.debug_artifact.location_line_number(loc).unwrap();
         let column_number = self.debug_artifact.location_column_number(loc).unwrap();
@@ -141,6 +136,11 @@ impl<'a, B: BlackBoxFunctionSolver> ReplDebugger<'a, B> {
         }
     }
 
+    fn handle_debug_command_result(&mut self, result: DebugCommandResult) {
+        self.last_result = result;
+        self.show_current_vm_status();
+    }
+
     fn step_acir_opcode(&mut self) {
         if self.validate_in_progress() {
             let result = self.context.step_acir_opcode();