Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(exex-eips): replace reth-primitives with alloy-eips #11275

Merged
merged 3 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/exex/exex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ reth-tracing.workspace = true

# alloy
alloy-primitives.workspace = true
alloy-eips.workspace = true

## async
futures.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion crates/exex/exex/src/notifications.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion crates/exex/exex/src/wal/cache.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use std::collections::{BTreeMap, VecDeque};

use alloy_eips::BlockNumHash;
use alloy_primitives::B256;
use dashmap::DashMap;
use reth_exex_types::ExExNotification;
use reth_primitives::{BlockNumHash, B256};

/// The block cache of the WAL.
///
Expand Down
2 changes: 1 addition & 1 deletion crates/exex/exex/src/wal/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading