chore: moved OkValidator into txpool behind test-utils feature gate (paradigmxyz#16144)

Author: Rimeeeeee

Cargo.lock

@@ -1,5 +1,5 @@
 use crate::utils::eth_payload_attributes;
-use alloy_consensus::{EthereumTxEnvelope, Transaction, TxEip4844};
+use alloy_consensus::{EthereumTxEnvelope, TxEip4844};
 use alloy_eips::{eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M, Encodable2718};
 use alloy_genesis::Genesis;
 use alloy_primitives::B256;
@@ -14,47 +14,11 @@ use reth_primitives_traits::Recovered;
 use reth_provider::CanonStateSubscriptions;
 use reth_tasks::TaskManager;
 use reth_transaction_pool::{
-    blobstore::InMemoryBlobStore, validate::ValidTransaction, BlockInfo, CoinbaseTipOrdering,
-    EthPooledTransaction, Pool, PoolTransaction, TransactionOrigin, TransactionPool,
-    TransactionPoolExt, TransactionValidationOutcome, TransactionValidator,
+    blobstore::InMemoryBlobStore, test_utils::OkValidator, BlockInfo, CoinbaseTipOrdering,
+    EthPooledTransaction, Pool, TransactionOrigin, TransactionPool, TransactionPoolExt,
 };
 use std::sync::Arc;
 
-/// A transaction validator that determines all transactions to be valid.
-///
-/// An actual validator impl like
-/// [`TransactionValidationTaskExecutor`](reth_transaction_pool::pool::TransactionValidationTaskExecutor)
-/// would require up to date db access.
-///
-/// CAUTION: This validator is not safe to use since it doesn't actually validate the transaction's
-/// properties such as chain id, balance, nonce, etc.
-#[derive(Debug, Default)]
-#[non_exhaustive]
-struct OkValidator;
-
-impl TransactionValidator for OkValidator {
-    type Transaction = EthPooledTransaction;
-
-    async fn validate_transaction(
-        &self,
-        _origin: TransactionOrigin,
-        transaction: Self::Transaction,
-    ) -> TransactionValidationOutcome<Self::Transaction> {
-        // Always return valid
-        let authorities = transaction.authorization_list().map(|auths| {
-            auths.iter().flat_map(|auth| auth.recover_authority()).collect::<Vec<_>>()
-        });
-        TransactionValidationOutcome::Valid {
-            balance: *transaction.cost(),
-            state_nonce: transaction.nonce(),
-            bytecode_hash: None,
-            transaction: ValidTransaction::Valid(transaction),
-            propagate: false,
-            authorities,
-        }
-    }
-}
-
 // Test that the pool's maintenance task can correctly handle `CanonStateNotification::Commit`
 // events
 #[tokio::test]

crates/ethereum/node/tests/e2e/pool.rs

@@ -11,6 +11,9 @@ pub use mock::*;
 
 mod pool;
 
+mod okvalidator;
+pub use okvalidator::*;
+
 /// A [Pool] used for testing
 pub type TestPool =
     Pool<MockTransactionValidator<MockTransaction>, MockOrdering, InMemoryBlobStore>;

crates/transaction-pool/src/test_utils/mod.rs

@@ -0,0 +1,45 @@
+use std::marker::PhantomData;
+
+use crate::{
+    validate::ValidTransaction, EthPooledTransaction, PoolTransaction, TransactionOrigin,
+    TransactionValidationOutcome, TransactionValidator,
+};
+
+/// A transaction validator that determines all transactions to be valid.
+#[derive(Debug)]
+#[non_exhaustive]
+pub struct OkValidator<T = EthPooledTransaction> {
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Default for OkValidator<T> {
+    fn default() -> Self {
+        Self { _phantom: Default::default() }
+    }
+}
+
+impl<T> TransactionValidator for OkValidator<T>
+where
+    T: PoolTransaction,
+{
+    type Transaction = T;
+
+    async fn validate_transaction(
+        &self,
+        _origin: TransactionOrigin,
+        transaction: Self::Transaction,
+    ) -> TransactionValidationOutcome<Self::Transaction> {
+        // Always return valid
+        let authorities = transaction.authorization_list().map(|auths| {
+            auths.iter().flat_map(|auth| auth.recover_authority()).collect::<Vec<_>>()
+        });
+        TransactionValidationOutcome::Valid {
+            balance: *transaction.cost(),
+            state_nonce: transaction.nonce(),
+            bytecode_hash: None,
+            transaction: ValidTransaction::Valid(transaction),
+            propagate: false,
+            authorities,
+        }
+    }
+}

crates/transaction-pool/src/test_utils/okvalidator.rs

@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-alloy-consensus.workspace = true
 reth-ethereum = { workspace = true, features = ["test-utils", "network", "pool", "provider"] }
 eyre.workspace = true
 tokio.workspace = true

examples/network-txpool/Cargo.toml

@@ -9,13 +9,11 @@
 
 #![warn(unused_crate_dependencies)]
 
-use alloy_consensus::Transaction;
 use reth_ethereum::{
     network::{config::rng_secret_key, EthNetworkPrimitives, NetworkConfig, NetworkManager},
     pool::{
-        blobstore::InMemoryBlobStore, validate::ValidTransaction, CoinbaseTipOrdering,
-        EthPooledTransaction, PoolTransaction, TransactionListenerKind, TransactionOrigin,
-        TransactionPool, TransactionValidationOutcome, TransactionValidator,
+        blobstore::InMemoryBlobStore, test_utils::OkValidator, CoinbaseTipOrdering,
+        EthPooledTransaction, Pool, TransactionListenerKind, TransactionPool,
     },
     provider::test_utils::NoopProvider,
 };
@@ -28,7 +26,11 @@ async fn main() -> eyre::Result<()> {
     // remote or able to validate transaction against the latest state.
     let client = NoopProvider::default();
 
-    let pool = reth_ethereum::pool::Pool::new(
+    let pool: Pool<
+        OkValidator<EthPooledTransaction>,
+        CoinbaseTipOrdering<EthPooledTransaction>,
+        InMemoryBlobStore,
+    > = reth_ethereum::pool::Pool::new(
         OkValidator::default(),
         CoinbaseTipOrdering::default(),
         InMemoryBlobStore::default(),
@@ -66,38 +68,3 @@ async fn main() -> eyre::Result<()> {
 
     Ok(())
 }
-
-/// A transaction validator that determines all transactions to be valid.
-///
-/// An actual validator impl like
-/// [TransactionValidationTaskExecutor](reth_ethereum::pool::TransactionValidationTaskExecutor)
-/// would require up to date db access.
-///
-/// CAUTION: This validator is not safe to use since it doesn't actually validate the transaction's
-/// properties such as chain id, balance, nonce, etc.
-#[derive(Debug, Default)]
-#[non_exhaustive]
-struct OkValidator;
-
-impl TransactionValidator for OkValidator {
-    type Transaction = EthPooledTransaction;
-
-    async fn validate_transaction(
-        &self,
-        _origin: TransactionOrigin,
-        transaction: Self::Transaction,
-    ) -> TransactionValidationOutcome<Self::Transaction> {
-        // Always return valid
-        let authorities = transaction.authorization_list().map(|auths| {
-            auths.iter().flat_map(|auth| auth.recover_authority()).collect::<Vec<_>>()
-        });
-        TransactionValidationOutcome::Valid {
-            balance: *transaction.cost(),
-            state_nonce: transaction.nonce(),
-            bytecode_hash: None,
-            transaction: ValidTransaction::Valid(transaction),
-            propagate: false,
-            authorities,
-        }
-    }
-}