fix: bytes

Author: prestwich

src/builder.rs

@@ -45,10 +45,19 @@ impl<Db, Insp> TrevmBuilder<Db, Insp> {
     }
 
     /// Set the inspector for the EVM.
+    ///
+    /// Equivalent to [`Self::with_inspector`].
     pub fn with_insp<OInsp>(self, insp: OInsp) -> TrevmBuilder<Db, OInsp> {
         TrevmBuilder { db: self.db, insp, spec: self.spec, precompiles: self.precompiles }
     }
 
+    /// Set the inspector for the EVM.
+    ///
+    /// Equivalent to [`Self::with_insp`].
+    pub fn with_inspector<OInsp>(self, insp: OInsp) -> TrevmBuilder<Db, OInsp> {
+        self.with_insp(insp)
+    }
+
     /// Set the spec id for the EVM.
     pub const fn with_spec_id(mut self, spec: SpecId) -> Self {
         self.spec = spec;

src/evm.rs

@@ -2348,22 +2348,21 @@ where
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+    use crate::{
+        test_utils::{test_trevm_with_funds, ALICE, BOB, LOG_DEPLOYED_BYTECODE},
+        NoopBlock, NoopCfg, TrevmBuilder,
+    };
     use alloy::{
+        consensus::constants::ETH_TO_WEI,
         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,
+        context::transaction::AuthorizationTr, database::InMemoryDB,
+        inspector::inspectors::TracerEip3155, primitives::bytes,
     };
-    use super::*;
 
     #[test]
     fn test_estimate_gas_simple_transfer() {
@@ -2395,7 +2394,7 @@ mod tests {
         let mut trevm =
             TrevmBuilder::new().with_db(db).with_spec_id(SpecId::PRAGUE).build_trevm().unwrap();
         let _ = trevm.test_set_balance(ALICE.address(), U256::from(ETH_TO_WEI));
-        let _ = trevm.set_bytecode_unchecked(log_address, Bytecode::new_raw(LOG_BYTECODE.into()));
+        let _ = trevm.set_bytecode_unchecked(log_address, Bytecode::new_raw(LOG_DEPLOYED_BYTECODE));
 
         // Bob will sign the authorization.
         let authorization = Authorization {
@@ -2417,6 +2416,7 @@ 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());

src/test_utils.rs

@@ -12,14 +12,14 @@ use revm::{
     interpreter::{
         CallInputs, CallOutcome, CreateInputs, CreateOutcome, Interpreter, InterpreterTypes,
     },
-    primitives::{hardfork::SpecId, Log},
+    primitives::{bytes, hardfork::SpecId, Log},
     state::AccountInfo,
     Context, Inspector, MainBuilder,
 };
 
 /// LogContract bytecode
 /// This is the runtime bytecode. This should be set directly with ``set_bytecode_unchecked``
-/// ```no_run
+/// ```ignore
 /// contract LogContract {
 ///     event Hello();
 ///     event World();
@@ -33,7 +33,7 @@ use revm::{
 ///     }
 /// }
 /// ```
-pub const LOG_BYTECODE: &str = "0x6004361015600b575f80fd5b5f3560e01c80637b3ab2d014605f57639ee1a440146027575f80fd5b34605b575f366003190112605b577f2d67bb91f17bca05af6764ab411e86f4ddf757adb89fcec59a7d21c525d417125f80a1005b5f80fd5b34605b575f366003190112605b577fbcdfe0d5b27dd186282e187525415c57ea3077c34efb39148111e4d342e7ab0e5f80a100fea2646970667358221220f6b42b522bc9fb2b4c7d7e611c7c3e995d057ecab7fd7be4179712804c886b4f64736f6c63430008190033";
+pub const LOG_DEPLOYED_BYTECODE: alloy::primitives::Bytes = bytes!("6080604052348015600e575f80fd5b50600436106030575f3560e01c80637b3ab2d01460345780639ee1a44014603c575b5f80fd5b603a6044565b005b60426072565b005b7fbcdfe0d5b27dd186282e187525415c57ea3077c34efb39148111e4d342e7ab0e60405160405180910390a1565b7f2d67bb91f17bca05af6764ab411e86f4ddf757adb89fcec59a7d21c525d4171260405160405180910390a156fea2646970667358221220144b313f421e29c7119666392827595d05f3dc33d0ccb0e75314cc9180e4fb1f64736f6c634300081a0033");
 
 /// Alice testing signer
 pub static ALICE: LazyLock<PrivateKeySigner> =