fix(Inspector): call handler functions (#2026)

* fix: call handler functions * fix last frame result
bluealloy · Jan 27, 2025 · a8f9824 · a8f9824
1 parent be92e1d
commit a8f9824
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 44 deletions.
diff --git a/crates/handler/interface/src/frame.rs b/crates/handler/interface/src/frame.rs
@@ -14,12 +14,6 @@ pub trait Frame: Sized {
         frame_input: Self::FrameInit,
     ) -> Result<FrameOrResult<Self>, Self::Error>;
 
-    fn final_return(
-        context: &mut Self::Context,
-        frame_context: &mut Self::FrameContext,
-        result: &mut Self::FrameResult,
-    ) -> Result<(), Self::Error>;
-
     fn init(
         &self,
         context: &mut Self::Context,

diff --git a/crates/handler/src/frame.rs b/crates/handler/src/frame.rs
@@ -516,14 +516,6 @@ where
         Self::init_with_context(0, frame_input, memory, context, frame_context)
     }
 
-    fn final_return(
-        _context: &mut Self::Context,
-        _frame_context: &mut Self::FrameContext,
-        _result: &mut Self::FrameResult,
-    ) -> Result<(), Self::Error> {
-        Ok(())
-    }
-
     fn init(
         &self,
         context: &mut CTX,

diff --git a/crates/handler/src/handler.rs b/crates/handler/src/handler.rs
@@ -181,7 +181,7 @@ pub trait EthHandler {
     }
 
     fn frame_init(
-        &self,
+        &mut self,
         frame: &Self::Frame,
         context: &mut Self::Context,
         frame_context: &mut <Self::Frame as Frame>::FrameContext,
@@ -209,35 +209,28 @@ pub trait EthHandler {
         Self::Frame::return_result(frame, context, frame_context, result)
     }
 
-    fn frame_final_return(
-        context: &mut Self::Context,
-        frame_context: &mut <Self::Frame as Frame>::FrameContext,
-        result: &mut <Self::Frame as Frame>::FrameResult,
-    ) -> Result<(), Self::Error> {
-        Self::Frame::final_return(context, frame_context, result)?;
-        Ok(())
-    }
-
     fn run_exec_loop(
-        &self,
+        &mut self,
         context: &mut Self::Context,
         frame_context: &mut <Self::Frame as Frame>::FrameContext,
         frame: Self::Frame,
     ) -> Result<FrameResult, Self::Error> {
         let mut frame_stack: Vec<Self::Frame> = vec![frame];
         loop {
             let frame = frame_stack.last_mut().unwrap();
-            let call_or_result = frame.run(context, frame_context)?;
-
-            let mut result = match call_or_result {
-                ItemOrResult::Item(init) => match frame.init(context, frame_context, init)? {
-                    ItemOrResult::Item(new_frame) => {
-                        frame_stack.push(new_frame);
-                        continue;
+            let call_or_result = self.frame_call(frame, context, frame_context)?;
+
+            let result = match call_or_result {
+                ItemOrResult::Item(init) => {
+                    match self.frame_init(frame, context, frame_context, init)? {
+                        ItemOrResult::Item(new_frame) => {
+                            frame_stack.push(new_frame);
+                            continue;
+                        }
+                        // Dont pop the frame as new frame was not created.
+                        ItemOrResult::Result(result) => result,
                     }
-                    // Dont pop the frame as new frame was not created.
-                    ItemOrResult::Result(result) => result,
-                },
+                }
                 ItemOrResult::Result(result) => {
                     // Pop frame that returned result
                     frame_stack.pop();
@@ -246,10 +239,9 @@ pub trait EthHandler {
             };
 
             let Some(frame) = frame_stack.last_mut() else {
-                Self::Frame::final_return(context, frame_context, &mut result)?;
                 return Ok(result);
             };
-            frame.return_result(context, frame_context, result)?;
+            self.frame_return_result(frame, context, frame_context, result)?;
         }
     }
 

diff --git a/crates/inspector/src/inspector.rs b/crates/inspector/src/inspector.rs
@@ -279,7 +279,7 @@ where
     }
 
     fn frame_init(
-        &self,
+        &mut self,
         frame: &Self::Frame,
         context: &mut Self::Context,
         frame_context: &mut <<Self as EthHandler>::Frame as Frame>::FrameContext,
@@ -321,12 +321,14 @@ where
             .frame_return_result(frame, context, frame_context, result)
     }
 
-    fn frame_final_return(
+    fn last_frame_result(
+        &self,
         context: &mut Self::Context,
-        _frame_context: &mut <<Self as EthHandler>::Frame as Frame>::FrameContext,
-        result: &mut <<Self as EthHandler>::Frame as Frame>::FrameResult,
+        frame_context: &mut <Self::Frame as Frame>::FrameContext,
+        frame_result: &mut <Self::Frame as Frame>::FrameResult,
     ) -> Result<(), Self::Error> {
-        context.frame_end(result);
-        Ok(())
+        context.frame_end(frame_result);
+        self.handler
+            .last_frame_result(context, frame_context, frame_result)
     }
 }
diff --git a/crates/inspector/src/inspector_context.rs b/crates/inspector/src/inspector_context.rs
@@ -113,7 +113,10 @@ where
     fn frame_end(&mut self, frame_output: &mut FrameResult) {
         let insp = self.inspector.get_inspector();
         let context = &mut self.inner;
-        let frame_input = self.frame_input_stack.pop().expect("Frame pushed");
+        let Some(frame_input) = self.frame_input_stack.pop() else {
+            // case where call returns immediately will not push to call stack.
+            return;
+        };
         match frame_output {
             FrameResult::Call(outcome) => {
                 let FrameInput::Call(i) = frame_input else {