Skip to content

Commit 6731c61

Browse files
blockifier_test_utils: update block hash test execute mode
1 parent d3f397c commit 6731c61

File tree

4 files changed

+1909
-1053
lines changed

4 files changed

+1909
-1053
lines changed

crates/blockifier_test_utils/resources/feature_contracts/cairo1/block_info_test_contract.cairo

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ mod Account {
44
use array::SpanTrait;
55
use box::BoxTrait;
66
use starknet::{
7-
ContractAddress,
8-
info::SyscallResultTrait,
9-
get_block_number,
10-
get_block_timestamp,
7+
ContractAddress, info::SyscallResultTrait, get_block_number, get_block_timestamp,
118
};
129
use zeroable::{IsZeroResult, NonZeroIntoImpl, Zeroable};
1310

@@ -16,8 +13,7 @@ mod Account {
1613
const VALIDATE_TIMESTAMP_ROUNDING: u64 = 3600;
1714

1815
#[storage]
19-
struct Storage {
20-
}
16+
struct Storage {}
2117

2218
#[constructor]
2319
fn constructor(ref self: ContractState, is_validate_: bool) {
@@ -64,33 +60,31 @@ mod Account {
6460
fn test_block_info(is_validate: bool) -> felt252 {
6561
let block_number = get_block_number();
6662
let block_timestamp = get_block_timestamp();
67-
test_given_block_info(
68-
block_number, block_timestamp, is_validate
69-
)
63+
test_given_block_info(block_number, block_timestamp, is_validate)
7064
}
7165

72-
fn test_given_block_info (
66+
fn test_given_block_info(
7367
block_number: u64, block_timestamp: u64, is_validate: bool
7468
) -> felt252 {
7569
// Verify the block number and timestamp.
76-
assert (VALIDATE_BLOCK_NUMBER_ROUNDING != 0, 'INVALID_ROUNDING');
70+
assert(VALIDATE_BLOCK_NUMBER_ROUNDING != 0, 'INVALID_ROUNDING');
7771
let (divided_block_number, _) = DivRem::div_rem(
7872
block_number, VALIDATE_BLOCK_NUMBER_ROUNDING.try_into().unwrap()
7973
);
8074
let block_number_for_validate = divided_block_number * VALIDATE_BLOCK_NUMBER_ROUNDING;
8175
let (divided_block_timestamp, _) = DivRem::div_rem(
8276
block_timestamp, VALIDATE_TIMESTAMP_ROUNDING.try_into().unwrap()
8377
);
84-
let block_timestamp_for_validate = (
85-
divided_block_timestamp * VALIDATE_TIMESTAMP_ROUNDING
86-
);
78+
let block_timestamp_for_validate = (divided_block_timestamp * VALIDATE_TIMESTAMP_ROUNDING);
8779

8880
if is_validate {
89-
assert (block_number == block_number_for_validate, 'INVALID_BLOCK_NUMBER');
90-
assert (block_timestamp == block_timestamp_for_validate, 'INVALID_BLOCK_TIMESTAMP');
81+
assert(block_number == block_number_for_validate, 'INVALID_BLOCK_NUMBER');
82+
assert(block_timestamp == block_timestamp_for_validate, 'INVALID_BLOCK_TIMESTAMP');
9183
return starknet::VALIDATED;
9284
}
93-
assert (!is_validate, 'INVALID_IS_VALIDATE');
85+
assert(block_number != block_number_for_validate, 'INVALID_BLOCK_NUMBER');
86+
assert(block_timestamp != block_timestamp_for_validate, 'INVALID_BLOCK_TIMESTAMP');
87+
assert(!is_validate, 'INVALID_IS_VALIDATE');
9488
starknet::VALIDATED
9589
}
9690
}

0 commit comments

Comments
 (0)