From b9ab12905f3e06874a176561bd32609517ff07ea Mon Sep 17 00:00:00 2001 From: Aviv Greenburg Date: Sun, 17 Nov 2024 14:31:59 +0200 Subject: [PATCH] chore(blockifier): use macro in AccounTx::{sender_address(), tx_hash()} --- .../src/transaction/account_transaction.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/crates/blockifier/src/transaction/account_transaction.rs b/crates/blockifier/src/transaction/account_transaction.rs index bde616b0b2c..1b8ce0881b7 100644 --- a/crates/blockifier/src/transaction/account_transaction.rs +++ b/crates/blockifier/src/transaction/account_transaction.rs @@ -150,7 +150,12 @@ impl HasRelatedFeeType for AccountTransaction { } impl AccountTransaction { - implement_tx_getter_calls!((resource_bounds, ValidResourceBounds), (tip, Tip)); + implement_tx_getter_calls!( + (resource_bounds, ValidResourceBounds), + (tip, Tip), + (sender_address, ContractAddress), + (tx_hash, TransactionHash) + ); implement_account_tx_inner_getters!( (signature, TransactionSignature), @@ -168,10 +173,6 @@ impl AccountTransaction { AccountTransaction { tx, only_query: true } } - pub fn sender_address(&self) -> ContractAddress { - self.tx.sender_address() - } - pub fn class_hash(&self) -> Option { match &self.tx { Transaction::Declare(tx) => Some(tx.tx.class_hash()), @@ -238,10 +239,6 @@ impl AccountTransaction { self.signature().0.len() } - pub fn tx_hash(&self) -> TransactionHash { - self.tx.tx_hash() - } - pub fn enforce_fee(&self) -> bool { self.create_tx_info().enforce_fee() }