Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@enitrat
enitrat committed Aug 27, 2024
1 parent fa0cb4a commit a95a0a0
Show file tree
Hide file tree
Showing 34 changed files with 256 additions and 256 deletions.
2 changes: 1 addition & 1 deletion crates/forge/tests/data/erc20_package/tests/test_complex.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn deploy_erc20(
constructor_calldata.append_span(initial_supply_serialized.span());
constructor_calldata.append(recipient.into());

let (address, _) = contract.deploy(@constructor_calldata).unwrap();
let (address, _) = contract.deploy(constructor_calldata.span()).unwrap();
address
}

Expand Down
2 changes: 1 addition & 1 deletion crates/forge/tests/data/trace_resources/tests/test_call.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn test_call() {

let (checker_address, _) = checker.deploy([].span()).unwrap();
let (proxy_address, _) = proxy
.deploy(@array![checker_address.into(), empty_hash.into(), 5])
.deploy([checker_address.into(), empty_hash.into(), 5].span())
.unwrap();
let (dummy_address, _) = dummy.deploy([].span()).unwrap();

Expand Down
2 changes: 1 addition & 1 deletion crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn test_failed_call() {

let (checker_address, _) = checker.deploy([].span()).unwrap();
let (proxy_address, _) = proxy
.deploy(@array![checker_address.into(), empty_hash.into(), 1])
.deploy([checker_address.into(), empty_hash.into(), 1].span())
.unwrap();

let proxy_dispatcher = ITraceInfoProxySafeDispatcher { contract_address: proxy_address };
Expand Down
2 changes: 1 addition & 1 deletion crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_l1_handler() {

let (checker_address, _) = checker.deploy([].span()).unwrap();
let (proxy_address, _) = proxy
.deploy(@array![checker_address.into(), empty_hash.into(), 1])
.deploy([checker_address.into(), empty_hash.into(), 1].span())
.unwrap();

let mut l1_handler = L1HandlerTrait::new(checker_address, selector!("handle_l1_message"));
Expand Down
20 changes: 10 additions & 10 deletions crates/forge/tests/integration/cheat_block_number.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn cheat_block_number_basic() {
#[test]
fn test_stop_cheat_block_number() {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatBlockNumberCheckerDispatcher { contract_address };
let old_block_number = dispatcher.get_block_number();
Expand All @@ -48,8 +48,8 @@ fn cheat_block_number_basic() {
fn test_cheat_block_number_multiple() {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -77,8 +77,8 @@ fn cheat_block_number_basic() {
fn test_cheat_block_number_all() {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -106,7 +106,7 @@ fn cheat_block_number_basic() {
#[test]
fn test_cheat_block_number_all_stop_one() {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatBlockNumberCheckerDispatcher { contract_address };
let old_block_number = dispatcher.get_block_number();
Expand Down Expand Up @@ -155,16 +155,16 @@ fn cheat_block_number_complex() {
fn deploy_cheat_block_number_checker() -> ICheatBlockNumberCheckerDispatcher {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
ICheatBlockNumberCheckerDispatcher { contract_address }
}
#[test]
fn cheat_block_number_complex() {
let contract = declare("CheatBlockNumberChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_number_checker1 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_number_checker2 = ICheatBlockNumberCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -237,7 +237,7 @@ fn cheat_block_number_with_span() {
}
fn deploy_cheat_block_number_checker() -> ICheatBlockNumberCheckerDispatcher {
let (contract_address, _) = declare("CheatBlockNumberChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = declare("CheatBlockNumberChecker").unwrap().contract_class().deploy([].span()).unwrap();
ICheatBlockNumberCheckerDispatcher { contract_address }
}
Expand Down
18 changes: 9 additions & 9 deletions crates/forge/tests/integration/cheat_block_timestamp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn cheat_block_timestamp_basic() {
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
ICheatBlockTimestampCheckerDispatcher { contract_address }
}
Expand Down Expand Up @@ -69,8 +69,8 @@ fn cheat_block_timestamp_basic() {
fn cheat_block_timestamp_multiple() {
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -101,8 +101,8 @@ fn cheat_block_timestamp_basic() {
fn cheat_block_timestamp_all() {
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -163,16 +163,16 @@ fn cheat_block_timestamp_complex() {
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
ICheatBlockTimestampCheckerDispatcher { contract_address }
}
#[test]
fn cheat_block_timestamp_complex() {
let contract = declare("CheatBlockTimestampChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let cheat_block_timestamp_checker1 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address1 };
let cheat_block_timestamp_checker2 = ICheatBlockTimestampCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -245,7 +245,7 @@ fn cheat_block_timestamp_with_span() {
}
fn deploy_cheat_block_timestamp_checker() -> ICheatBlockTimestampCheckerDispatcher {
let (contract_address, _) = declare("CheatBlockTimestampChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = declare("CheatBlockTimestampChecker").unwrap().contract_class().deploy([].span()).unwrap();
ICheatBlockTimestampCheckerDispatcher { contract_address }
}
Expand Down
12 changes: 6 additions & 6 deletions crates/forge/tests/integration/cheat_caller_address.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn cheat_caller_address() {
#[test]
fn test_stop_cheat_caller_address() {
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
let target_caller_address: felt252 = 123;
Expand All @@ -47,7 +47,7 @@ fn cheat_caller_address() {
#[test]
fn test_cheat_caller_address_all() {
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
let target_caller_address: felt252 = 123;
Expand All @@ -69,7 +69,7 @@ fn cheat_caller_address() {
#[test]
fn test_cheat_caller_address_all_stop_one() {
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatCallerAddressCheckerDispatcher { contract_address };
let target_caller_address: felt252 = 123;
Expand All @@ -92,8 +92,8 @@ fn cheat_caller_address() {
fn test_cheat_caller_address_multiple() {
let contract = declare("CheatCallerAddressChecker").unwrap().contract_class();
let (contract_address1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address1, _) = contract.deploy([].span()).unwrap();
let (contract_address2, _) = contract.deploy([].span()).unwrap();
let dispatcher1 = ICheatCallerAddressCheckerDispatcher { contract_address: contract_address1 };
let dispatcher2 = ICheatCallerAddressCheckerDispatcher { contract_address: contract_address2 };
Expand Down Expand Up @@ -155,7 +155,7 @@ fn cheat_caller_address_with_span() {
}
fn deploy_cheat_caller_address_checker() -> ICheatCallerAddressCheckerDispatcher {
let (contract_address, _) = declare("CheatCallerAddressChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = declare("CheatCallerAddressChecker").unwrap().contract_class().deploy([].span()).unwrap();
ICheatCallerAddressCheckerDispatcher { contract_address }
}
Expand Down
22 changes: 11 additions & 11 deletions crates/forge/tests/integration/cheat_execution_info.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fn start_and_stop_cheat_transaction_hash_single_attribute() {
#[test]
fn start_cheat_transaction_hash_single_attribute() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let tx_info_before = dispatcher.get_tx_info();
Expand All @@ -46,7 +46,7 @@ fn start_and_stop_cheat_transaction_hash_single_attribute() {
#[test]
fn test_cheat_transaction_hash_all_stop_one() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let tx_info_before = dispatcher.get_tx_info();
Expand Down Expand Up @@ -138,7 +138,7 @@ fn start_cheat_execution_info_all_attributes_mocked() {
#[test]
fn start_cheat_execution_info_all_attributes_mocked() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let mut execution_info_mock: ExecutionInfoMock = Default::default();
Expand Down Expand Up @@ -294,7 +294,7 @@ fn start_cheat_transaction_hash_cancel_mock_by_setting_attribute_to_none() {
#[test]
fn start_cheat_transaction_hash_cancel_mock_by_setting_attribute_to_none() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let tx_info_before_mock = dispatcher.get_tx_info();
Expand Down Expand Up @@ -372,10 +372,10 @@ fn start_cheat_transaction_hash_multiple() {
fn start_cheat_transaction_hash_multiple() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address_1, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address_1, _) = contract.deploy([].span()).unwrap();
let dispatcher_1 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_1 };
let (contract_address_2, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address_2, _) = contract.deploy([].span()).unwrap();
let dispatcher_2 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_2 };
start_cheat_transaction_hash(contract_address_1, 421);
Expand Down Expand Up @@ -438,7 +438,7 @@ fn start_cheat_execution_info_all() {
#[test]
fn start_cheat_execution_info_all_one_param() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let mut execution_info_mock: ExecutionInfoMock = Default::default();
Expand All @@ -452,7 +452,7 @@ fn start_cheat_execution_info_all() {
#[test]
fn start_cheat_execution_info_all_multiple_params() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = contract.deploy([].span()).unwrap();
let dispatcher = ICheatTxInfoCheckerDispatcher { contract_address };
let mut execution_info_mock: ExecutionInfoMock = Default::default();
Expand Down Expand Up @@ -556,8 +556,8 @@ fn start_cheat_transaction_hash_complex() {
#[test]
fn start_cheat_transaction_hash_complex() {
let contract = declare("CheatTxInfoChecker").unwrap().contract_class();
let (contract_address_1, _) = contract.deploy(@array![]).unwrap();
let (contract_address_2, _) = contract.deploy(@array![]).unwrap();
let (contract_address_1, _) = contract.deploy([].span()).unwrap();
let (contract_address_2, _) = contract.deploy([].span()).unwrap();
let dispatcher_1 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_1 };
let dispatcher_2 = ICheatTxInfoCheckerDispatcher { contract_address: contract_address_2 };
Expand Down Expand Up @@ -618,7 +618,7 @@ fn cheat_transaction_hash_with_span() {
}
fn deploy_cheat_transaction_hash_checker() -> ICheatTxInfoCheckerDispatcher {
let (contract_address, _) = declare("CheatTxInfoChecker").unwrap().contract_class().deploy(@ArrayTrait::new()).unwrap();
let (contract_address, _) = declare("CheatTxInfoChecker").unwrap().contract_class().deploy([].span()).unwrap();
ICheatTxInfoCheckerDispatcher { contract_address }
}
Expand Down
Loading

0 comments on commit a95a0a0

Please sign in to comment.