chore: replace reth-rpc-types by alloy-rpc-types (#11071)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
greged93
2024-09-21 12:51:31 +02:00
committed by GitHub
parent 542c1487c9
commit b56d638e3f
5 changed files with 7 additions and 7 deletions

2
Cargo.lock generated
View File

@ -7720,6 +7720,7 @@ name = "reth-node-builder"
version = "1.0.7"
dependencies = [
"alloy-primitives",
"alloy-rpc-types",
"aquamarine",
"eyre",
"fdlimit",
@ -7764,7 +7765,6 @@ dependencies = [
"reth-rpc-engine-api",
"reth-rpc-eth-types",
"reth-rpc-layer",
"reth-rpc-types",
"reth-stages",
"reth-static-file",
"reth-tasks",

View File

@ -50,7 +50,6 @@ reth-rpc-builder.workspace = true
reth-rpc-engine-api.workspace = true
reth-rpc-eth-types.workspace = true
reth-rpc-layer.workspace = true
reth-rpc-types.workspace = true
reth-rpc.workspace = true
reth-stages.workspace = true
reth-static-file.workspace = true
@ -61,6 +60,7 @@ reth-transaction-pool.workspace = true
## ethereum
alloy-primitives.workspace = true
alloy-rpc-types = { workspace = true, features = ["engine"] }
## async
futures.workspace = true

View File

@ -925,9 +925,9 @@ where
// Verify that the healthy node is running the same chain as the current node.
let chain_id = futures::executor::block_on(async {
EthApiClient::<
reth_rpc_types::Transaction,
reth_rpc_types::Block,
reth_rpc_types::Receipt,
alloy_rpc_types::Transaction,
alloy_rpc_types::Block,
alloy_rpc_types::Receipt,
>::chain_id(&client)
.await
})?

View File

@ -1,5 +1,6 @@
//! Engine node related functionality.
use alloy_rpc_types::engine::ClientVersionV1;
use futures::{future::Either, stream, stream_select, StreamExt};
use reth_beacon_consensus::{
hooks::{EngineHooks, StaticFileHook},
@ -31,7 +32,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
use reth_payload_primitives::PayloadBuilder;
use reth_provider::providers::BlockchainProvider2;
use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
use reth_rpc_types::engine::ClientVersionV1;
use reth_tasks::TaskExecutor;
use reth_tokio_util::EventSender;
use reth_tracing::tracing::{debug, error, info};

View File

@ -11,6 +11,7 @@ pub use exex::ExExLauncher;
use std::{future::Future, sync::Arc};
use alloy_rpc_types::engine::ClientVersionV1;
use futures::{future::Either, stream, stream_select, StreamExt};
use reth_beacon_consensus::{
hooks::{EngineHooks, PruneHook, StaticFileHook},
@ -35,7 +36,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
use reth_primitives::format_ether;
use reth_provider::providers::BlockchainProvider;
use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
use reth_rpc_types::engine::ClientVersionV1;
use reth_tasks::TaskExecutor;
use reth_tracing::tracing::{debug, info};
use reth_transaction_pool::TransactionPool;