chore: use alloy imports

Author: Evalir

crates/evm/src/debug.rs

@@ -1,8 +1,6 @@
 use crate::{abi::HEVM_ABI, CallKind};
-use revm::{
-    interpreter::{Memory, OpCode},
-    primitives::{Address, U256},
-};
+use alloy_primitives::{Address, U256};
+use revm::interpreter::{Memory, OpCode};
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 

crates/evm/src/executor/backend/fuzz.rs

@@ -7,9 +7,10 @@ use crate::executor::{
     fork::{CreateFork, ForkId},
     inspector::cheatcodes::Cheatcodes,
 };
+use alloy_primitives::{Address, B256, U256};
 use revm::{
     db::DatabaseRef,
-    primitives::{AccountInfo, Address, Bytecode, Env, ResultAndState, B256, U256},
+    primitives::{AccountInfo, Bytecode, Env, ResultAndState},
     Database, Inspector, JournaledState,
 };
 use std::borrow::Cow;

crates/evm/src/executor/backend/in_memory_db.rs

@@ -1,8 +1,9 @@
 //! The in memory DB
 use crate::executor::backend::error::DatabaseError;
+use alloy_primitives::{Address, B256, U256};
 use revm::{
     db::{CacheDB, DatabaseRef, EmptyDB},
-    primitives::{Account, AccountInfo, Address, Bytecode, HashMap as Map, B256, U256},
+    primitives::{Account, AccountInfo, Bytecode, HashMap as Map},
     Database, DatabaseCommit,
 };
 

crates/evm/src/executor/backend/mod.rs

@@ -11,7 +11,7 @@ use crate::{
     utils::{b256_to_h256, h160_to_b160, h256_to_b256, ru256_to_u256, u256_to_ru256, u64_to_ru64},
     CALLER, TEST_CONTRACT_ADDRESS,
 };
-use alloy_primitives::{b256, U256, U64};
+use alloy_primitives::{b256, Address, B256, U256, U64};
 use ethers::{
     prelude::Block,
     types::{BlockNumber, Transaction},
@@ -22,8 +22,8 @@ use revm::{
     db::{CacheDB, DatabaseRef},
     precompile::{Precompiles, SpecId},
     primitives::{
-        Account, AccountInfo, Address, Bytecode, CreateScheme, Env, HashMap as Map, Log,
-        ResultAndState, TransactTo, B256, KECCAK_EMPTY,
+        Account, AccountInfo, Bytecode, CreateScheme, Env, HashMap as Map, Log, ResultAndState,
+        TransactTo, KECCAK_EMPTY,
     },
     Database, DatabaseCommit, Inspector, JournaledState, EVM,
 };

crates/evm/src/executor/backend/snapshot.rs

@@ -1,5 +1,6 @@
+use alloy_primitives::{Address, B256, U256};
 use revm::{
-    primitives::{AccountInfo, Address, Env, HashMap as Map, B256, U256},
+    primitives::{AccountInfo, Env, HashMap as Map},
     JournaledState,
 };
 use serde::{Deserialize, Serialize};

crates/evm/src/executor/builder.rs

@@ -1,6 +1,7 @@
 use super::{inspector::InspectorStackBuilder, Executor};
 use crate::executor::backend::Backend;
-use revm::primitives::{Env, SpecId, U256};
+use alloy_primitives::U256;
+use revm::primitives::{Env, SpecId};
 
 /// The builder that allows to configure an evm [`Executor`] which a stack of optional
 /// [`revm::Inspector`]s, such as [`Cheatcodes`].

crates/evm/src/executor/fork/backend.rs

@@ -6,6 +6,7 @@ use crate::{
     },
     utils::{b160_to_h160, b256_to_h256, h256_to_b256, u256_to_ru256},
 };
+use alloy_primitives::{Address, Bytes, B256, U256};
 use ethers::{
     core::abi::ethereum_types::BigEndianHash,
     providers::Middleware,
@@ -21,7 +22,7 @@ use futures::{
 };
 use revm::{
     db::DatabaseRef,
-    primitives::{AccountInfo, Address, Bytecode, Bytes, B256, KECCAK_EMPTY, U256},
+    primitives::{AccountInfo, Bytecode, KECCAK_EMPTY},
 };
 use std::{
     collections::{hash_map::Entry, HashMap, VecDeque},

crates/evm/src/executor/fork/cache.rs

@@ -1,10 +1,9 @@
 //! Cache related abstraction
 use crate::executor::backend::snapshot::StateSnapshot;
+use alloy_primitives::{Address, B256, U256};
 use parking_lot::RwLock;
 use revm::{
-    primitives::{
-        Account, AccountInfo, AccountStatus, Address, HashMap as Map, B256, KECCAK_EMPTY, U256,
-    },
+    primitives::{Account, AccountInfo, AccountStatus, HashMap as Map, KECCAK_EMPTY},
     DatabaseCommit,
 };
 use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize, Serializer};

crates/evm/src/executor/fork/database.rs

@@ -8,11 +8,12 @@ use crate::{
     },
     revm::db::CacheDB,
 };
+use alloy_primitives::{Address, B256, U256};
 use ethers::types::BlockId;
 use parking_lot::Mutex;
 use revm::{
     db::DatabaseRef,
-    primitives::{Account, AccountInfo, Address, Bytecode, HashMap as Map, B256, U256},
+    primitives::{Account, AccountInfo, Bytecode, HashMap as Map},
     Database, DatabaseCommit,
 };
 use std::sync::Arc;

crates/evm/src/executor/inspector/access_list.rs

@@ -1,8 +1,8 @@
+use alloy_primitives::{Address, B256};
 use ethers::types::transaction::eip2930::{AccessList, AccessListItem};
 use hashbrown::{HashMap, HashSet};
 use revm::{
     interpreter::{opcode, InstructionResult, Interpreter},
-    primitives::{Address, B256},
     Database, EVMData, Inspector,
 };