chore: clean up some imports (#139)

Author: prestwich

crates/bundle/src/call/ty.rs

@@ -156,7 +156,7 @@ impl SignetCallBundle {
     }
 
     /// Decode and validate the transactions in the bundle.
-    pub fn decode_and_validate_txs<Db: trevm::revm::Database>(
+    pub fn decode_and_validate_txs<Db: Database>(
         &self,
     ) -> Result<Vec<TxEnvelope>, BundleError<Db>> {
         let txs = self

crates/evm/src/driver.rs

@@ -29,7 +29,7 @@ use trevm::{
         database::State,
         Database, DatabaseCommit, Inspector,
     },
-    trevm_try, BlockDriver, BlockOutput, Tx,
+    trevm_try, Block, BlockDriver, BlockOutput, Cfg, Tx,
 };
 
 /// Used internally to signal that the transaction should be discarded.
@@ -562,7 +562,7 @@ impl<'a, 'b, C: Extractable> SignetDriver<'a, 'b, C> {
     }
 }
 
-impl<C: Extractable> trevm::Cfg for SignetDriver<'_, '_, C> {
+impl<C: Extractable> Cfg for SignetDriver<'_, '_, C> {
     fn fill_cfg_env(&self, cfg_env: &mut CfgEnv) {
         cfg_env.chain_id = self.extracts.chain_id;
     }
@@ -630,7 +630,7 @@ where
     }
 }
 
-impl<C: Extractable> trevm::Block for SignetDriver<'_, '_, C> {
+impl<C: Extractable> Block for SignetDriver<'_, '_, C> {
     fn fill_block_env(&self, block_env: &mut BlockEnv) {
         let BlockEnv {
             number,

crates/evm/src/types.rs

@@ -1,12 +1,13 @@
 use super::*;
 #[allow(unused_imports)]
 use trevm::{
+    inspectors::Layered,
     revm::{context::result::EVMError, inspector::NoOpInspector, Database},
     Block, Cfg, Trevm,
 };
 
 /// Layered inspector containing an [`OrderDetector`].
-pub type SignetLayered<I> = trevm::inspectors::Layered<I, OrderDetector>;
+pub type SignetLayered<I> = Layered<I, OrderDetector>;
 
 /// A [`Trevm`] that requires a [`Cfg`].
 ///

crates/journal/src/meta.rs

@@ -1,6 +1,5 @@
-use std::borrow::Cow;
-
 use alloy::{consensus::Header, primitives::B256};
+use std::borrow::Cow;
 use trevm::journal::{JournalDecode, JournalDecodeError, JournalEncode};
 
 /// Metadata for a block journal. This includes the block header, the host

crates/journal/src/versions.rs

@@ -1,7 +1,6 @@
-use alloy::{consensus::Header, primitives::B256};
-use trevm::journal::{JournalDecode, JournalEncode};
-
 use crate::HostJournal;
+use alloy::{consensus::Header, primitives::B256};
+use trevm::journal::{JournalDecode, JournalDecodeError, JournalEncode};
 
 /// Journal versions.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -74,11 +73,11 @@ impl JournalEncode for Journal<'_> {
 }
 
 impl JournalDecode for Journal<'static> {
-    fn decode(buf: &mut &[u8]) -> Result<Self, trevm::journal::JournalDecodeError> {
+    fn decode(buf: &mut &[u8]) -> Result<Self, JournalDecodeError> {
         let version: u8 = JournalDecode::decode(buf)?;
         match version {
             1 => JournalDecode::decode(buf).map(Journal::V1),
-            _ => Err(trevm::journal::JournalDecodeError::InvalidTag {
+            _ => Err(JournalDecodeError::InvalidTag {
                 ty_name: "Journal",
                 tag: version,
                 max_expected: 1,

crates/sim/src/lib.rs

@@ -15,6 +15,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
 mod built;
+
 pub use built::BuiltBlock;
 
 mod cache;
@@ -35,11 +36,18 @@ pub use outcome::SimOutcomeWithCache;
 mod task;
 pub use task::BlockBuild;
 
+use std::sync::Arc;
+use trevm::{
+    db::cow::CacheOnWrite,
+    inspectors::{Layered, TimeLimit},
+    revm::database::CacheDB,
+};
+
 /// A type alias for the database underlying the simulation.
-pub type InnerDb<Db> = std::sync::Arc<trevm::revm::database::CacheDB<Db>>;
+pub type InnerDb<Db> = Arc<CacheDB<Db>>;
 
 /// A type alias for the database used in the simulation.
-pub type SimDb<Db> = trevm::db::cow::CacheOnWrite<InnerDb<Db>>;
+pub type SimDb<Db> = CacheOnWrite<InnerDb<Db>>;
 
 /// A time-limited layered inspector.
-pub type TimeLimited<Insp> = trevm::inspectors::Layered<trevm::inspectors::TimeLimit, Insp>;
+pub type TimeLimited<Insp> = Layered<TimeLimit, Insp>;

crates/test-utils/src/evm.rs

@@ -27,7 +27,7 @@ use trevm::{
         state::{Account, AccountInfo, Bytecode, EvmState, EvmStorageSlot},
         Database, DatabaseCommit, Inspector,
     },
-    NoopBlock,
+    Cfg, NoopBlock,
 };
 
 /// Create a new Signet EVM with an in-memory database for testing.
@@ -70,7 +70,7 @@ where
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct TestCfg;
 
-impl trevm::Cfg for TestCfg {
+impl Cfg for TestCfg {
     fn fill_cfg_env(&self, cfg_env: &mut CfgEnv) {
         let CfgEnv { chain_id, spec, .. } = cfg_env;
 
@@ -83,7 +83,7 @@ impl trevm::Cfg for TestCfg {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct HostTestCfg;
 
-impl trevm::Cfg for HostTestCfg {
+impl Cfg for HostTestCfg {
     fn fill_cfg_env(&self, cfg_env: &mut CfgEnv) {
         let CfgEnv { chain_id, spec, .. } = cfg_env;