github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-26 23:58:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(tx-validation): remove redundant validate methods (#16929)

Browse Source
This commit is contained in:
Hai | RISE
2025-06-19 15:21:57 +07:00
committed by GitHub
parent 67e3c11135
commit cdb5b69d24
2 changed files with 11 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/optimism/txpool/src/validator.rs
View File

@@ -215,37 +215,6 @@ where
self.apply_op_checks(outcome)
}
/// Validates all given transactions.
///
/// Returns all outcomes for the given transactions in the same order.
///
/// See also [`Self::validate_one`]
pub async fn validate_all(
&self,
transactions: Vec<(TransactionOrigin, Tx)>,
) -> Vec<TransactionValidationOutcome<Tx>> {
futures_util::future::join_all(
transactions.into_iter().map(|(origin, tx)| self.validate_one(origin, tx)),
)
.await
}
/// Validates all given transactions with the specified origin parameter.
///
/// Returns all outcomes for the given transactions in the same order.
///
/// See also [`Self::validate_one`]
pub async fn validate_all_with_origin(
&self,
origin: TransactionOrigin,
transactions: impl IntoIterator<Item = Tx> + Send,
) -> Vec<TransactionValidationOutcome<Tx>> {
futures_util::future::join_all(
transactions.into_iter().map(|tx| self.validate_one(origin, tx)),
)
.await
}
/// Performs the necessary opstack specific checks based on top of the regular eth outcome.
fn apply_op_checks(
&self,
@@ -341,7 +310,10 @@ where
&self,
transactions: Vec<(TransactionOrigin, Self::Transaction)>,
) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
self.validate_all(transactions).await
futures_util::future::join_all(
transactions.into_iter().map(|(origin, tx)| self.validate_one(origin, tx)),
)
.await
}
async fn validate_transactions_with_origin(
@@ -349,7 +321,10 @@ where
origin: TransactionOrigin,
transactions: impl IntoIterator<Item = Self::Transaction> + Send,
) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
self.validate_all_with_origin(origin, transactions).await
futures_util::future::join_all(
transactions.into_iter().map(|tx| self.validate_one(origin, tx)),
)
.await
}
fn on_new_head_block<B>(&self, new_tip_block: &SealedBlock<B>)

41
crates/transaction-pool/src/validate/eth.rs
View File

@@ -76,7 +76,7 @@ where
origin: TransactionOrigin,
transaction: Tx,
) -> TransactionValidationOutcome<Tx> {
self.inner.validate_one(origin, transaction)
self.inner.validate_one_with_provider(origin, transaction, &mut None)
}
/// Validates a single transaction with the provided state provider.
@@ -93,31 +93,6 @@ where
) -> TransactionValidationOutcome<Tx> {
self.inner.validate_one_with_provider(origin, transaction, state)
}
/// Validates all given transactions.
///
/// Returns all outcomes for the given transactions in the same order.
///
/// See also [`Self::validate_one`]
pub fn validate_all(
&self,
transactions: Vec<(TransactionOrigin, Tx)>,
) -> Vec<TransactionValidationOutcome<Tx>> {
self.inner.validate_batch(transactions)
}
/// Validates all given transactions with origin.
///
/// Returns all outcomes for the given transactions in the same order.
///
/// See also [`Self::validate_one`]
pub fn validate_all_with_origin(
&self,
origin: TransactionOrigin,
transactions: impl IntoIterator<Item = Tx> + Send,
) -> Vec<TransactionValidationOutcome<Tx>> {
self.inner.validate_batch_with_origin(origin, transactions)
}
}
impl<Client, Tx> TransactionValidator for EthTransactionValidator<Client, Tx>
@@ -139,7 +114,7 @@ where
&self,
transactions: Vec<(TransactionOrigin, Self::Transaction)>,
) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
self.validate_all(transactions)
self.inner.validate_batch(transactions)
}
async fn validate_transactions_with_origin(
@@ -147,7 +122,7 @@ where
origin: TransactionOrigin,
transactions: impl IntoIterator<Item = Self::Transaction> + Send,
) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
self.validate_all_with_origin(origin, transactions)
self.inner.validate_batch_with_origin(origin, transactions)
}
fn on_new_head_block<B>(&self, new_tip_block: &SealedBlock<B>)
@@ -633,16 +608,6 @@ where
}
}
/// Validates a single transaction.
fn validate_one(
&self,
origin: TransactionOrigin,
transaction: Tx,
) -> TransactionValidationOutcome<Tx> {
let mut provider = None;
self.validate_one_with_provider(origin, transaction, &mut provider)
}
/// Validates all given transactions.
fn validate_batch(
&self,