chore: replace TransactionSigned struct inits with new functions (#12779)

This commit is contained in:
Tien Nguyen
2024-11-22 21:28:59 +07:00
committed by GitHub
parent 64728e0856
commit f2860006f7
8 changed files with 63 additions and 81 deletions

View File

@ -82,6 +82,7 @@ pub enum BlobStoreUpdates {
#[cfg(test)]
mod tests {
use alloy_consensus::Header;
use alloy_primitives::PrimitiveSignature as Signature;
use reth_execution_types::Chain;
use reth_primitives::{
BlockBody, SealedBlock, SealedBlockWithSenders, SealedHeader, Transaction,
@ -127,22 +128,22 @@ mod tests {
),
body: BlockBody {
transactions: vec![
TransactionSigned {
hash: tx1_hash.into(),
transaction: Transaction::Eip4844(Default::default()),
..Default::default()
},
TransactionSigned {
hash: tx2_hash.into(),
transaction: Transaction::Eip4844(Default::default()),
..Default::default()
},
TransactionSigned::new(
Transaction::Eip4844(Default::default()),
Signature::test_signature(),
tx1_hash,
),
TransactionSigned::new(
Transaction::Eip4844(Default::default()),
Signature::test_signature(),
tx2_hash,
),
// Another transaction that is not EIP-4844
TransactionSigned {
hash: B256::random().into(),
transaction: Transaction::Eip7702(Default::default()),
..Default::default()
},
TransactionSigned::new(
Transaction::Eip7702(Default::default()),
Signature::test_signature(),
B256::random(),
),
],
..Default::default()
},
@ -160,16 +161,16 @@ mod tests {
),
body: BlockBody {
transactions: vec![
TransactionSigned {
hash: tx3_hash.into(),
transaction: Transaction::Eip1559(Default::default()),
..Default::default()
},
TransactionSigned {
hash: tx2_hash.into(),
transaction: Transaction::Eip2930(Default::default()),
..Default::default()
},
TransactionSigned::new(
Transaction::Eip1559(Default::default()),
Signature::test_signature(),
tx3_hash,
),
TransactionSigned::new(
Transaction::Eip2930(Default::default()),
Signature::test_signature(),
tx2_hash,
),
],
..Default::default()
},

View File

@ -910,11 +910,8 @@ impl From<PooledTransactionsElementEcRecovered> for MockTransaction {
impl From<MockTransaction> for TransactionSignedEcRecovered {
fn from(tx: MockTransaction) -> Self {
let signed_tx = TransactionSigned {
hash: (*tx.hash()).into(),
signature: Signature::test_signature(),
transaction: tx.clone().into(),
};
let signed_tx =
TransactionSigned::new(tx.clone().into(), Signature::test_signature(), *tx.hash());
Self::from_signed_transaction(signed_tx, tx.sender())
}