chore: improve code style

Author: Evalir

Cargo.toml

@@ -31,7 +31,7 @@ name = "basic_transact"
 
 [[example]]
 name = "fork_ref_transact"
-required-features = ["alloydb"]
+required-features = ["alloy-db"]
 
 [dependencies]
 alloy = { version = "1.0.5", default-features = false, features = [
@@ -76,8 +76,7 @@ default = [
     "revm/secp256k1",
 ]
 
-alloydb = ["dep:tokio"]
-
+alloy-db = ["dep:tokio"]
 
 call = ["optional_eip3607", "optional_no_base_fee"]
 

examples/fork_ref_transact.rs

@@ -9,7 +9,7 @@ use alloy::{
     sol_types::SolCall,
 };
 use revm::{context::TxEnv, database::WrapDatabaseAsync};
-use trevm::{db::alloy::AlloyDB, revm::database::CacheDB, NoopBlock, NoopCfg, TrevmBuilder, Tx};
+use trevm::{db::alloy::AlloyDb, revm::database::CacheDB, NoopBlock, NoopCfg, TrevmBuilder, Tx};
 
 sol! {
     #[allow(missing_docs)]
@@ -52,7 +52,7 @@ async fn main() -> eyre::Result<()> {
     // =========================================================== //
 
     // initialize new AlloyDB
-    let alloydb = WrapDatabaseAsync::new(AlloyDB::new(client, BlockId::default())).unwrap();
+    let alloydb = WrapDatabaseAsync::new(AlloyDb::new(client, BlockId::default())).unwrap();
 
     // initialise empty in-memory-db
     let cache_db = CacheDB::new(alloydb);

src/db/alloy.rs

@@ -1,17 +1,18 @@
-pub use alloy::eips::BlockId;
-use alloy::transports::TransportError;
 use alloy::{
+    eips::BlockId,
     primitives::{StorageValue, U256},
     providers::{
         network::{primitives::HeaderResponse, BlockResponse},
         Network, Provider,
     },
+    transports::TransportError,
 };
 use core::error::Error;
-use revm::database_interface::{async_db::DatabaseAsyncRef, DBErrorMarker};
-use revm::primitives::{Address, B256};
-
-use revm::state::{AccountInfo, Bytecode};
+use revm::{
+    database_interface::{async_db::DatabaseAsyncRef, DBErrorMarker},
+    primitives::{Address, B256},
+    state::{AccountInfo, Bytecode},
+};
 use std::fmt::Display;
 
 /// A type alias for the storage key used in the database.
@@ -43,15 +44,15 @@ impl From<TransportError> for DBTransportError {
 ///
 /// When accessing the database, it'll use the given provider to fetch the corresponding account's data.
 #[derive(Debug)]
-pub struct AlloyDB<N: Network, P: Provider<N>> {
+pub struct AlloyDb<N: Network, P: Provider<N>> {
     /// The provider to fetch the data from.
     provider: P,
     /// The block number on which the queries will be based on.
     block_number: BlockId,
     _marker: core::marker::PhantomData<fn() -> N>,
 }
 
-impl<N: Network, P: Provider<N>> AlloyDB<N, P> {
+impl<N: Network, P: Provider<N>> AlloyDb<N, P> {
     /// Creates a new AlloyDB instance, with a [Provider] and a block.
     pub fn new(provider: P, block_number: BlockId) -> Self {
         Self { provider, block_number, _marker: core::marker::PhantomData }
@@ -63,7 +64,7 @@ impl<N: Network, P: Provider<N>> AlloyDB<N, P> {
     }
 }
 
-impl<N: Network, P: Provider<N>> DatabaseAsyncRef for AlloyDB<N, P> {
+impl<N: Network, P: Provider<N>> DatabaseAsyncRef for AlloyDb<N, P> {
     type Error = DBTransportError;
 
     async fn basic_async_ref(&self, address: Address) -> Result<Option<AccountInfo>, Self::Error> {
@@ -117,7 +118,7 @@ mod tests {
         let client = ProviderBuilder::new().connect_http(
             "https://mainnet.infura.io/v3/c60b0bb42f8a4c6481ecd229eddaca27".parse().unwrap(),
         );
-        let alloydb = AlloyDB::new(client, BlockId::from(16148323));
+        let alloydb = AlloyDb::new(client, BlockId::from(16148323));
         let wrapped_alloydb = WrapDatabaseAsync::new(alloydb).unwrap();
 
         // ETH/USDT pair on Uniswap V2

src/db/mod.rs

@@ -10,6 +10,6 @@ pub use traits::{ArcUpgradeError, CachingDb, StateAcc, TryCachingDb, TryStateAcc
 /// read. Intended to wrap some other caching database.
 pub mod cow;
 
-#[cfg(feature = "alloydb")]
+#[cfg(feature = "alloy-db")]
 /// Alloy-powered revm Database implementation that fetches data over the network.
 pub mod alloy;