Skip to content

Commit ed62e12

Browse files
blockifier_test_utils: put tx hash in signature for exec info tests
1 parent 4a01137 commit ed62e12

File tree

5 files changed

+9655
-9513
lines changed

5 files changed

+9655
-9513
lines changed

crates/blockifier/src/transaction/transactions_test.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use starknet_api::core::{ascii_as_felt, ClassHash, ContractAddress, Nonce};
2525
use starknet_api::executable_transaction::{
2626
AccountTransaction as ApiExecutableTransaction,
2727
DeployAccountTransaction,
28+
InvokeTransaction,
2829
TransactionType,
2930
};
3031
use starknet_api::execution_resources::{GasAmount, GasVector};
@@ -35,7 +36,7 @@ use starknet_api::test_utils::deploy_account::{
3536
executable_deploy_account_tx,
3637
DeployAccountTxArgs,
3738
};
38-
use starknet_api::test_utils::invoke::{executable_invoke_tx, InvokeTxArgs};
39+
use starknet_api::test_utils::invoke::{executable_invoke_tx, invoke_tx, InvokeTxArgs};
3940
use starknet_api::test_utils::{
4041
NonceManager,
4142
CHAIN_ID_FOR_TESTS,
@@ -66,6 +67,7 @@ use starknet_api::transaction::{
6667
EventContent,
6768
EventData,
6869
EventKey,
70+
InvokeTransaction as ApiInvokeTransaction,
6971
L2ToL1Payload,
7072
TransactionVersion,
7173
};
@@ -2606,13 +2608,23 @@ fn test_only_query_flag(
26062608
), // Calldata length.
26072609
];
26082610
let execute_calldata = Calldata([execute_calldata, expected_execution_info].concat().into());
2609-
let tx = executable_invoke_tx(invoke_tx_args! {
2611+
let invoke_args = invoke_tx_args! {
26102612
calldata: execute_calldata,
26112613
resource_bounds: default_all_resource_bounds,
26122614
sender_address: account_address,
2613-
});
2615+
};
2616+
let invoke_tx =
2617+
InvokeTransaction::create(invoke_tx(invoke_args), &block_context.chain_info.chain_id)
2618+
.unwrap();
2619+
let tx_hash = invoke_tx.tx_hash;
2620+
let ApiInvokeTransaction::V3(mut tx) = invoke_tx.tx else {
2621+
panic!("Expected V3 transaction");
2622+
};
2623+
tx.signature = TransactionSignature(Arc::new(vec![tx_hash.0]));
2624+
let invoke_tx = InvokeTransaction { tx: ApiInvokeTransaction::V3(tx), tx_hash };
26142625
let execution_flags = ExecutionFlags { only_query, ..Default::default() };
2615-
let invoke_tx = AccountTransaction { tx, execution_flags };
2626+
let invoke_tx =
2627+
AccountTransaction { tx: ApiExecutableTransaction::Invoke(invoke_tx), execution_flags };
26162628

26172629
let tx_execution_info = invoke_tx.execute(&mut state, &block_context).unwrap();
26182630
assert_eq!(tx_execution_info.revert_error, None);

0 commit comments

Comments
 (0)