diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs index c838f65936..bee59a647e 100644 --- a/crates/primitives/src/transaction/mod.rs +++ b/crates/primitives/src/transaction/mod.rs @@ -875,8 +875,7 @@ impl TransactionSigned { } } - /// Converts from an EIP-4844 [`RecoveredTx`] to a - /// [`PooledTransactionsElementEcRecovered`] with the given sidecar. + /// Converts from an EIP-4844 transaction to a [`PooledTransaction`] with the given sidecar. /// /// Returns an `Err` containing the original `TransactionSigned` if the transaction is not /// EIP-4844. diff --git a/crates/primitives/src/transaction/pooled.rs b/crates/primitives/src/transaction/pooled.rs index 113bc41e50..183d0af07e 100644 --- a/crates/primitives/src/transaction/pooled.rs +++ b/crates/primitives/src/transaction/pooled.rs @@ -4,7 +4,6 @@ use crate::RecoveredTx; use alloy_consensus::transaction::PooledTransaction; -// TODO: remove this foreign type /// A signed pooled transaction with recovered signer. pub type PooledTransactionsElementEcRecovered = RecoveredTx; diff --git a/crates/transaction-pool/src/test_utils/mock.rs b/crates/transaction-pool/src/test_utils/mock.rs index 74873e094c..98fa167f01 100644 --- a/crates/transaction-pool/src/test_utils/mock.rs +++ b/crates/transaction-pool/src/test_utils/mock.rs @@ -30,8 +30,7 @@ use rand::{ }; use reth_primitives::{ transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError}, - PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, Transaction, - TransactionSigned, TxType, + PooledTransaction, RecoveredTx, Transaction, TransactionSigned, TxType, }; use reth_primitives_traits::InMemorySize; use std::{ops::Range, sync::Arc, time::Instant, vec::IntoIter}; @@ -1045,8 +1044,8 @@ impl TryFrom> for MockTransaction { } } -impl From for MockTransaction { - fn from(tx: PooledTransactionsElementEcRecovered) -> Self { +impl From> for MockTransaction { + fn from(tx: RecoveredTx) -> Self { let (tx, signer) = tx.into_parts(); RecoveredTx::::new_unchecked(tx.into(), signer).try_into().expect( "Failed to convert from PooledTransactionsElementEcRecovered to MockTransaction", diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs index bcac0080c7..862ecc15a7 100644 --- a/crates/transaction-pool/src/traits.rs +++ b/crates/transaction-pool/src/traits.rs @@ -21,8 +21,7 @@ use reth_execution_types::ChangedAccount; use reth_primitives::{ kzg::KzgSettings, transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError}, - PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, SealedBlock, Transaction, - TransactionSigned, + PooledTransaction, RecoveredTx, SealedBlock, Transaction, TransactionSigned, }; use reth_primitives_traits::{BlockBody, SignedTransaction}; #[cfg(feature = "serde")] @@ -1242,8 +1241,8 @@ impl EthPooledTransaction { } /// Conversion from the network transaction type to the pool transaction type. -impl From for EthPooledTransaction { - fn from(tx: PooledTransactionsElementEcRecovered) -> Self { +impl From> for EthPooledTransaction { + fn from(tx: RecoveredTx) -> Self { let encoded_length = tx.encode_2718_len(); let (tx, signer) = tx.into_parts(); match tx {