Skip to content

Commit

Permalink
test(starknet_api): remove the version argument from l1 handler tx args
Browse files Browse the repository at this point in the history
  • Loading branch information
ArniStarkware committed Dec 17, 2024
1 parent 876b13a commit 0d8bd77
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
2 changes: 0 additions & 2 deletions crates/blockifier/src/test_utils/l1_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use starknet_api::calldata;
use starknet_api::core::ContractAddress;
use starknet_api::executable_transaction::L1HandlerTransaction;
use starknet_api::test_utils::l1_handler::{executable_l1_handler_tx, L1HandlerTxArgs};
use starknet_api::transaction::constants::L1_HANDLER_VERSION;
use starknet_api::transaction::fields::Fee;
use starknet_types_core::felt::Felt;

Expand All @@ -15,7 +14,6 @@ pub fn l1handler_tx(l1_fee: Fee, contract_address: ContractAddress) -> L1Handler
];

executable_l1_handler_tx(L1HandlerTxArgs {
version: L1_HANDLER_VERSION,
contract_address,
entry_point_selector: selector_from_name("l1_handler_set_value"),
calldata,
Expand Down
20 changes: 2 additions & 18 deletions crates/starknet_api/src/test_utils/l1_handler.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
use crate::core::{ContractAddress, EntryPointSelector, Nonce};
use crate::executable_transaction::L1HandlerTransaction as ExecutableL1HandlerTransaction;
use crate::transaction::constants::L1_HANDLER_VERSION;
use crate::transaction::fields::{Calldata, Fee};
use crate::transaction::{L1HandlerTransaction, TransactionHash, TransactionVersion};

#[derive(Clone)]
#[derive(Clone, Default)]
pub struct L1HandlerTxArgs {
pub version: TransactionVersion,
pub nonce: Nonce,
pub contract_address: ContractAddress,
pub entry_point_selector: EntryPointSelector,
Expand All @@ -15,20 +13,6 @@ pub struct L1HandlerTxArgs {
pub paid_fee_on_l1: Fee,
}

impl Default for L1HandlerTxArgs {
fn default() -> Self {
L1HandlerTxArgs {
version: L1_HANDLER_VERSION,
nonce: Nonce::default(),
contract_address: ContractAddress::default(),
entry_point_selector: EntryPointSelector::default(),
calldata: Calldata::default(),
tx_hash: TransactionHash::default(),
paid_fee_on_l1: Fee::default(),
}
}
}

/// Utility macro for creating `L1HandlerTransaction` to reduce boilerplate.
#[macro_export]
macro_rules! l1_handler_tx_args {
Expand All @@ -51,7 +35,7 @@ pub fn executable_l1_handler_tx(
) -> ExecutableL1HandlerTransaction {
ExecutableL1HandlerTransaction {
tx: L1HandlerTransaction {
version: l1_handler_tx_args.version,
version: TransactionVersion::ZERO, // The transaction version of L1 handler is always 0.
nonce: l1_handler_tx_args.nonce,
contract_address: l1_handler_tx_args.contract_address,
entry_point_selector: l1_handler_tx_args.entry_point_selector,
Expand Down

0 comments on commit 0d8bd77

Please sign in to comment.