fix conflicts

paradigmxyz · Sep 26, 2024 · 0e91a76 · 0e91a76
1 parent 41729a6
commit 0e91a76
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/crates/evm/execution-types/src/chain.rs b/crates/evm/execution-types/src/chain.rs
@@ -7,8 +7,8 @@ use alloy_primitives::{Address, BlockHash, BlockNumber, TxHash};
 use core::{fmt, ops::RangeInclusive};
 use reth_execution_errors::{BlockExecutionError, InternalBlockExecutionError};
 use reth_primitives::{
-    BlockNumHash, ForkBlock, Receipt, SealedBlock, SealedBlockWithSenders, SealedHeader,
-    TransactionSigned, TransactionSignedEcRecovered, TxHash,
+    Receipt, SealedBlock, SealedBlockWithSenders, SealedHeader, TransactionSigned,
+    TransactionSignedEcRecovered,
 };
 use reth_trie::updates::TrieUpdates;
 use revm::db::BundleState;

diff --git a/crates/evm/execution-types/src/execution_outcome.rs b/crates/evm/execution-types/src/execution_outcome.rs
@@ -1,8 +1,6 @@
 use crate::BlockExecutionOutput;
 use alloy_primitives::{Address, BlockNumber, Bloom, Log, B256, U256};
-use reth_primitives::{
-    logs_bloom, Account, Bytecode, Log, Receipt, Receipts, Requests, StorageEntry, B256, U256,
-};
+use reth_primitives::{logs_bloom, Account, Bytecode, Receipt, Receipts, Requests, StorageEntry};
 use reth_trie::HashedPostState;
 use revm::{
     db::{states::BundleState, BundleAccount},

diff --git a/crates/evm/src/lib.rs b/crates/evm/src/lib.rs
@@ -15,7 +15,7 @@ use core::ops::Deref;
 
 use crate::builder::RethEvmBuilder;
 use alloy_primitives::{Address, Bytes, B256, U256};
-use reth_primitives::{TransactionSigned, TransactionSignedEcRecovered, B256, U256};
+use reth_primitives::{TransactionSigned, TransactionSignedEcRecovered};
 use reth_primitives_traits::BlockHeader;
 use revm::{Database, Evm, GetInspector};
 use revm_primitives::{BlockEnv, CfgEnvWithHandlerCfg, Env, EnvWithHandlerCfg, SpecId, TxEnv};