From b55e59dcd69868e53c4cbc8bd1f024fadbbd400d Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Sat, 21 Sep 2024 21:34:11 +0200 Subject: [PATCH 1/2] rpc: rm useless alloy_rpc_types_debug reexport --- Cargo.lock | 3 ++- crates/rpc/rpc-api/Cargo.toml | 1 + crates/rpc/rpc-api/src/debug.rs | 2 +- crates/rpc/rpc-types/Cargo.toml | 1 - crates/rpc/rpc-types/src/lib.rs | 3 --- crates/rpc/rpc/Cargo.toml | 1 + crates/rpc/rpc/src/debug.rs | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 485e539b8553..686ee470d2a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8379,6 +8379,7 @@ dependencies = [ "alloy-network", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-debug", "alloy-rpc-types-eth", "async-trait", "derive_more", @@ -8436,6 +8437,7 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-primitives", + "alloy-rpc-types-debug", "alloy-rpc-types-eth", "jsonrpsee", "reth-engine-primitives", @@ -8668,7 +8670,6 @@ dependencies = [ "alloy-rpc-types-admin", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", - "alloy-rpc-types-debug", "alloy-rpc-types-engine", "alloy-rpc-types-mev", "alloy-rpc-types-trace", diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index cbe8f44c265e..bc8d6e3dc998 100644 --- a/crates/rpc/rpc-api/Cargo.toml +++ b/crates/rpc/rpc-api/Cargo.toml @@ -24,6 +24,7 @@ alloy-eips.workspace = true alloy-json-rpc.workspace = true alloy-primitives.workspace = true alloy-rpc-types-eth.workspace = true +alloy-rpc-types-debug.workspace = true # misc jsonrpsee = { workspace = true, features = ["server", "macros"] } diff --git a/crates/rpc/rpc-api/src/debug.rs b/crates/rpc/rpc-api/src/debug.rs index d242c0dabbfb..99235f0e9f5c 100644 --- a/crates/rpc/rpc-api/src/debug.rs +++ b/crates/rpc/rpc-api/src/debug.rs @@ -1,9 +1,9 @@ use alloy_primitives::{Address, Bytes, B256}; +use alloy_rpc_types_debug::ExecutionWitness; use alloy_rpc_types_eth::transaction::TransactionRequest; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_types::{ - debug::ExecutionWitness, trace::geth::{ BlockTraceResult, GethDebugTracingCallOptions, GethDebugTracingOptions, GethTrace, TraceResult, diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml index 67c18e841294..050072f77360 100644 --- a/crates/rpc/rpc-types/Cargo.toml +++ b/crates/rpc/rpc-types/Cargo.toml @@ -22,7 +22,6 @@ alloy-rpc-types-beacon = { workspace = true, optional = true } alloy-rpc-types-mev.workspace = true alloy-rpc-types-trace.workspace = true alloy-rpc-types-txpool.workspace = true -alloy-rpc-types-debug.workspace = true alloy-serde.workspace = true alloy-rpc-types-engine = { workspace = true, features = ["std", "serde", "jsonrpsee-types"], optional = true } diff --git a/crates/rpc/rpc-types/src/lib.rs b/crates/rpc/rpc-types/src/lib.rs index cb7237ce293e..171f16f9c056 100644 --- a/crates/rpc/rpc-types/src/lib.rs +++ b/crates/rpc/rpc-types/src/lib.rs @@ -46,9 +46,6 @@ pub use alloy_rpc_types_beacon as beacon; // re-export txpool pub use alloy_rpc_types_txpool as txpool; -// re-export debug -pub use alloy_rpc_types_debug as debug; - // Ethereum specific rpc types related to typed transaction requests and the engine API. #[cfg(feature = "jsonrpsee-types")] pub use eth::error::ToRpcError; diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index d69596a6ac3a..3c17730a8e72 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -43,6 +43,7 @@ alloy-network.workspace = true alloy-primitives.workspace = true alloy-rlp.workspace = true alloy-rpc-types-eth.workspace = true +alloy-rpc-types-debug.workspace = true revm = { workspace = true, features = [ "optional_block_gas_limit", "optional_eip3607", diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index e3f0f47b3a7e..974b36af55ba 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -1,5 +1,6 @@ use alloy_primitives::{Address, Bytes, B256, U256}; use alloy_rlp::{Decodable, Encodable}; +use alloy_rpc_types_debug::ExecutionWitness; use alloy_rpc_types_eth::transaction::TransactionRequest; use async_trait::async_trait; use jsonrpsee::core::RpcResult; @@ -22,7 +23,6 @@ use reth_rpc_eth_api::{ use reth_rpc_eth_types::{EthApiError, StateCacheDb}; use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult}; use reth_rpc_types::{ - debug::ExecutionWitness, state::EvmOverrides, trace::geth::{ BlockTraceResult, FourByteFrame, GethDebugBuiltInTracerType, GethDebugTracerType, From 4d64a679bd56754345d4ef14aac887a9f03450ac Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Sat, 21 Sep 2024 22:40:25 +0200 Subject: [PATCH 2/2] fix clippy --- crates/rpc/rpc-types/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml index 67c18e841294..bed719218a1d 100644 --- a/crates/rpc/rpc-types/Cargo.toml +++ b/crates/rpc/rpc-types/Cargo.toml @@ -21,8 +21,6 @@ alloy-rpc-types-anvil.workspace = true alloy-rpc-types-beacon = { workspace = true, optional = true } alloy-rpc-types-mev.workspace = true alloy-rpc-types-trace.workspace = true -alloy-rpc-types-txpool.workspace = true -alloy-rpc-types-debug.workspace = true alloy-serde.workspace = true alloy-rpc-types-engine = { workspace = true, features = ["std", "serde", "jsonrpsee-types"], optional = true }