remove err handling

foundry-rs · Jun 26, 2024 · c436cef · c436cef
1 parent 683732d
commit c436cef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/crates/evm/core/src/backend/cow.rs b/crates/evm/core/src/backend/cow.rs
@@ -245,22 +245,13 @@ impl<'a> DatabaseExt for CowBackend<'a> {
         self.backend.has_cheatcode_access(account)
     }
 
-    fn set_blockhash(&mut self, block_number: B256, block_hash: B256) -> Result<(), DatabaseError> {
-        match self
-            .backend
+    fn set_blockhash(&mut self, block_number: B256, block_hash: B256) {
+        self.backend
             .to_mut()
             .mem_db()
             .to_owned()
             .block_hashes
-            .insert(block_number.into(), block_hash)
-        {
-            Some(_) => Ok(()),
-            None => Err(DatabaseError::Other(format!(
-                "
-            Cannot set blockhash {:?} for block number {:?}",
-                block_hash, block_number
-            ))),
-        }
+            .insert(block_number.into(), block_hash);
     }
 }
 

diff --git a/crates/evm/core/src/backend/mod.rs b/crates/evm/core/src/backend/mod.rs
@@ -332,7 +332,7 @@ pub trait DatabaseExt: Database<Error = DatabaseError> {
     }
 
     /// set the blockhash for the given block number
-    fn set_blockhash(&mut self, block_number: B256, block_hash: B256) -> Result<(), DatabaseError>;
+    fn set_blockhash(&mut self, block_number: B256, block_hash: B256);
 }
 
 struct _ObjectSafe(dyn DatabaseExt);
@@ -1374,15 +1374,8 @@ impl DatabaseExt for Backend {
         self.inner.cheatcode_access_accounts.contains(account)
     }
 
-    fn set_blockhash(&mut self, block_number: B256, block_hash: B256) -> Result<(), DatabaseError> {
-        match self.mem_db.block_hashes.insert(block_number.into(), block_hash) {
-            Some(_) => Ok(()),
-            None => Err(DatabaseError::Other(format!(
-                "
-            Cannot set blockhash {:?} for block number {:?}",
-                block_hash, block_number
-            ))),
-        }
+    fn set_blockhash(&mut self, block_number: B256, block_hash: B256) {
+        self.mem_db.block_hashes.insert(block_number.into(), block_hash);
     }
 }