Skip to content

Commit 28761db

Browse files
authored
chore: rm usage of PooledTransactionsElementEcRecovered alias (#13690)
1 parent 15b50da commit 28761db

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

crates/primitives/src/transaction/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,7 @@ impl TransactionSigned {
875875
}
876876
}
877877

878-
/// Converts from an EIP-4844 [`RecoveredTx`] to a
879-
/// [`PooledTransactionsElementEcRecovered`] with the given sidecar.
878+
/// Converts from an EIP-4844 transaction to a [`PooledTransaction`] with the given sidecar.
880879
///
881880
/// Returns an `Err` containing the original `TransactionSigned` if the transaction is not
882881
/// EIP-4844.

crates/primitives/src/transaction/pooled.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
use crate::RecoveredTx;
55
use alloy_consensus::transaction::PooledTransaction;
66

7-
// TODO: remove this foreign type
87
/// A signed pooled transaction with recovered signer.
98
pub type PooledTransactionsElementEcRecovered<T = PooledTransaction> = RecoveredTx<T>;
109

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ use rand::{
3030
};
3131
use reth_primitives::{
3232
transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError},
33-
PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, Transaction,
34-
TransactionSigned, TxType,
33+
PooledTransaction, RecoveredTx, Transaction, TransactionSigned, TxType,
3534
};
3635
use reth_primitives_traits::InMemorySize;
3736
use std::{ops::Range, sync::Arc, time::Instant, vec::IntoIter};
@@ -1045,8 +1044,8 @@ impl TryFrom<RecoveredTx<TransactionSigned>> for MockTransaction {
10451044
}
10461045
}
10471046

1048-
impl From<PooledTransactionsElementEcRecovered> for MockTransaction {
1049-
fn from(tx: PooledTransactionsElementEcRecovered) -> Self {
1047+
impl From<RecoveredTx<PooledTransaction>> for MockTransaction {
1048+
fn from(tx: RecoveredTx<PooledTransaction>) -> Self {
10501049
let (tx, signer) = tx.into_parts();
10511050
RecoveredTx::<TransactionSigned>::new_unchecked(tx.into(), signer).try_into().expect(
10521051
"Failed to convert from PooledTransactionsElementEcRecovered to MockTransaction",

crates/transaction-pool/src/traits.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ use reth_execution_types::ChangedAccount;
2121
use reth_primitives::{
2222
kzg::KzgSettings,
2323
transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError},
24-
PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, SealedBlock, Transaction,
25-
TransactionSigned,
24+
PooledTransaction, RecoveredTx, SealedBlock, Transaction, TransactionSigned,
2625
};
2726
use reth_primitives_traits::{BlockBody, SignedTransaction};
2827
#[cfg(feature = "serde")]
@@ -1242,8 +1241,8 @@ impl<T: SignedTransaction> EthPooledTransaction<T> {
12421241
}
12431242

12441243
/// Conversion from the network transaction type to the pool transaction type.
1245-
impl From<PooledTransactionsElementEcRecovered> for EthPooledTransaction {
1246-
fn from(tx: PooledTransactionsElementEcRecovered) -> Self {
1244+
impl From<RecoveredTx<PooledTransaction>> for EthPooledTransaction {
1245+
fn from(tx: RecoveredTx<PooledTransaction>) -> Self {
12471246
let encoded_length = tx.encode_2718_len();
12481247
let (tx, signer) = tx.into_parts();
12491248
match tx {

0 commit comments

Comments
 (0)