chore: address review comments

Author: Evalir

src/est.rs

@@ -34,7 +34,7 @@ impl SearchRange {
 
     /// Calculate the midpoint of the search range.
     pub(crate) const fn midpoint(&self) -> u64 {
-        ((self.max() as u128 + self.min() as u128) / 2) as u64
+        (self.max() + self.min()) / 2
     }
 
     /// Get the start of the search range.
@@ -296,6 +296,12 @@ mod tests {
         range.maybe_lower_max(180);
         assert_eq!(range.max(), 180);
         assert_eq!(range.midpoint(), 152);
+
+        range.maybe_raise_min(100);
+        assert_eq!(range.min(), 125);
+
+        range.maybe_lower_max(200);
+        assert_eq!(range.max(), 180);
     }
 }
 

src/evm.rs

@@ -2348,41 +2348,29 @@ where
 
 #[cfg(test)]
 mod tests {
-    use std::sync::LazyLock;
-
-    use alloy::network::{TransactionBuilder, TransactionBuilder7702};
-    use alloy::rpc::types::Authorization;
-    use alloy::signers::k256::ecdsa::SigningKey;
-    use alloy::signers::local::PrivateKeySigner;
-    use alloy::signers::SignerSync;
-    use alloy::{consensus::constants::ETH_TO_WEI, rpc::types::TransactionRequest};
-
-    use revm::context::transaction::AuthorizationTr;
-    use revm::database::InMemoryDB;
-    use revm::inspector::NoOpInspector;
-    use revm::primitives::bytes;
-
-    use crate::test_utils::{test_trevm_with_funds, LOG_BYTECODE};
-    use crate::{EvmNeedsCfg, TrevmBuilder};
-    use crate::{NoopBlock, NoopCfg};
-
+    use alloy::{
+        network::{TransactionBuilder, TransactionBuilder7702},
+        rpc::types::{Authorization, TransactionRequest},
+        signers::SignerSync,
+        consensus::constants::ETH_TO_WEI,
+    };
+    use revm::{
+        context::transaction::AuthorizationTr,
+        database::InMemoryDB,
+        primitives::bytes,
+    };
+    use crate::{
+        test_utils::{test_trevm_with_funds, ALICE, BOB, LOG_BYTECODE},
+        TrevmBuilder, NoopBlock, NoopCfg,
+    };
     use super::*;
 
-    static ALICE: LazyLock<PrivateKeySigner> =
-        LazyLock::new(|| PrivateKeySigner::from(SigningKey::from_slice(&[0x11; 32]).unwrap()));
-    static BOB: LazyLock<PrivateKeySigner> =
-        LazyLock::new(|| PrivateKeySigner::from(SigningKey::from_slice(&[0x22; 32]).unwrap()));
-
-    fn trevm_with_funds() -> EvmNeedsCfg<InMemoryDB, NoOpInspector> {
-        test_trevm_with_funds(&[
-            (ALICE.address(), U256::from(ETH_TO_WEI)),
-            (BOB.address(), U256::from(ETH_TO_WEI)),
-        ])
-    }
-
     #[test]
     fn test_estimate_gas_simple_transfer() {
-        let trevm = trevm_with_funds();
+        let trevm = test_trevm_with_funds(&[
+            (ALICE.address(), U256::from(ETH_TO_WEI)),
+            (BOB.address(), U256::from(ETH_TO_WEI)),
+        ]);
 
         let tx = TransactionRequest::default()
             .from(ALICE.address())
@@ -2394,7 +2382,7 @@ mod tests {
 
         assert!(estimation.is_success());
         // The gas used should correspond to a simple transfer.
-        assert!(estimation.gas_used() == 21000);
+        assert_eq!(estimation.gas_used(), 21000);
     }
 
     #[test]
@@ -2418,7 +2406,7 @@ mod tests {
         };
         let signature = BOB.sign_hash_sync(&authorization.signature_hash()).unwrap();
         let signed_authorization = authorization.into_signed(signature);
-        assert!(signed_authorization.authority().unwrap() == BOB.address());
+        assert_eq!(signed_authorization.authority().unwrap(), BOB.address());
 
         let tx = TransactionRequest::default()
             .from(ALICE.address())
@@ -2429,19 +2417,14 @@ mod tests {
         let (estimation, trevm) =
             trevm.fill_cfg(&NoopCfg).fill_block(&NoopBlock).fill_tx(&tx).estimate_gas().unwrap();
 
-        dbg!(&estimation);
         assert!(estimation.is_success());
 
         let tx = tx.with_gas_limit(estimation.limit());
 
-        let mut output = trevm.clear_tx().fill_tx(&tx).run().unwrap().accept();
-
-        let bob_code = output.1.read_code(BOB.address());
-        dbg!(&bob_code);
+        let output = trevm.clear_tx().fill_tx(&tx).run().unwrap().accept();
 
-        dbg!(&output.0);
         assert!(output.0.is_success());
-        assert!(output.0.logs().len() == 1);
+        assert_eq!(output.0.logs().len(), 1);
     }
 }
 

src/test_utils.rs

@@ -1,5 +1,7 @@
+use std::sync::LazyLock;
+
 use crate::{helpers::Ctx, EvmNeedsCfg, Trevm};
-use alloy::primitives::{Address, U256};
+use alloy::{primitives::{Address, U256}, signers::{k256::ecdsa::SigningKey, local::PrivateKeySigner}};
 use revm::{
     bytecode::Bytecode,
     database::{CacheDB, EmptyDB, InMemoryDB, State},
@@ -13,8 +15,30 @@ use revm::{
 };
 
 /// LogContract bytecode
+/// ```
+/// contract LogContract {
+///     event Hello();
+///     event World();
+///
+///     function emitHello() public {
+///         emit Hello();
+///     }
+///
+///     function emitWorld() public {
+///         emit World();
+///     }
+/// }
+/// ```
 pub const LOG_BYTECODE: &str = "0x60806040526004361015610013575b6100ca565b61001d5f3561003c565b80637b3ab2d01461003757639ee1a4400361000e57610097565b610064565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f91031261005a57565b61004c565b5f0190565b3461009257610074366004610050565b61007c6100ce565b610084610042565b8061008e8161005f565b0390f35b610048565b346100c5576100a7366004610050565b6100af610106565b6100b7610042565b806100c18161005f565b0390f35b610048565b5f80fd5b7fbcdfe0d5b27dd186282e187525415c57ea3077c34efb39148111e4d342e7ab0e6100f7610042565b806101018161005f565b0390a1565b7f2d67bb91f17bca05af6764ab411e86f4ddf757adb89fcec59a7d21c525d4171261012f610042565b806101398161005f565b0390a156fea2646970667358221220e22cd46ba129dcbd6f62f632cc862b0924d3f36c991fd0b45947581aa3010d6464736f6c634300081a0033";
 
+
+/// Alice testing signer
+pub static ALICE: LazyLock<PrivateKeySigner> =
+    LazyLock::new(|| PrivateKeySigner::from(SigningKey::from_slice(&[0x11; 32]).unwrap()));
+/// Bob testing signer
+pub static BOB: LazyLock<PrivateKeySigner> =
+    LazyLock::new(|| PrivateKeySigner::from(SigningKey::from_slice(&[0x22; 32]).unwrap()));
+
 impl<Insp, State> Trevm<InMemoryDB, Insp, State>
 where
     Insp: Inspector<Ctx<InMemoryDB>>,