Skip to content

Commit a95a0a0

Browse files
enitratenitrat
committed
fix tests
1 parent fa0cb4a commit a95a0a0

34 files changed

+256
-256
lines changed

‎crates/forge/tests/data/erc20_package/tests/test_complex.cairo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn deploy_erc20(
2727
constructor_calldata.append_span(initial_supply_serialized.span());
2828
constructor_calldata.append(recipient.into());
2929

30-
let (address, _) = contract.deploy(@constructor_calldata).unwrap();
30+
let (address, _) = contract.deploy(constructor_calldata.span()).unwrap();
3131
address
3232
}
3333

‎crates/forge/tests/data/trace_resources/tests/test_call.cairo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn test_call() {
1717

1818
let (checker_address, _) = checker.deploy([].span()).unwrap();
1919
let (proxy_address, _) = proxy
20-
.deploy(@array![checker_address.into(), empty_hash.into(), 5])
20+
.deploy([checker_address.into(), empty_hash.into(), 5].span())
2121
.unwrap();
2222
let (dummy_address, _) = dummy.deploy([].span()).unwrap();
2323

‎crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn test_failed_call() {
1818

1919
let (checker_address, _) = checker.deploy([].span()).unwrap();
2020
let (proxy_address, _) = proxy
21-
.deploy(@array![checker_address.into(), empty_hash.into(), 1])
21+
.deploy([checker_address.into(), empty_hash.into(), 1].span())
2222
.unwrap();
2323

2424
let proxy_dispatcher = ITraceInfoProxySafeDispatcher { contract_address: proxy_address };

‎crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn test_l1_handler() {
1212

1313
let (checker_address, _) = checker.deploy([].span()).unwrap();
1414
let (proxy_address, _) = proxy
15-
.deploy(@array![checker_address.into(), empty_hash.into(), 1])
15+
.deploy([checker_address.into(), empty_hash.into(), 1].span())
1616
.unwrap();
1717

1818
let mut l1_handler = L1HandlerTrait::new(checker_address, selector!("handle_l1_message"));

‎crates/forge/tests/integration/cheat_block_number.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn cheat_block_number_basic() {
2828
#[test]
2929
fn test_stop_cheat_block_number() {
3030
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
31-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
31+
let (contract_address, _) = contract.deploy([].span()).unwrap();
3232
let dispatcher = ICheatBlockNumberCheckerDispatcher { contract_address };
3333
3434
let old_block_number = dispatcher.get_block_number();
@@ -48,8 +48,8 @@ fn cheat_block_number_basic() {
4848
fn test_cheat_block_number_multiple() {
4949
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
5050
51-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
52-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
51+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
52+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
5353
5454
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
5555
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
@@ -77,8 +77,8 @@ fn cheat_block_number_basic() {
7777
fn test_cheat_block_number_all() {
7878
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
7979
80-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
81-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
80+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
81+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
8282
8383
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
8484
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
@@ -106,7 +106,7 @@ fn cheat_block_number_basic() {
106106
#[test]
107107
fn test_cheat_block_number_all_stop_one() {
108108
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
109-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
109+
let (contract_address, _) = contract.deploy([].span()).unwrap();
110110
let dispatcher = ICheatBlockNumberCheckerDispatcher { contract_address };
111111
112112
let old_block_number = dispatcher.get_block_number();
@@ -155,16 +155,16 @@ fn cheat_block_number_complex() {
155155
156156
fn deploy_cheat_block_number_checker() -> ICheatBlockNumberCheckerDispatcher {
157157
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
158-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
158+
let (contract_address, _) = contract.deploy([].span()).unwrap();
159159
ICheatBlockNumberCheckerDispatcher { contract_address }
160160
}
161161
162162
#[test]
163163
fn cheat_block_number_complex() {
164164
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
165165
166-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
167-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
166+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
167+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
168168
169169
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
170170
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
@@ -237,7 +237,7 @@ fn cheat_block_number_with_span() {
237237
}
238238
239239
fn deploy_cheat_block_number_checker() -> ICheatBlockNumberCheckerDispatcher {
240-
let (contract_address, _) = declare("CheatBlockNumberChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
240+
let (contract_address, _) = declare("CheatBlockNumberChecker").unwrap().contract_class().deploy([].span()).unwrap();
241241
ICheatBlockNumberCheckerDispatcher { contract_address }
242242
}
243243

‎crates/forge/tests/integration/cheat_block_timestamp.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn cheat_block_timestamp_basic() {
2727
2828
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
2929
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
30-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
30+
let (contract_address, _) = contract.deploy([].span()).unwrap();
3131
ICheatBlockTimestampCheckerDispatcher { contract_address }
3232
}
3333
@@ -69,8 +69,8 @@ fn cheat_block_timestamp_basic() {
6969
fn cheat_block_timestamp_multiple() {
7070
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
7171
72-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
73-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
72+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
73+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
7474
7575
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
7676
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
@@ -101,8 +101,8 @@ fn cheat_block_timestamp_basic() {
101101
fn cheat_block_timestamp_all() {
102102
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
103103
104-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
105-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
104+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
105+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
106106
107107
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
108108
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
@@ -163,16 +163,16 @@ fn cheat_block_timestamp_complex() {
163163
164164
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
165165
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
166-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
166+
let (contract_address, _) = contract.deploy([].span()).unwrap();
167167
ICheatBlockTimestampCheckerDispatcher { contract_address }
168168
}
169169
170170
#[test]
171171
fn cheat_block_timestamp_complex() {
172172
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
173173
174-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
175-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
174+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
175+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
176176
177177
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
178178
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
@@ -245,7 +245,7 @@ fn cheat_block_timestamp_with_span() {
245245
}
246246
247247
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
248-
let (contract_address, _) = declare("CheatBlockTimestampChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
248+
let (contract_address, _) = declare("CheatBlockTimestampChecker").unwrap().contract_class().deploy([].span()).unwrap();
249249
ICheatBlockTimestampCheckerDispatcher { contract_address }
250250
}
251251

‎crates/forge/tests/integration/cheat_caller_address.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn cheat_caller_address() {
2525
#[test]
2626
fn test_stop_cheat_caller_address() {
2727
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
28-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
28+
let (contract_address, _) = contract.deploy([].span()).unwrap();
2929
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
3030
3131
let target_caller_address: felt252 = 123;
@@ -47,7 +47,7 @@ fn cheat_caller_address() {
4747
#[test]
4848
fn test_cheat_caller_address_all() {
4949
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
50-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
50+
let (contract_address, _) = contract.deploy([].span()).unwrap();
5151
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
5252
5353
let target_caller_address: felt252 = 123;
@@ -69,7 +69,7 @@ fn cheat_caller_address() {
6969
#[test]
7070
fn test_cheat_caller_address_all_stop_one() {
7171
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
72-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
72+
let (contract_address, _) = contract.deploy([].span()).unwrap();
7373
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
7474
7575
let target_caller_address: felt252 = 123;
@@ -92,8 +92,8 @@ fn cheat_caller_address() {
9292
fn test_cheat_caller_address_multiple() {
9393
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
9494
95-
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
96-
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
95+
let (contract_address1, _) = contract.deploy([].span()).unwrap();
96+
let (contract_address2, _) = contract.deploy([].span()).unwrap();
9797
9898
let dispatcher1 = ICheatCallerAddressCheckerDispatcher { contract_address: contract_address1 };
9999
let dispatcher2 = ICheatCallerAddressCheckerDispatcher { contract_address: contract_address2 };
@@ -155,7 +155,7 @@ fn cheat_caller_address_with_span() {
155155
}
156156
157157
fn deploy_cheat_caller_address_checker() -> ICheatCallerAddressCheckerDispatcher {
158-
let (contract_address, _) = declare("CheatCallerAddressChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
158+
let (contract_address, _) = declare("CheatCallerAddressChecker").unwrap().contract_class().deploy([].span()).unwrap();
159159
ICheatCallerAddressCheckerDispatcher { contract_address }
160160
}
161161

‎crates/forge/tests/integration/cheat_execution_info.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn start_and_stop_cheat_transaction_hash_single_attribute() {
2626
#[test]
2727
fn start_cheat_transaction_hash_single_attribute() {
2828
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
29-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
29+
let (contract_address, _) = contract.deploy([].span()).unwrap();
3030
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
3131
3232
let tx_info_before = dispatcher.get_tx_info();
@@ -46,7 +46,7 @@ fn start_and_stop_cheat_transaction_hash_single_attribute() {
4646
#[test]
4747
fn test_cheat_transaction_hash_all_stop_one() {
4848
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
49-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
49+
let (contract_address, _) = contract.deploy([].span()).unwrap();
5050
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
5151
5252
let tx_info_before = dispatcher.get_tx_info();
@@ -138,7 +138,7 @@ fn start_cheat_execution_info_all_attributes_mocked() {
138138
#[test]
139139
fn start_cheat_execution_info_all_attributes_mocked() {
140140
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
141-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
141+
let (contract_address, _) = contract.deploy([].span()).unwrap();
142142
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
143143
144144
let mut execution_info_mock: ExecutionInfoMock = Default::default();
@@ -294,7 +294,7 @@ fn start_cheat_transaction_hash_cancel_mock_by_setting_attribute_to_none() {
294294
#[test]
295295
fn start_cheat_transaction_hash_cancel_mock_by_setting_attribute_to_none() {
296296
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
297-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
297+
let (contract_address, _) = contract.deploy([].span()).unwrap();
298298
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
299299
300300
let tx_info_before_mock = dispatcher.get_tx_info();
@@ -372,10 +372,10 @@ fn start_cheat_transaction_hash_multiple() {
372372
fn start_cheat_transaction_hash_multiple() {
373373
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
374374
375-
let (contract_address_1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
375+
let (contract_address_1, _) = contract.deploy([].span()).unwrap();
376376
let dispatcher_1 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_1 };
377377
378-
let (contract_address_2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
378+
let (contract_address_2, _) = contract.deploy([].span()).unwrap();
379379
let dispatcher_2 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_2 };
380380
381381
start_cheat_transaction_hash(contract_address_1, 421);
@@ -438,7 +438,7 @@ fn start_cheat_execution_info_all() {
438438
#[test]
439439
fn start_cheat_execution_info_all_one_param() {
440440
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
441-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
441+
let (contract_address, _) = contract.deploy([].span()).unwrap();
442442
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
443443
444444
let mut execution_info_mock: ExecutionInfoMock = Default::default();
@@ -452,7 +452,7 @@ fn start_cheat_execution_info_all() {
452452
#[test]
453453
fn start_cheat_execution_info_all_multiple_params() {
454454
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
455-
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
455+
let (contract_address, _) = contract.deploy([].span()).unwrap();
456456
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
457457
458458
let mut execution_info_mock: ExecutionInfoMock = Default::default();
@@ -556,8 +556,8 @@ fn start_cheat_transaction_hash_complex() {
556556
#[test]
557557
fn start_cheat_transaction_hash_complex() {
558558
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
559-
let (contract_address_1, _) = contract.deploy(@array![]).unwrap();
560-
let (contract_address_2, _) = contract.deploy(@array![]).unwrap();
559+
let (contract_address_1, _) = contract.deploy([].span()).unwrap();
560+
let (contract_address_2, _) = contract.deploy([].span()).unwrap();
561561
562562
let dispatcher_1 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_1 };
563563
let dispatcher_2 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_2 };
@@ -618,7 +618,7 @@ fn cheat_transaction_hash_with_span() {
618618
}
619619
620620
fn deploy_cheat_transaction_hash_checker() -> ICheatTxInfoCheckerDispatcher {
621-
let (contract_address, _) = declare("CheatTxInfoChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
621+
let (contract_address, _) = declare("CheatTxInfoChecker").unwrap().contract_class().deploy([].span()).unwrap();
622622
ICheatTxInfoCheckerDispatcher { contract_address }
623623
}
624624

0 commit comments

Comments
 (0)