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.

Sign up for GitHub

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

Jump to bottom

rpc: rm useless alloy_rpc_types_debug reexport #11095

Merged
merged 7 commits into from
Sep 22, 2024
+8 −10
Merged

rpc: rm useless alloy_rpc_types_debug reexport #11095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b55e59d
rpc: rm useless alloy_rpc_types_debug reexport
tcoratger Sep 21, 2024
81a143b
Merge branch 'main' into alloy_rpc_types_debug
tcoratger Sep 21, 2024
4d64a67
fix clippy
tcoratger Sep 21, 2024
540b0c2
Merge branch 'main' into alloy_rpc_types_debug
emhane Sep 22, 2024
a9d2f5e
Merge branch 'main' into alloy_rpc_types_debug
emhane Sep 22, 2024
436f021
Merge branch 'main' into alloy-rpc-types-debug
emhane Sep 22, 2024
d6c8c14
Merge branch 'alloy_rpc_types_debug' of github.com:tcoratger/reth int…
emhane Sep 22, 2024
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
3 changes: 2 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions crates/rpc/rpc-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
alloy-rpc-types-trace.workspace = true
alloy-rpc-types-anvil.workspace = true
alloy-rpc-types-mev.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion crates/rpc/rpc-api/src/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use alloy_primitives::{Address, Bytes, B256};
use alloy_rpc_types_debug::ExecutionWitness;
use alloy_rpc_types_eth::transaction::TransactionRequest;
use alloy_rpc_types_trace::geth::{
BlockTraceResult, GethDebugTracingCallOptions, GethDebugTracingOptions, GethTrace, TraceResult,
};
use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use reth_primitives::{BlockId, BlockNumberOrTag};
use reth_rpc_types::{debug::ExecutionWitness, Block, Bundle, StateContext};
use reth_rpc_types::{Block, Bundle, StateContext};

/// Debug rpc interface.
#[cfg_attr(not(feature = "client"), rpc(server, namespace = "debug"))]
Expand Down
1 change: 0 additions & 1 deletion crates/rpc/rpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] }
alloy-rpc-types.workspace = true
alloy-rpc-types-admin.workspace = true
alloy-rpc-types-beacon = { workspace = true, optional = true }
alloy-rpc-types-debug.workspace = true
alloy-serde.workspace = true
alloy-rpc-types-engine = { workspace = true, features = ["std", "serde", "jsonrpsee-types"], optional = true }

Expand Down
3 changes: 0 additions & 3 deletions crates/rpc/rpc-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ pub use alloy_rpc_types_admin as admin;
#[cfg(feature = "jsonrpsee-types")]
pub use alloy_rpc_types_beacon as beacon;

// 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;
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
alloy-rpc-types-trace.workspace = true
alloy-rpc-types-mev.workspace = true
alloy-rpc-types-txpool.workspace = true
Expand Down
6 changes: 2 additions & 4 deletions crates/rpc/rpc/src/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 alloy_rpc_types_trace::geth::{
BlockTraceResult, FourByteFrame, GethDebugBuiltInTracerType, GethDebugTracerType,
Expand All @@ -25,10 +26,7 @@ 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, Block as RpcBlock, BlockError, Bundle,
StateContext,
};
use reth_rpc_types::{state::EvmOverrides, Block as RpcBlock, BlockError, Bundle, StateContext};
use reth_tasks::pool::BlockingTaskGuard;
use reth_trie::{HashedPostState, HashedStorage};
use revm::{
Expand Down
Loading