mirror of
https://github.com/hl-archive-node/nanoreth.git
synced 2025-12-06 10:59:55 +00:00
chore: remove PooledTransactionsElement alias (#13384)
This commit is contained in:
@ -680,7 +680,7 @@ mod tests {
|
||||
use alloy_primitives::{hex, U256};
|
||||
use reth_chainspec::MAINNET;
|
||||
use reth_fs_util as fs;
|
||||
use reth_primitives::PooledTransactionsElement;
|
||||
use reth_primitives::PooledTransaction;
|
||||
use reth_provider::test_utils::{ExtendedAccount, MockEthProvider};
|
||||
use reth_tasks::TaskManager;
|
||||
|
||||
@ -700,7 +700,7 @@ mod tests {
|
||||
let temp_dir = tempfile::tempdir().unwrap();
|
||||
let transactions_path = temp_dir.path().join(FILENAME).with_extension(EXTENSION);
|
||||
let tx_bytes = hex!("02f87201830655c2808505ef61f08482565f94388c818ca8b9251b393131c08a736a67ccb192978801049e39c4b5b1f580c001a01764ace353514e8abdfb92446de356b260e3c1225b73fc4c8876a6258d12a129a04f02294aa61ca7676061cd99f29275491218b4754b46a0248e5e42bc5091f507");
|
||||
let tx = PooledTransactionsElement::decode_2718(&mut &tx_bytes[..]).unwrap();
|
||||
let tx = PooledTransaction::decode_2718(&mut &tx_bytes[..]).unwrap();
|
||||
let provider = MockEthProvider::default();
|
||||
let transaction: EthPooledTransaction = tx.try_into_ecrecovered().unwrap().into();
|
||||
let tx_to_cmp = transaction.clone();
|
||||
|
||||
@ -30,7 +30,7 @@ use rand::{
|
||||
};
|
||||
use reth_primitives::{
|
||||
transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError},
|
||||
PooledTransactionsElement, PooledTransactionsElementEcRecovered, RecoveredTx, Transaction,
|
||||
PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, Transaction,
|
||||
TransactionSigned, TxType,
|
||||
};
|
||||
use reth_primitives_traits::InMemorySize;
|
||||
@ -666,7 +666,7 @@ impl PoolTransaction for MockTransaction {
|
||||
|
||||
type Consensus = TransactionSigned;
|
||||
|
||||
type Pooled = PooledTransactionsElement;
|
||||
type Pooled = PooledTransaction;
|
||||
|
||||
fn try_from_consensus(
|
||||
tx: RecoveredTx<Self::Consensus>,
|
||||
|
||||
@ -21,8 +21,8 @@ use reth_execution_types::ChangedAccount;
|
||||
use reth_primitives::{
|
||||
kzg::KzgSettings,
|
||||
transaction::{SignedTransactionIntoRecoveredExt, TryFromRecoveredTransactionError},
|
||||
PooledTransactionsElement, PooledTransactionsElementEcRecovered, RecoveredTx, SealedBlock,
|
||||
Transaction, TransactionSigned,
|
||||
PooledTransaction, PooledTransactionsElementEcRecovered, RecoveredTx, SealedBlock, Transaction,
|
||||
TransactionSigned,
|
||||
};
|
||||
use reth_primitives_traits::SignedTransaction;
|
||||
#[cfg(feature = "serde")]
|
||||
@ -224,7 +224,7 @@ pub trait TransactionPool: Send + Sync + Clone {
|
||||
max: usize,
|
||||
) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>>;
|
||||
|
||||
/// Returns converted [PooledTransactionsElement] for the given transaction hashes.
|
||||
/// Returns converted [PooledTransaction] for the given transaction hashes.
|
||||
///
|
||||
/// This adheres to the expected behavior of
|
||||
/// [`GetPooledTransactions`](https://github.com/ethereum/devp2p/blob/master/caps/eth.md#getpooledtransactions-0x09):
|
||||
@ -1238,7 +1238,7 @@ impl From<PooledTransactionsElementEcRecovered> for EthPooledTransaction {
|
||||
let encoded_length = tx.encode_2718_len();
|
||||
let (tx, signer) = tx.to_components();
|
||||
match tx {
|
||||
PooledTransactionsElement::Eip4844(tx) => {
|
||||
PooledTransaction::Eip4844(tx) => {
|
||||
// include the blob sidecar
|
||||
let (tx, sig, hash) = tx.into_parts();
|
||||
let (tx, blob) = tx.into_parts();
|
||||
@ -1262,7 +1262,7 @@ impl PoolTransaction for EthPooledTransaction {
|
||||
|
||||
type Consensus = TransactionSigned;
|
||||
|
||||
type Pooled = PooledTransactionsElement;
|
||||
type Pooled = PooledTransaction;
|
||||
|
||||
fn clone_into_consensus(&self) -> RecoveredTx<Self::Consensus> {
|
||||
self.transaction().clone()
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user