primitives: rm alloy Header reexport (#12515)

This commit is contained in:
Thomas Coratger
2024-11-13 17:41:25 +01:00
committed by GitHub
parent e6f3191c62
commit 001f3899fd
134 changed files with 493 additions and 439 deletions

View File

@@ -62,6 +62,7 @@ reth-transaction-pool.workspace = true
## ethereum
alloy-primitives.workspace = true
alloy-rpc-types = { workspace = true, features = ["engine"] }
alloy-consensus.workspace = true
## async
futures.workspace = true
@@ -96,20 +97,20 @@ tempfile.workspace = true
[features]
default = []
test-utils = [
"reth-db/test-utils",
"reth-blockchain-tree/test-utils",
"reth-chain-state/test-utils",
"reth-chainspec/test-utils",
"reth-consensus/test-utils",
"reth-engine-tree/test-utils",
"reth-evm/test-utils",
"reth-downloaders/test-utils",
"reth-network/test-utils",
"reth-network-p2p/test-utils",
"reth-payload-builder/test-utils",
"reth-primitives/test-utils",
"reth-stages/test-utils",
"reth-db-api/test-utils",
"reth-provider/test-utils",
"reth-transaction-pool/test-utils"
"reth-db/test-utils",
"reth-blockchain-tree/test-utils",
"reth-chain-state/test-utils",
"reth-chainspec/test-utils",
"reth-consensus/test-utils",
"reth-engine-tree/test-utils",
"reth-evm/test-utils",
"reth-downloaders/test-utils",
"reth-network/test-utils",
"reth-network-p2p/test-utils",
"reth-payload-builder/test-utils",
"reth-primitives/test-utils",
"reth-stages/test-utils",
"reth-db-api/test-utils",
"reth-provider/test-utils",
"reth-transaction-pool/test-utils",
]

View File

@@ -7,11 +7,11 @@ use crate::{
},
BuilderContext, ConfigureEvm, FullNodeTypes,
};
use alloy_consensus::Header;
use reth_consensus::Consensus;
use reth_evm::execute::BlockExecutorProvider;
use reth_node_api::NodeTypesWithEngine;
use reth_payload_builder::PayloadBuilderHandle;
use reth_primitives::Header;
use reth_transaction_pool::TransactionPool;
use std::{future::Future, marker::PhantomData};

View File

@@ -1,8 +1,8 @@
//! EVM component for the node builder.
use crate::{BuilderContext, FullNodeTypes};
use alloy_consensus::Header;
use reth_evm::execute::BlockExecutorProvider;
use reth_node_api::ConfigureEvm;
use reth_primitives::Header;
use std::future::Future;
/// A type that knows how to build the executor types.

View File

@@ -22,13 +22,13 @@ pub use payload::*;
pub use pool::*;
use crate::{ConfigureEvm, FullNodeTypes};
use alloy_consensus::Header;
use reth_consensus::Consensus;
use reth_evm::execute::BlockExecutorProvider;
use reth_network::NetworkHandle;
use reth_network_api::FullNetwork;
use reth_node_api::NodeTypesWithEngine;
use reth_payload_builder::PayloadBuilderHandle;
use reth_primitives::Header;
use reth_transaction_pool::TransactionPool;
/// An abstraction over the components of a node, consisting of:

View File

@@ -760,7 +760,7 @@ where
/// necessary
pub async fn max_block<C>(&self, client: C) -> eyre::Result<Option<BlockNumber>>
where
C: HeadersClient<Header = reth_primitives::Header>,
C: HeadersClient<Header = alloy_consensus::Header>,
{
self.node_config().max_block(client, self.provider_factory().clone()).await
}

View File

@@ -84,7 +84,7 @@ pub fn build_pipeline<N, H, B, Executor>(
) -> eyre::Result<Pipeline<N>>
where
N: ProviderNodeTypes,
H: HeaderDownloader<Header = reth_primitives::Header> + 'static,
H: HeaderDownloader<Header = alloy_consensus::Header> + 'static,
B: BodyDownloader<Body = reth_primitives::BlockBody> + 'static,
Executor: BlockExecutorProvider,
{