rpc: rm useless alloy_rpc_types_txpool reexport (#11092)

This commit is contained in:
Thomas Coratger
2024-09-21 22:19:00 +02:00
committed by GitHub
parent b9712c5ec5
commit 4c92075de2
7 changed files with 8 additions and 9 deletions

3
Cargo.lock generated
View File

@@ -8380,6 +8380,7 @@ dependencies = [
"alloy-primitives",
"alloy-rlp",
"alloy-rpc-types-eth",
"alloy-rpc-types-txpool",
"async-trait",
"derive_more",
"futures",
@@ -8437,6 +8438,7 @@ dependencies = [
"alloy-json-rpc",
"alloy-primitives",
"alloy-rpc-types-eth",
"alloy-rpc-types-txpool",
"jsonrpsee",
"reth-engine-primitives",
"reth-network-peers",
@@ -8672,7 +8674,6 @@ dependencies = [
"alloy-rpc-types-engine",
"alloy-rpc-types-mev",
"alloy-rpc-types-trace",
"alloy-rpc-types-txpool",
"alloy-serde",
"arbitrary",
"jsonrpsee-types",

View File

@@ -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-txpool.workspace = true
# misc
jsonrpsee = { workspace = true, features = ["server", "macros"] }

View File

@@ -1,7 +1,7 @@
use alloy_json_rpc::RpcObject;
use alloy_primitives::Address;
use alloy_rpc_types_txpool::{TxpoolContent, TxpoolContentFrom, TxpoolInspect, TxpoolStatus};
use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use reth_rpc_types::txpool::{TxpoolContent, TxpoolContentFrom, TxpoolInspect, TxpoolStatus};
/// Txpool rpc interface.
#[cfg_attr(not(feature = "client"), rpc(server, namespace = "txpool"))]

View File

@@ -21,7 +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 }

View File

@@ -43,9 +43,6 @@ pub use alloy_rpc_types_mev as mev;
#[cfg(feature = "jsonrpsee-types")]
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;

View File

@@ -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-txpool.workspace = true
revm = { workspace = true, features = [
"optional_block_gas_limit",
"optional_eip3607",

View File

@@ -1,14 +1,14 @@
use std::{collections::BTreeMap, marker::PhantomData};
use alloy_primitives::Address;
use alloy_rpc_types_txpool::{
TxpoolContent, TxpoolContentFrom, TxpoolInspect, TxpoolInspectSummary, TxpoolStatus,
};
use async_trait::async_trait;
use jsonrpsee::core::RpcResult as Result;
use reth_primitives::TransactionSignedEcRecovered;
use reth_rpc_api::TxPoolApiServer;
use reth_rpc_eth_api::{FullEthApiTypes, RpcTransaction};
use reth_rpc_types::txpool::{
TxpoolContent, TxpoolContentFrom, TxpoolInspect, TxpoolInspectSummary, TxpoolStatus,
};
use reth_rpc_types_compat::{transaction::from_recovered, TransactionCompat};
use reth_transaction_pool::{AllPoolTransactions, PoolTransaction, TransactionPool};
use tracing::trace;