chore(deps): txpool deps cleanup

paradigmxyz · May 28, 2024 · 36a6437 · 36a6437
1 parent 3e7f137
commit 36a6437
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/transaction-pool/Cargo.toml b/crates/transaction-pool/Cargo.toml
@@ -13,15 +13,14 @@ workspace = true
 
 [dependencies]
 # reth
-reth-eth-wire.workspace = true
+reth-eth-wire-types.workspace = true
 reth-primitives.workspace = true
 reth-fs-util.workspace = true
 reth-provider.workspace = true
 reth-tasks.workspace = true
-revm.workspace = true
+
+# ethereum
 alloy-rlp.workspace = true
-reth-revm = { workspace = true, optional = true }
-reth-network-types.workspace = true
 
 # async/futures
 futures-util.workspace = true

diff --git a/crates/transaction-pool/src/lib.rs b/crates/transaction-pool/src/lib.rs
@@ -147,11 +147,12 @@
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![warn(clippy::missing_const_for_fn)]
 
 use crate::{identifier::TransactionId, pool::PoolInner};
 use aquamarine as _;
-use reth_eth_wire::HandleMempoolData;
+use reth_eth_wire_types::HandleMempoolData;
 use reth_primitives::{Address, BlobTransactionSidecar, PooledTransactionsElement, TxHash, U256};
 use reth_provider::StateProviderFactory;
 use std::{collections::HashSet, sync::Arc};

diff --git a/crates/transaction-pool/src/noop.rs b/crates/transaction-pool/src/noop.rs
@@ -16,7 +16,7 @@ use crate::{
     PooledTransactionsElement, PropagatedTransactions, TransactionEvents, TransactionOrigin,
     TransactionPool, TransactionValidationOutcome, TransactionValidator, ValidPoolTransaction,
 };
-use reth_eth_wire::HandleMempoolData;
+use reth_eth_wire_types::HandleMempoolData;
 use reth_primitives::{Address, BlobTransactionSidecar, TxHash, U256};
 use std::{collections::HashSet, marker::PhantomData, sync::Arc};
 use tokio::sync::{mpsc, mpsc::Receiver};

diff --git a/crates/transaction-pool/src/pool/mod.rs b/crates/transaction-pool/src/pool/mod.rs
@@ -82,7 +82,7 @@ use crate::{
 };
 use best::BestTransactions;
 use parking_lot::{Mutex, RwLock, RwLockReadGuard};
-use reth_eth_wire::HandleMempoolData;
+use reth_eth_wire_types::HandleMempoolData;
 use reth_primitives::{
     Address, BlobTransaction, BlobTransactionSidecar, IntoRecoveredTransaction,
     PooledTransactionsElement, TransactionSigned, TxHash, B256,

diff --git a/crates/transaction-pool/src/test_utils/mock.rs b/crates/transaction-pool/src/test_utils/mock.rs
@@ -760,7 +760,7 @@ impl EthPoolTransaction for MockTransaction {
     fn validate_blob(
         &self,
         _blob: &BlobTransactionSidecar,
-        _settings: &revm::primitives::KzgSettings,
+        _settings: &reth_primitives::kzg::KzgSettings,
     ) -> Result<(), reth_primitives::BlobTransactionValidationError> {
         match &self {
             Self::Eip4844 { .. } => Ok(()),

diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs
@@ -8,8 +8,7 @@ use crate::{
     AllTransactionsEvents,
 };
 use futures_util::{ready, Stream};
-use reth_eth_wire::HandleMempoolData;
-use reth_network_types::PeerId;
+use reth_eth_wire_types::HandleMempoolData;
 use reth_primitives::{
     kzg::KzgSettings, transaction::TryFromRecoveredTransactionError, AccessList, Address,
     BlobTransactionSidecar, BlobTransactionValidationError, FromRecoveredPooledTransaction,
@@ -29,6 +28,9 @@ use std::{
 };
 use tokio::sync::mpsc::Receiver;
 
+/// The PeerId type.
+pub type PeerId = reth_primitives::B512;
+
 /// General purpose abstraction of a transaction-pool.
 ///
 /// This is intended to be used by API-consumers such as RPC that need inject new incoming,