chore(deps): txpool deps cleanup (#8443)

This commit is contained in:
Matthias Seitz
2024-05-28 19:54:54 +02:00
committed by GitHub
parent 5dd1d88a47
commit 9f38a67fa3
7 changed files with 13 additions and 14 deletions

5
Cargo.lock generated
View File

@ -8138,16 +8138,13 @@ dependencies = [
"pprof", "pprof",
"proptest", "proptest",
"rand 0.8.5", "rand 0.8.5",
"reth-eth-wire", "reth-eth-wire-types",
"reth-fs-util", "reth-fs-util",
"reth-metrics", "reth-metrics",
"reth-network-types",
"reth-primitives", "reth-primitives",
"reth-provider", "reth-provider",
"reth-revm",
"reth-tasks", "reth-tasks",
"reth-tracing", "reth-tracing",
"revm",
"rustc-hash", "rustc-hash",
"schnellru", "schnellru",
"serde", "serde",

View File

@ -13,15 +13,14 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-eth-wire.workspace = true reth-eth-wire-types.workspace = true
reth-primitives.workspace = true reth-primitives.workspace = true
reth-fs-util.workspace = true reth-fs-util.workspace = true
reth-provider.workspace = true reth-provider.workspace = true
reth-tasks.workspace = true reth-tasks.workspace = true
revm.workspace = true
# ethereum
alloy-rlp.workspace = true alloy-rlp.workspace = true
reth-revm = { workspace = true, optional = true }
reth-network-types.workspace = true
# async/futures # async/futures
futures-util.workspace = true futures-util.workspace = true

View File

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

View File

@ -16,7 +16,7 @@ use crate::{
PooledTransactionsElement, PropagatedTransactions, TransactionEvents, TransactionOrigin, PooledTransactionsElement, PropagatedTransactions, TransactionEvents, TransactionOrigin,
TransactionPool, TransactionValidationOutcome, TransactionValidator, ValidPoolTransaction, TransactionPool, TransactionValidationOutcome, TransactionValidator, ValidPoolTransaction,
}; };
use reth_eth_wire::HandleMempoolData; use reth_eth_wire_types::HandleMempoolData;
use reth_primitives::{Address, BlobTransactionSidecar, TxHash, U256}; use reth_primitives::{Address, BlobTransactionSidecar, TxHash, U256};
use std::{collections::HashSet, marker::PhantomData, sync::Arc}; use std::{collections::HashSet, marker::PhantomData, sync::Arc};
use tokio::sync::{mpsc, mpsc::Receiver}; use tokio::sync::{mpsc, mpsc::Receiver};

View File

@ -82,7 +82,7 @@ use crate::{
}; };
use best::BestTransactions; use best::BestTransactions;
use parking_lot::{Mutex, RwLock, RwLockReadGuard}; use parking_lot::{Mutex, RwLock, RwLockReadGuard};
use reth_eth_wire::HandleMempoolData; use reth_eth_wire_types::HandleMempoolData;
use reth_primitives::{ use reth_primitives::{
Address, BlobTransaction, BlobTransactionSidecar, IntoRecoveredTransaction, Address, BlobTransaction, BlobTransactionSidecar, IntoRecoveredTransaction,
PooledTransactionsElement, TransactionSigned, TxHash, B256, PooledTransactionsElement, TransactionSigned, TxHash, B256,

View File

@ -760,7 +760,7 @@ impl EthPoolTransaction for MockTransaction {
fn validate_blob( fn validate_blob(
&self, &self,
_blob: &BlobTransactionSidecar, _blob: &BlobTransactionSidecar,
_settings: &revm::primitives::KzgSettings, _settings: &reth_primitives::kzg::KzgSettings,
) -> Result<(), reth_primitives::BlobTransactionValidationError> { ) -> Result<(), reth_primitives::BlobTransactionValidationError> {
match &self { match &self {
Self::Eip4844 { .. } => Ok(()), Self::Eip4844 { .. } => Ok(()),

View File

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