diff --git a/crates/blockifier/src/concurrency/fee_utils_test.rs b/crates/blockifier/src/concurrency/fee_utils_test.rs index ba6cc8df95..44619d8cf1 100644 --- a/crates/blockifier/src/concurrency/fee_utils_test.rs +++ b/crates/blockifier/src/concurrency/fee_utils_test.rs @@ -16,20 +16,20 @@ use crate::transaction::objects::FeeType; use crate::transaction::test_utils::{ account_invoke_tx, block_context, - default_l1_resource_bounds, + default_all_resource_bounds, }; #[rstest] pub fn test_fill_sequencer_balance_reads( block_context: BlockContext, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, #[values(CairoVersion::Cairo0, CairoVersion::Cairo1)] erc20_version: CairoVersion, ) { let account = FeatureContract::AccountWithoutValidations(CairoVersion::Cairo1); let account_tx = account_invoke_tx(invoke_tx_args! { sender_address: account.get_instance_address(0), calldata: create_trivial_calldata(account.get_instance_address(0)), - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, }); let chain_info = &block_context.chain_info; let state = &mut test_state_inner(chain_info, BALANCE, &[(account, 1)], erc20_version); diff --git a/crates/blockifier/src/transaction/account_transactions_test.rs b/crates/blockifier/src/transaction/account_transactions_test.rs index c62aa2542c..259a8b5abc 100644 --- a/crates/blockifier/src/transaction/account_transactions_test.rs +++ b/crates/blockifier/src/transaction/account_transactions_test.rs @@ -1257,7 +1257,7 @@ fn test_insufficient_max_fee_reverts( #[rstest] fn test_deploy_account_constructor_storage_write( - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, block_context: BlockContext, #[values(CairoVersion::Cairo0, CairoVersion::Cairo1)] cairo_version: CairoVersion, ) { @@ -1275,7 +1275,7 @@ fn test_deploy_account_constructor_storage_write( chain_info, deploy_account_tx_args! { class_hash, - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, constructor_calldata: constructor_calldata.clone(), }, ); @@ -1301,7 +1301,7 @@ fn test_deploy_account_constructor_storage_write( fn test_count_actual_storage_changes( max_fee: Fee, block_context: BlockContext, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, #[case] version: TransactionVersion, #[case] fee_type: FeeType, #[values(CairoVersion::Cairo0, CairoVersion::Cairo1)] cairo_version: CairoVersion, @@ -1344,7 +1344,7 @@ fn test_count_actual_storage_changes( let mut state = TransactionalState::create_transactional(&mut state); let invoke_args = invoke_tx_args! { max_fee, - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, version, sender_address: account_address, calldata: write_1_calldata, @@ -1482,7 +1482,7 @@ fn test_count_actual_storage_changes( #[case::tx_version_3(TransactionVersion::THREE)] fn test_concurrency_execute_fee_transfer( max_fee: Fee, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, #[case] version: TransactionVersion, ) { // TODO(Meshi, 01/06/2024): make the test so it will include changes in @@ -1501,7 +1501,7 @@ fn test_concurrency_execute_fee_transfer( sender_address: account.get_instance_address(0), max_fee, calldata: create_trivial_calldata(test_contract.get_instance_address(0)), - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, version }); let fee_type = &account_tx.fee_type(); @@ -1548,7 +1548,7 @@ fn test_concurrency_execute_fee_transfer( sender_address: account.get_instance_address(0), calldata: transfer_calldata, max_fee, - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, }); let execution_result = @@ -1582,7 +1582,7 @@ fn test_concurrency_execute_fee_transfer( #[case::tx_version_3(TransactionVersion::THREE)] fn test_concurrent_fee_transfer_when_sender_is_sequencer( max_fee: Fee, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, #[case] version: TransactionVersion, ) { let mut block_context = BlockContext::create_for_account_testing(); @@ -1599,7 +1599,7 @@ fn test_concurrent_fee_transfer_when_sender_is_sequencer( max_fee, sender_address: account_address, calldata: create_trivial_calldata(test_contract.get_instance_address(0)), - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, version }); let fee_type = &account_tx.fee_type(); @@ -1717,7 +1717,7 @@ fn test_initial_gas( #[rstest] fn test_revert_in_execute( block_context: BlockContext, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, ) { let account = FeatureContract::AccountWithoutValidations(CairoVersion::Cairo1); let chain_info = &block_context.chain_info; @@ -1735,7 +1735,7 @@ fn test_revert_in_execute( // Skip validate phase, as we want to test the revert in the execute phase. let validate = false; let tx_execution_info = account_invoke_tx(invoke_tx_args! { - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, ..tx_args }) .execute(state, &block_context, true, validate) @@ -1748,7 +1748,7 @@ fn test_revert_in_execute( #[rstest] fn test_call_contract_that_panics( mut block_context: BlockContext, - default_l1_resource_bounds: ValidResourceBounds, + default_all_resource_bounds: ValidResourceBounds, #[values(true, false)] enable_reverts: bool, #[values("test_revert_helper", "bad_selector")] inner_selector: &str, ) { @@ -1785,7 +1785,7 @@ fn test_call_contract_that_panics( state, &block_context, invoke_tx_args! { - resource_bounds: default_l1_resource_bounds, + resource_bounds: default_all_resource_bounds, ..tx_args }, )