chore: add and use EvmContext::take_error (bluealloy#1264)

taikoxyz · Apr 5, 2024 · 5e730a6 · 5e730a6
1 parent 4d64bbc
commit 5e730a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/crates/revm/src/context/inner_evm_context.rs b/crates/revm/src/context/inner_evm_context.rs
@@ -113,6 +113,11 @@ impl<DB: Database> InnerEvmContext<DB> {
         &mut self.env
     }
 
+    /// Returns the error by replacing it with `Ok(())`, if any.
+    pub fn take_error(&mut self) -> Result<(), EVMError<DB::Error>> {
+        core::mem::replace(&mut self.error, Ok(()))
+    }
+
     /// Fetch block hash from database.
     #[inline]
     pub fn block_hash(&mut self, number: U256) -> Result<B256, EVMError<DB::Error>> {

diff --git a/crates/revm/src/evm.rs b/crates/revm/src/evm.rs
@@ -266,7 +266,7 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
 
             // take error and break the loop if there is any.
             // This error is set From Interpreter when it's interacting with Host.
-            core::mem::replace(&mut self.context.evm.error, Ok(()))?;
+            self.context.evm.take_error()?;
             // take shared memory back.
             shared_memory = interpreter.take_memory();
 

diff --git a/crates/revm/src/handler/mainnet/execution.rs b/crates/revm/src/handler/mainnet/execution.rs
@@ -88,7 +88,7 @@ pub fn insert_call_outcome<EXT, DB: Database>(
     shared_memory: &mut SharedMemory,
     outcome: CallOutcome,
 ) -> Result<(), EVMError<DB::Error>> {
-    core::mem::replace(&mut context.evm.error, Ok(()))?;
+    context.evm.take_error()?;
     frame
         .frame_data_mut()
         .interpreter
@@ -128,7 +128,7 @@ pub fn insert_create_outcome<EXT, DB: Database>(
     frame: &mut Frame,
     outcome: CreateOutcome,
 ) -> Result<(), EVMError<DB::Error>> {
-    core::mem::replace(&mut context.evm.error, Ok(()))?;
+    context.evm.take_error()?;
     frame
         .frame_data_mut()
         .interpreter

diff --git a/crates/revm/src/handler/mainnet/post_execution.rs b/crates/revm/src/handler/mainnet/post_execution.rs
@@ -76,7 +76,7 @@ pub fn output<EXT, DB: Database>(
     context: &mut Context<EXT, DB>,
     result: FrameResult,
 ) -> Result<ResultAndState, EVMError<DB::Error>> {
-    core::mem::replace(&mut context.evm.error, Ok(()))?;
+    context.evm.take_error()?;
     // used gas with refund calculated.
     let gas_refunded = result.gas().refunded() as u64;
     let final_gas_used = result.gas().spent() - gas_refunded;