From f5c44805f1657ed5066caf7b0399baf085ec9a9f Mon Sep 17 00:00:00 2001 From: Abhishekkochar Date: Fri, 27 Sep 2024 16:49:57 +0800 Subject: [PATCH 1/2] chore(exex-eips): replace reth-primitives with alloy-eips Signed-off-by: Abhishekkochar --- Cargo.lock | 1 + crates/exex/exex/Cargo.toml | 1 + crates/exex/exex/src/notifications.rs | 3 ++- crates/exex/exex/src/wal/cache.rs | 2 +- crates/exex/exex/src/wal/mod.rs | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 103da9225540..2402161de1cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7394,6 +7394,7 @@ name = "reth-exex" version = "1.0.7" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-genesis", "alloy-primitives", "eyre", diff --git a/crates/exex/exex/Cargo.toml b/crates/exex/exex/Cargo.toml index cbb2214192b4..665853bc4c66 100644 --- a/crates/exex/exex/Cargo.toml +++ b/crates/exex/exex/Cargo.toml @@ -34,6 +34,7 @@ reth-tracing.workspace = true # alloy alloy-primitives.workspace = true +alloy-eips.workspace = true ## async futures.workspace = true diff --git a/crates/exex/exex/src/notifications.rs b/crates/exex/exex/src/notifications.rs index 54d7959dc5e8..b3972931796d 100644 --- a/crates/exex/exex/src/notifications.rs +++ b/crates/exex/exex/src/notifications.rs @@ -346,11 +346,12 @@ mod tests { use super::*; use alloy_consensus::Header; + use alloy_eips::BlockNumHash; use eyre::OptionExt; use futures::StreamExt; use reth_db_common::init::init_genesis; use reth_evm_ethereum::execute::EthExecutorProvider; - use reth_primitives::{Block, BlockNumHash}; + use reth_primitives::Block; use reth_provider::{ providers::BlockchainProvider2, test_utils::create_test_provider_factory, BlockWriter, Chain, diff --git a/crates/exex/exex/src/wal/cache.rs b/crates/exex/exex/src/wal/cache.rs index 25719d11bf93..33be3bd3221d 100644 --- a/crates/exex/exex/src/wal/cache.rs +++ b/crates/exex/exex/src/wal/cache.rs @@ -1,7 +1,7 @@ use std::collections::{BTreeMap, VecDeque}; +use alloy_eips::BlockNumHash; use reth_exex_types::ExExNotification; -use reth_primitives::BlockNumHash; /// The block cache of the WAL. Acts as a mapping of `File ID -> List of Blocks`. /// diff --git a/crates/exex/exex/src/wal/mod.rs b/crates/exex/exex/src/wal/mod.rs index 163d21d1bde7..673f1f495a03 100644 --- a/crates/exex/exex/src/wal/mod.rs +++ b/crates/exex/exex/src/wal/mod.rs @@ -7,8 +7,8 @@ pub use storage::Storage; use std::path::Path; +use alloy_eips::BlockNumHash; use reth_exex_types::ExExNotification; -use reth_primitives::BlockNumHash; use reth_tracing::tracing::{debug, instrument}; /// WAL is a write-ahead log (WAL) that stores the notifications sent to ExExes. From f5c69858baee307fd2a8042248ac48f14811d313 Mon Sep 17 00:00:00 2001 From: Abhishekkochar Date: Fri, 27 Sep 2024 17:07:46 +0800 Subject: [PATCH 2/2] lint - Cargo fmt Signed-off-by: Abhishekkochar --- crates/exex/exex/src/wal/cache.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crates/exex/exex/src/wal/cache.rs b/crates/exex/exex/src/wal/cache.rs index dacf3cedd2d4..c70ccc5c26c7 100644 --- a/crates/exex/exex/src/wal/cache.rs +++ b/crates/exex/exex/src/wal/cache.rs @@ -1,11 +1,9 @@ use std::collections::{BTreeMap, VecDeque}; - use alloy_eips::BlockNumHash; use alloy_primitives::B256; -use reth_exex_types::ExExNotification; use dashmap::DashMap; - +use reth_exex_types::ExExNotification; /// The block cache of the WAL. ///