diff --git a/crates/cheatnet/tests/contracts/src/bytearray_string_panic_call.cairo b/crates/cheatnet/tests/contracts/src/bytearray_string_panic_call.cairo index d8a31b4e16..d7e6eeda6c 100644 --- a/crates/cheatnet/tests/contracts/src/bytearray_string_panic_call.cairo +++ b/crates/cheatnet/tests/contracts/src/bytearray_string_panic_call.cairo @@ -39,7 +39,7 @@ trait IByteArrayPanickingContractProxy { #[starknet::contract] mod ByteArrayPanickingContractProxy { use starknet::ContractAddress; - use super::{IByteArrayPanickingContractDispatcherTrait, IByteArrayPanickingContractDispatcher}; + use super::{IByteArrayPanickingContractDispatcher, IByteArrayPanickingContractDispatcherTrait}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_hash.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_hash.cairo index f8709355bd..bd1655d0a4 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_hash.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_hash.cairo @@ -1,4 +1,4 @@ mod checker; -mod constructor_checker; -mod checker_proxy; mod checker_library_call; +mod checker_proxy; +mod constructor_checker; diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_library_call.cairo index e5db237cbc..56a2c577df 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_library_call.cairo @@ -15,10 +15,10 @@ trait ICheatBlockHashCheckerLibCall { #[starknet::contract] mod CheatBlockHashCheckerLibCall { - use super::{ICheatBlockHashCheckerDispatcherTrait, ICheatBlockHashCheckerLibraryDispatcher}; use core::starknet::SyscallResultTrait; use starknet::ClassHash; use starknet::syscalls::get_block_hash_syscall; + use super::{ICheatBlockHashCheckerDispatcherTrait, ICheatBlockHashCheckerLibraryDispatcher}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_proxy.cairo index 6affc8cad0..9f29e87da9 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_hash/checker_proxy.cairo @@ -18,14 +18,12 @@ trait ICheatBlockHashCheckerProxy { #[starknet::contract] mod CheatBlockHashCheckerProxy { - use starknet::ContractAddress; - use super::ICheatBlockHashCheckerDispatcherTrait; - use super::ICheatBlockHashCheckerDispatcher; - use super::ICheatBlockHashCheckerProxyDispatcher; - use super::ICheatBlockHashCheckerProxyDispatcherTrait; - use starknet::get_contract_address; use starknet::syscalls::get_block_hash_syscall; - use starknet::SyscallResultTrait; + use starknet::{ContractAddress, SyscallResultTrait, get_contract_address}; + use super::{ + ICheatBlockHashCheckerDispatcher, ICheatBlockHashCheckerDispatcherTrait, + ICheatBlockHashCheckerProxyDispatcher, ICheatBlockHashCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_hash/constructor_checker.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_hash/constructor_checker.cairo index afb8ee6d28..9bb26c143a 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_hash/constructor_checker.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_hash/constructor_checker.cairo @@ -6,9 +6,9 @@ trait IConstructorCheatBlockHashChecker { #[starknet::contract] mod ConstructorCheatBlockHashChecker { - use starknet::syscalls::get_block_hash_syscall; use starknet::SyscallResultTrait; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; + use starknet::syscalls::get_block_hash_syscall; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_number.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_number.cairo index 9c5db3ed91..bd1655d0a4 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_number.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_number.cairo @@ -1,4 +1,4 @@ mod checker; -mod constructor_checker; mod checker_library_call; mod checker_proxy; +mod constructor_checker; diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_library_call.cairo index 804a85193d..d2e65d910f 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_library_call.cairo @@ -13,8 +13,8 @@ trait ICheatBlockNumberCheckerLibCall { #[starknet::contract] mod CheatBlockNumberCheckerLibCall { - use super::{ICheatBlockNumberCheckerDispatcherTrait, ICheatBlockNumberCheckerLibraryDispatcher}; use starknet::ClassHash; + use super::{ICheatBlockNumberCheckerDispatcherTrait, ICheatBlockNumberCheckerLibraryDispatcher}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_proxy.cairo index fd2bf45c20..18f98ed62e 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_number/checker_proxy.cairo @@ -14,12 +14,11 @@ trait ICheatBlockNumberCheckerProxy { #[starknet::contract] mod CheatBlockNumberCheckerProxy { - use starknet::ContractAddress; - use super::ICheatBlockNumberCheckerDispatcherTrait; - use super::ICheatBlockNumberCheckerDispatcher; - use super::ICheatBlockNumberCheckerProxyDispatcherTrait; - use super::ICheatBlockNumberCheckerProxyDispatcher; - use starknet::{get_contract_address}; + use starknet::{ContractAddress, get_contract_address}; + use super::{ + ICheatBlockNumberCheckerDispatcher, ICheatBlockNumberCheckerDispatcherTrait, + ICheatBlockNumberCheckerProxyDispatcher, ICheatBlockNumberCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp.cairo index 9c5db3ed91..bd1655d0a4 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp.cairo @@ -1,4 +1,4 @@ mod checker; -mod constructor_checker; mod checker_library_call; mod checker_proxy; +mod constructor_checker; diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_library_call.cairo index 514fbb5c90..42ae4114ab 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_library_call.cairo @@ -13,10 +13,10 @@ trait ICheatBlockTimestampCheckerLibCall { #[starknet::contract] mod CheatBlockTimestampCheckerLibCall { + use starknet::ClassHash; use super::{ ICheatBlockTimestampCheckerDispatcherTrait, ICheatBlockTimestampCheckerLibraryDispatcher, }; - use starknet::ClassHash; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_proxy.cairo index 4fe492ba4a..fb94bcb762 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_block_timestamp/checker_proxy.cairo @@ -14,12 +14,11 @@ trait ICheatBlockTimestampCheckerProxy { #[starknet::contract] mod CheatBlockTimestampCheckerProxy { - use starknet::ContractAddress; - use super::ICheatBlockTimestampCheckerDispatcherTrait; - use super::ICheatBlockTimestampCheckerDispatcher; - use super::ICheatBlockTimestampCheckerProxyDispatcher; - use super::ICheatBlockTimestampCheckerProxyDispatcherTrait; - use starknet::get_contract_address; + use starknet::{ContractAddress, get_contract_address}; + use super::{ + ICheatBlockTimestampCheckerDispatcher, ICheatBlockTimestampCheckerDispatcherTrait, + ICheatBlockTimestampCheckerProxyDispatcher, ICheatBlockTimestampCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_caller_address.cairo b/crates/cheatnet/tests/contracts/src/cheat_caller_address.cairo index 0a368ae0db..ecc2a3af80 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_caller_address.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_caller_address.cairo @@ -1,5 +1,5 @@ mod checker; -mod constructor_checker; +mod checker_cairo0; mod checker_library_call; mod checker_proxy; -mod checker_cairo0; +mod constructor_checker; diff --git a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker.cairo b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker.cairo index 986542508c..308285dfbb 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker.cairo @@ -6,7 +6,8 @@ trait ICheatCallerAddressChecker { #[starknet::contract] mod CheatCallerAddressChecker { - use core::{option::Option, traits::Into}; + use core::option::Option; + use core::traits::Into; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_cairo0.cairo b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_cairo0.cairo index 9492120c97..9dae243648 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_cairo0.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_cairo0.cairo @@ -21,9 +21,9 @@ trait ICairo0Contract { #[starknet::contract] mod Cairo1Contract_v1 { use core::traits::Into; - use starknet::{get_contract_address, get_caller_address, ContractAddress}; - use super::ICairo0ContractDispatcherTrait; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; + use starknet::{ContractAddress, get_caller_address, get_contract_address}; + use super::ICairo0ContractDispatcherTrait; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_library_call.cairo index 69d16428b3..7f5170d603 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_library_call.cairo @@ -13,10 +13,10 @@ trait ICheatCallerAddressCheckerLibCall { #[starknet::contract] mod CheatCallerAddressCheckerLibCall { + use starknet::ClassHash; use super::{ ICheatCallerAddressCheckerDispatcherTrait, ICheatCallerAddressCheckerLibraryDispatcher, }; - use starknet::ClassHash; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_proxy.cairo index c2c88462c2..ad8b36fa59 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_caller_address/checker_proxy.cairo @@ -15,12 +15,11 @@ trait ICheatCallerAddressCheckerProxy { #[starknet::contract] mod CheatCallerAddressCheckerProxy { - use starknet::ContractAddress; - use super::ICheatCallerAddressCheckerDispatcherTrait; - use super::ICheatCallerAddressCheckerDispatcher; - use super::ICheatCallerAddressCheckerProxyDispatcherTrait; - use super::ICheatCallerAddressCheckerProxyDispatcher; - use starknet::{get_contract_address, get_caller_address}; + use starknet::{ContractAddress, get_caller_address, get_contract_address}; + use super::{ + ICheatCallerAddressCheckerDispatcher, ICheatCallerAddressCheckerDispatcherTrait, + ICheatCallerAddressCheckerProxyDispatcher, ICheatCallerAddressCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address.cairo b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address.cairo index 9c5db3ed91..bd1655d0a4 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address.cairo @@ -1,4 +1,4 @@ mod checker; -mod constructor_checker; mod checker_library_call; mod checker_proxy; +mod constructor_checker; diff --git a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_library_call.cairo index ea9571aa4e..aaa6ec59d6 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_library_call.cairo @@ -15,11 +15,11 @@ trait ICheatSequencerAddressCheckerLibCall { #[starknet::contract] mod CheatSequencerAddressCheckerLibCall { + use starknet::{ClassHash, ContractAddress}; use super::{ ICheatSequencerAddressCheckerDispatcherTrait, ICheatSequencerAddressCheckerLibraryDispatcher, }; - use starknet::{ClassHash, ContractAddress}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_proxy.cairo index c9e2a69f8a..27a14ab8e3 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_sequencer_address/checker_proxy.cairo @@ -18,12 +18,12 @@ trait ICheatSequencerAddressCheckerProxy { #[starknet::contract] mod CheatSequencerAddressCheckerProxy { - use starknet::ContractAddress; - use super::ICheatSequencerAddressCheckerDispatcherTrait; - use super::ICheatSequencerAddressCheckerDispatcher; - use super::ICheatSequencerAddressCheckerProxyDispatcherTrait; - use super::ICheatSequencerAddressCheckerProxyDispatcher; - use starknet::get_contract_address; + use starknet::{ContractAddress, get_contract_address}; + use super::{ + ICheatSequencerAddressCheckerDispatcher, ICheatSequencerAddressCheckerDispatcherTrait, + ICheatSequencerAddressCheckerProxyDispatcher, + ICheatSequencerAddressCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_tx_info.cairo b/crates/cheatnet/tests/contracts/src/cheat_tx_info.cairo index afd56737a2..7675640649 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_tx_info.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_tx_info.cairo @@ -1,4 +1,4 @@ -mod tx_info_checker; mod constructor_tx_hash_checker; -mod tx_info_checker_library_call; mod tx_hash_checker_proxy; +mod tx_info_checker; +mod tx_info_checker_library_call; diff --git a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_hash_checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_hash_checker_proxy.cairo index 4091ccce1a..dff3244c0a 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_hash_checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_hash_checker_proxy.cairo @@ -15,12 +15,11 @@ trait ITxHashCheckerProxy { #[starknet::contract] mod TxHashCheckerProxy { - use starknet::ContractAddress; - use super::ICheatTxInfoCheckerDispatcherTrait; - use super::ICheatTxInfoCheckerDispatcher; - use super::ITxHashCheckerProxyDispatcherTrait; - use super::ITxHashCheckerProxyDispatcher; - use starknet::get_contract_address; + use starknet::{ContractAddress, get_contract_address}; + use super::{ + ICheatTxInfoCheckerDispatcher, ICheatTxInfoCheckerDispatcherTrait, + ITxHashCheckerProxyDispatcher, ITxHashCheckerProxyDispatcherTrait, + }; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker.cairo b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker.cairo index a1f12f1d30..20b98e84c6 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker.cairo @@ -7,7 +7,8 @@ trait ICheatTxInfoChecker { #[starknet::contract] mod CheatTxInfoChecker { - use starknet::{SyscallResultTrait, syscalls::get_execution_info_v2_syscall}; + use starknet::SyscallResultTrait; + use starknet::syscalls::get_execution_info_v2_syscall; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker_library_call.cairo index f0a4e7d12d..c4607d9450 100644 --- a/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/cheat_tx_info/tx_info_checker_library_call.cairo @@ -13,8 +13,9 @@ trait ICheatTxInfoCheckerLibCall { #[starknet::contract] mod CheatTxInfoCheckerLibCall { + use starknet::syscalls::get_execution_info_v2_syscall; + use starknet::{ClassHash, SyscallResultTrait}; use super::{ICheatTxInfoCheckerDispatcherTrait, ICheatTxInfoCheckerLibraryDispatcher}; - use starknet::{ClassHash, SyscallResultTrait, syscalls::get_execution_info_v2_syscall}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/common.cairo b/crates/cheatnet/tests/contracts/src/common.cairo index 8d10feb79e..6d19f6a887 100644 --- a/crates/cheatnet/tests/contracts/src/common.cairo +++ b/crates/cheatnet/tests/contracts/src/common.cairo @@ -1,3 +1,3 @@ -mod hello_starknet; mod constructor_simple; mod constructor_simple2; +mod hello_starknet; diff --git a/crates/cheatnet/tests/contracts/src/events.cairo b/crates/cheatnet/tests/contracts/src/events.cairo index ca55785b27..a5baceba7b 100644 --- a/crates/cheatnet/tests/contracts/src/events.cairo +++ b/crates/cheatnet/tests/contracts/src/events.cairo @@ -1,6 +1,6 @@ -mod spy_events_checker; -mod spy_events_order_checker; -mod spy_events_lib_call; mod constructor_spy_events_checker; -mod spy_events_checker_proxy; mod spy_events_cairo0; +mod spy_events_checker; +mod spy_events_checker_proxy; +mod spy_events_lib_call; +mod spy_events_order_checker; diff --git a/crates/cheatnet/tests/contracts/src/events/spy_events_checker.cairo b/crates/cheatnet/tests/contracts/src/events/spy_events_checker.cairo index 25461bef77..94c6fc5615 100644 --- a/crates/cheatnet/tests/contracts/src/events/spy_events_checker.cairo +++ b/crates/cheatnet/tests/contracts/src/events/spy_events_checker.cairo @@ -18,8 +18,7 @@ trait ISpyEventsChecker { #[starknet::contract] mod SpyEventsChecker { - use starknet::ContractAddress; - use starknet::SyscallResultTrait; + use starknet::{ContractAddress, SyscallResultTrait}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/events/spy_events_checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/events/spy_events_checker_proxy.cairo index daa5ded921..1c0765fc21 100644 --- a/crates/cheatnet/tests/contracts/src/events/spy_events_checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/events/spy_events_checker_proxy.cairo @@ -18,9 +18,8 @@ trait ISpyEventsChecker { #[starknet::contract] mod SpyEventsCheckerProxy { use starknet::ContractAddress; - use super::ISpyEventsCheckerDispatcherTrait; - use super::ISpyEventsCheckerDispatcher; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; + use super::{ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait}; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/events/spy_events_lib_call.cairo b/crates/cheatnet/tests/contracts/src/events/spy_events_lib_call.cairo index 7a05ceaaef..8fdab90115 100644 --- a/crates/cheatnet/tests/contracts/src/events/spy_events_lib_call.cairo +++ b/crates/cheatnet/tests/contracts/src/events/spy_events_lib_call.cairo @@ -1,5 +1,4 @@ -use starknet::ContractAddress; -use starknet::ClassHash; +use starknet::{ClassHash, ContractAddress}; #[starknet::interface] trait ISpyEventsLibCall { diff --git a/crates/cheatnet/tests/contracts/src/lib.cairo b/crates/cheatnet/tests/contracts/src/lib.cairo index cb2e30f790..c5142b9cd4 100644 --- a/crates/cheatnet/tests/contracts/src/lib.cairo +++ b/crates/cheatnet/tests/contracts/src/lib.cairo @@ -1,18 +1,18 @@ +mod bytearray_string_panic_call; +mod cheat_block_hash; +mod cheat_block_number; +mod cheat_block_timestamp; +mod cheat_caller_address; +mod cheat_sequencer_address; +mod cheat_tx_info; mod common; mod events; mod get_class_hash; mod mock; -mod cheat_caller_address; +mod panic_call; mod replace_bytecode; -mod cheat_block_number; -mod cheat_tx_info; -mod cheat_sequencer_address; -mod starknet; -mod cheat_block_timestamp; +mod revert; mod segment_arena_user; -mod panic_call; +mod starknet; mod store_load; -mod bytearray_string_panic_call; -mod cheat_block_hash; -mod revert; mod tracked_resources; diff --git a/crates/cheatnet/tests/contracts/src/mock.cairo b/crates/cheatnet/tests/contracts/src/mock.cairo index ca528aadc5..5763643853 100644 --- a/crates/cheatnet/tests/contracts/src/mock.cairo +++ b/crates/cheatnet/tests/contracts/src/mock.cairo @@ -1,4 +1,4 @@ -mod mock_checker; mod constructor_mock_checker; +mod mock_checker; mod mock_checker_library_call; mod mock_checker_proxy; diff --git a/crates/cheatnet/tests/contracts/src/mock/mock_checker.cairo b/crates/cheatnet/tests/contracts/src/mock/mock_checker.cairo index 50e2e6ee2b..7356199b22 100644 --- a/crates/cheatnet/tests/contracts/src/mock/mock_checker.cairo +++ b/crates/cheatnet/tests/contracts/src/mock/mock_checker.cairo @@ -16,12 +16,9 @@ trait IMockChecker { #[starknet::contract] mod MockChecker { - use super::IMockChecker; - use super::StructThing; use core::array::ArrayTrait; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; - use super::IMockCheckerDispatcher; - use super::IMockCheckerDispatcherTrait; + use super::{IMockChecker, IMockCheckerDispatcher, IMockCheckerDispatcherTrait, StructThing}; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/mock/mock_checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/mock/mock_checker_library_call.cairo index 9975d9075c..85d5735611 100644 --- a/crates/cheatnet/tests/contracts/src/mock/mock_checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/mock/mock_checker_library_call.cairo @@ -12,8 +12,8 @@ trait IMockCheckerLibCall { #[starknet::contract] mod MockCheckerLibCall { - use super::{IMockCheckerDispatcherTrait, IMockCheckerLibraryDispatcher}; use starknet::ClassHash; + use super::{IMockCheckerDispatcherTrait, IMockCheckerLibraryDispatcher}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/mock/mock_checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/mock/mock_checker_proxy.cairo index d7a7482e41..22f1f9b4c4 100644 --- a/crates/cheatnet/tests/contracts/src/mock/mock_checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/mock/mock_checker_proxy.cairo @@ -17,8 +17,7 @@ trait IMockCheckerProxy { #[starknet::contract] mod MockCheckerProxy { use starknet::ContractAddress; - use super::IMockCheckerDispatcherTrait; - use super::IMockCheckerDispatcher; + use super::{IMockCheckerDispatcher, IMockCheckerDispatcherTrait}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/panic_call.cairo b/crates/cheatnet/tests/contracts/src/panic_call.cairo index 89d61909d4..290b0e6dc3 100644 --- a/crates/cheatnet/tests/contracts/src/panic_call.cairo +++ b/crates/cheatnet/tests/contracts/src/panic_call.cairo @@ -7,9 +7,7 @@ mod PanicCall { fn panic_call(ref self: ContractState) { panic( array![ - 'shortstring', - 0, - 0x800000000000011000000000000000000000000000000000000000000000000, + 'shortstring', 0, 0x800000000000011000000000000000000000000000000000000000000000000, 'shortstring2', ], ); diff --git a/crates/cheatnet/tests/contracts/src/starknet.cairo b/crates/cheatnet/tests/contracts/src/starknet.cairo index e76b79af25..2491357a6b 100644 --- a/crates/cheatnet/tests/contracts/src/starknet.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet.cairo @@ -1,6 +1,6 @@ -mod timestamper; -mod blocker; -mod block_info_checker_proxy; mod block_info_checker_library_call; -mod noncer; +mod block_info_checker_proxy; +mod blocker; mod forking_checker; +mod noncer; +mod timestamper; diff --git a/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_library_call.cairo b/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_library_call.cairo index 486d1365e7..73b94a351b 100644 --- a/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_library_call.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_library_call.cairo @@ -1,5 +1,4 @@ -use starknet::ClassHash; -use starknet::ContractAddress; +use starknet::{ClassHash, ContractAddress}; #[starknet::interface] trait IBlockInfoChecker { @@ -19,9 +18,8 @@ trait IBlockInfoCheckerLibCall { #[starknet::contract] mod BlockInfoCheckerLibCall { + use starknet::{ClassHash, ContractAddress}; use super::{IBlockInfoCheckerDispatcherTrait, IBlockInfoCheckerLibraryDispatcher}; - use starknet::ClassHash; - use starknet::ContractAddress; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_proxy.cairo b/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_proxy.cairo index 1d82ab1b43..0fd9d91147 100644 --- a/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_proxy.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet/block_info_checker_proxy.cairo @@ -19,8 +19,7 @@ trait IBlockInfoCheckerProxy { #[starknet::contract] mod BlockInfoCheckerProxy { use starknet::ContractAddress; - use super::IBlockInfoCheckerDispatcherTrait; - use super::IBlockInfoCheckerDispatcher; + use super::{IBlockInfoCheckerDispatcher, IBlockInfoCheckerDispatcherTrait}; #[storage] struct Storage {} diff --git a/crates/cheatnet/tests/contracts/src/starknet/blocker.cairo b/crates/cheatnet/tests/contracts/src/starknet/blocker.cairo index d5c30ad0c8..484c3f316b 100644 --- a/crates/cheatnet/tests/contracts/src/starknet/blocker.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet/blocker.cairo @@ -11,11 +11,11 @@ trait IBlocker { #[starknet::contract] mod Blocker { - use core::{array::ArrayTrait, box::BoxTrait}; - use starknet::{ - SyscallResultTrait, syscalls::get_block_hash_syscall, get_block_info, ContractAddress, - }; + use core::array::ArrayTrait; + use core::box::BoxTrait; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; + use starknet::syscalls::get_block_hash_syscall; + use starknet::{ContractAddress, SyscallResultTrait, get_block_info}; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/starknet/forking_checker.cairo b/crates/cheatnet/tests/contracts/src/starknet/forking_checker.cairo index c4c477830f..bb7ab4b9df 100644 --- a/crates/cheatnet/tests/contracts/src/starknet/forking_checker.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet/forking_checker.cairo @@ -16,12 +16,12 @@ trait IForkingChecker { #[starknet::contract] mod ForkingChecker { - use super::{ - IHelloStarknetDispatcherTrait, IHelloStarknetDispatcher, IHelloStarknetLibraryDispatcher, - }; - use starknet::{ClassHash, ContractAddress}; use core::option::OptionTrait; use starknet::storage::StoragePointerWriteAccess; + use starknet::{ClassHash, ContractAddress}; + use super::{ + IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetLibraryDispatcher, + }; #[storage] struct Storage { diff --git a/crates/cheatnet/tests/contracts/src/starknet/noncer.cairo b/crates/cheatnet/tests/contracts/src/starknet/noncer.cairo index dc899c121a..8e5e1f60d6 100644 --- a/crates/cheatnet/tests/contracts/src/starknet/noncer.cairo +++ b/crates/cheatnet/tests/contracts/src/starknet/noncer.cairo @@ -6,7 +6,8 @@ trait INoncer { #[starknet::contract] mod Noncer { - use core::{array::ArrayTrait, box::BoxTrait}; + use core::array::ArrayTrait; + use core::box::BoxTrait; use starknet::get_tx_info; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; diff --git a/crates/cheatnet/tests/contracts/src/store_load/map_simple_value_simple_key.cairo b/crates/cheatnet/tests/contracts/src/store_load/map_simple_value_simple_key.cairo index c1a98e51b5..c52e4661d8 100644 --- a/crates/cheatnet/tests/contracts/src/store_load/map_simple_value_simple_key.cairo +++ b/crates/cheatnet/tests/contracts/src/store_load/map_simple_value_simple_key.cairo @@ -1,8 +1,6 @@ #[starknet::contract] mod MapSimpleValueSimpleKey { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; #[storage] struct Storage { values: Map, diff --git a/crates/cheatnet/tests/contracts/src/tracked_resources.cairo b/crates/cheatnet/tests/contracts/src/tracked_resources.cairo index 9e4507a1b1..25b0dfcca1 100644 --- a/crates/cheatnet/tests/contracts/src/tracked_resources.cairo +++ b/crates/cheatnet/tests/contracts/src/tracked_resources.cairo @@ -5,7 +5,7 @@ const PROXY_CONTRACT_ADDRESS: felt252 = #[starknet::contract] mod TrackedResources { - use starknet::{syscalls, SyscallResultTrait, get_contract_address}; + use starknet::{SyscallResultTrait, get_contract_address, syscalls}; #[storage] struct Storage {} diff --git a/crates/data-transformer/tests/data/data_transformer/src/lib.cairo b/crates/data-transformer/tests/data/data_transformer/src/lib.cairo index fc68ee4c7d..fef1e209a9 100644 --- a/crates/data-transformer/tests/data/data_transformer/src/lib.cairo +++ b/crates/data-transformer/tests/data/data_transformer/src/lib.cairo @@ -67,8 +67,8 @@ pub trait IDataTransformer { #[starknet::contract] mod DataTransformer { - use super::*; use core::starknet::ContractAddress; + use super::*; #[storage] struct Storage { diff --git a/crates/forge/tests/data/backtrace_vm_error/src/lib.cairo b/crates/forge/tests/data/backtrace_vm_error/src/lib.cairo index fcd51052eb..a3803c9c1e 100644 --- a/crates/forge/tests/data/backtrace_vm_error/src/lib.cairo +++ b/crates/forge/tests/data/backtrace_vm_error/src/lib.cairo @@ -26,8 +26,8 @@ pub trait IInnerContract { #[starknet::contract] pub mod InnerContract { - use starknet::{SyscallResultTrait, ContractAddress}; use starknet::syscalls::call_contract_syscall; + use starknet::{ContractAddress, SyscallResultTrait}; #[storage] pub struct Storage {} diff --git a/crates/forge/tests/data/collection_with_lib/src/fab/fibfabfob.cairo b/crates/forge/tests/data/collection_with_lib/src/fab/fibfabfob.cairo index 192be925f1..6b940b3c18 100644 --- a/crates/forge/tests/data/collection_with_lib/src/fab/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_with_lib/src/fab/fibfabfob.cairo @@ -1,12 +1,12 @@ // Won't be found by the collector -use collection_with_lib::fob::fob_impl::fob_fn; use collection_with_lib::fab::fab_impl::fab_fn; use collection_with_lib::fib::fib_fn; +use collection_with_lib::fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fib_fn, fob_fb, fab_fn}; + use super::{fab_fn, fib_fn, fob_fb}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_with_lib/src/fib.cairo b/crates/forge/tests/data/collection_with_lib/src/fib.cairo index caa4bb2350..105b383f4e 100644 --- a/crates/forge/tests/data/collection_with_lib/src/fib.cairo +++ b/crates/forge/tests/data/collection_with_lib/src/fib.cairo @@ -10,7 +10,7 @@ pub fn fib_fn(a: felt252, b: felt252, n: felt252) -> felt252 { #[cfg(test)] mod tests { - use super::{fib_fn, fob_fn, fab_fn}; + use super::{fab_fn, fib_fn, fob_fn}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_with_lib/src/fob/fibfabfob.cairo b/crates/forge/tests/data/collection_with_lib/src/fob/fibfabfob.cairo index 0b1e57e603..60434b4c2c 100644 --- a/crates/forge/tests/data/collection_with_lib/src/fob/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_with_lib/src/fob/fibfabfob.cairo @@ -1,13 +1,13 @@ // Won't be found by the collector -use collection_with_lib::fob::fob_impl::fob_fn; use collection_with_lib::fab::fab_impl::fab_fn; use collection_with_lib::fib::fib_fn; +use collection_with_lib::fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fib_fn, fob_fn, fab_fn}; + use super::{fab_fn, fib_fn, fob_fn}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_with_lib/src/lib.cairo b/crates/forge/tests/data/collection_with_lib/src/lib.cairo index 3630dafc03..74df53eafc 100644 --- a/crates/forge/tests/data/collection_with_lib/src/lib.cairo +++ b/crates/forge/tests/data/collection_with_lib/src/lib.cairo @@ -1,13 +1,12 @@ +pub mod fab; pub mod fib; pub mod fob; -pub mod fab; - -use fob::fob_impl::fob_fn; use fib::fib_fn; +use fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fob_fn, fib_fn}; + use super::{fib_fn, fob_fn}; #[test] fn test_simple() { assert(1 == 1, 1); diff --git a/crates/forge/tests/data/collection_with_lib/tests/fibfabfob.cairo b/crates/forge/tests/data/collection_with_lib/tests/fibfabfob.cairo index 39749b63ee..b429e504b5 100644 --- a/crates/forge/tests/data/collection_with_lib/tests/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_with_lib/tests/fibfabfob.cairo @@ -1,6 +1,6 @@ -use collection_with_lib::fob::fob_impl::fob_fn; use collection_with_lib::fab::fab_impl::fab_fn; use collection_with_lib::fib::fib_fn; +use collection_with_lib::fob::fob_impl::fob_fn; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_with_lib/tests/lib.cairo b/crates/forge/tests/data/collection_with_lib/tests/lib.cairo index 44a5a470f2..6b6aaa5fc8 100644 --- a/crates/forge/tests/data/collection_with_lib/tests/lib.cairo +++ b/crates/forge/tests/data/collection_with_lib/tests/lib.cairo @@ -1,2 +1,2 @@ -pub mod fibfabfob; pub mod fab; +pub mod fibfabfob; diff --git a/crates/forge/tests/data/collection_without_lib/src/fab/fibfabfob.cairo b/crates/forge/tests/data/collection_without_lib/src/fab/fibfabfob.cairo index eb8f37a32c..d8aa8d327b 100644 --- a/crates/forge/tests/data/collection_without_lib/src/fab/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_without_lib/src/fab/fibfabfob.cairo @@ -1,12 +1,12 @@ // Won't be found by the collector -use collection_without_lib::fob::fob_impl::fob_fn; use collection_without_lib::fab::fab_impl::fab_fn; use collection_without_lib::fib::fib_fn; +use collection_without_lib::fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fib_fn, fob_fb, fab_fn}; + use super::{fab_fn, fib_fn, fob_fb}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_without_lib/src/fib.cairo b/crates/forge/tests/data/collection_without_lib/src/fib.cairo index 27098051aa..15fd0a8fad 100644 --- a/crates/forge/tests/data/collection_without_lib/src/fib.cairo +++ b/crates/forge/tests/data/collection_without_lib/src/fib.cairo @@ -10,7 +10,7 @@ pub fn fib_fn(a: felt252, b: felt252, n: felt252) -> felt252 { #[cfg(test)] mod tests { - use super::{fib_fn, fob_fn, fab_fn}; + use super::{fab_fn, fib_fn, fob_fn}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_without_lib/src/fob/fibfabfob.cairo b/crates/forge/tests/data/collection_without_lib/src/fob/fibfabfob.cairo index 01d3b744c1..5434e0e701 100644 --- a/crates/forge/tests/data/collection_without_lib/src/fob/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_without_lib/src/fob/fibfabfob.cairo @@ -1,13 +1,13 @@ // Won't be found by the collector -use collection_without_lib::fob::fob_impl::fob_fn; use collection_without_lib::fab::fab_impl::fab_fn; use collection_without_lib::fib::fib_fn; +use collection_without_lib::fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fib_fn, fob_fn, fab_fn}; + use super::{fab_fn, fib_fn, fob_fn}; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/collection_without_lib/src/lib.cairo b/crates/forge/tests/data/collection_without_lib/src/lib.cairo index 3630dafc03..74df53eafc 100644 --- a/crates/forge/tests/data/collection_without_lib/src/lib.cairo +++ b/crates/forge/tests/data/collection_without_lib/src/lib.cairo @@ -1,13 +1,12 @@ +pub mod fab; pub mod fib; pub mod fob; -pub mod fab; - -use fob::fob_impl::fob_fn; use fib::fib_fn; +use fob::fob_impl::fob_fn; #[cfg(test)] mod tests { - use super::{fob_fn, fib_fn}; + use super::{fib_fn, fob_fn}; #[test] fn test_simple() { assert(1 == 1, 1); diff --git a/crates/forge/tests/data/collection_without_lib/tests/fibfabfob.cairo b/crates/forge/tests/data/collection_without_lib/tests/fibfabfob.cairo index 3e7505177e..d8ee6e7c5c 100644 --- a/crates/forge/tests/data/collection_without_lib/tests/fibfabfob.cairo +++ b/crates/forge/tests/data/collection_without_lib/tests/fibfabfob.cairo @@ -1,6 +1,6 @@ -use collection_without_lib::fob::fob_impl::fob_fn; use collection_without_lib::fab::fab_impl::fab_fn; use collection_without_lib::fib::fib_fn; +use collection_without_lib::fob::fob_impl::fob_fn; #[test] fn test_fib() { diff --git a/crates/forge/tests/data/component_macros/src/example.cairo b/crates/forge/tests/data/component_macros/src/example.cairo index 859a07169f..7214308dcd 100644 --- a/crates/forge/tests/data/component_macros/src/example.cairo +++ b/crates/forge/tests/data/component_macros/src/example.cairo @@ -7,9 +7,7 @@ pub trait IMyContract { #[starknet::contract] mod MyContract { - use component_macros::oz_ac_component::AccessControlComponent; - use component_macros::oz_ac_component::SRC5Component; - + use component_macros::oz_ac_component::{AccessControlComponent, SRC5Component}; use starknet::ContractAddress; use super::MINTER_ROLE; diff --git a/crates/forge/tests/data/component_macros/src/oz_ac_component.cairo b/crates/forge/tests/data/component_macros/src/oz_ac_component.cairo index 97139c9c2f..917245ea60 100644 --- a/crates/forge/tests/data/component_macros/src/oz_ac_component.cairo +++ b/crates/forge/tests/data/component_macros/src/oz_ac_component.cairo @@ -3,9 +3,7 @@ /// The SRC5 component allows contracts to expose the interfaces they implement. #[starknet::component] pub mod SRC5Component { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; const ISRC5_ID: felt252 = 0x3f918d17e5ee77373b56385708f855659a07f75997f365cf87748628532a055; @@ -59,9 +57,8 @@ pub mod SRC5Component { #[starknet::component] pub mod AccessControlComponent { - use starknet::storage::StorageMapReadAccess; - use starknet::{storage::{StoragePointerWriteAccess, StoragePathEntry, Map}, ContractAddress}; - use starknet::get_caller_address; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; + use starknet::{ContractAddress, get_caller_address}; use super::SRC5Component; use super::SRC5Component::InternalTrait as SRC5InternalTrait; diff --git a/crates/forge/tests/data/component_macros/tests/test_contract.cairo b/crates/forge/tests/data/component_macros/tests/test_contract.cairo index 46dfef3b60..13cc81d840 100644 --- a/crates/forge/tests/data/component_macros/tests/test_contract.cairo +++ b/crates/forge/tests/data/component_macros/tests/test_contract.cairo @@ -1,15 +1,12 @@ -use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use core::result::ResultTrait; +use component_macros::example::{IMyContractDispatcher, IMyContractDispatcherTrait}; use core::option::OptionTrait; +use core::result::ResultTrait; use core::traits::TryInto; +use snforge_std::cheatcodes::contract_class::DeclareResultTrait; +use snforge_std::{ContractClassTrait, declare, start_cheat_caller_address}; use starknet::ContractAddress; -use snforge_std::{declare, ContractClassTrait, start_cheat_caller_address}; - -use component_macros::example::{IMyContractDispatcherTrait, IMyContractDispatcher}; - - #[test] fn test_mint() { let contract = declare("MyContract").unwrap().contract_class(); diff --git a/crates/forge/tests/data/contract_state/src/storage_node.cairo b/crates/forge/tests/data/contract_state/src/storage_node.cairo index 86f495eb6e..4f399dfbfd 100644 --- a/crates/forge/tests/data/contract_state/src/storage_node.cairo +++ b/crates/forge/tests/data/contract_state/src/storage_node.cairo @@ -9,7 +9,7 @@ pub trait IStorageNodeContract { #[starknet::contract] pub mod StorageNodeContract { use starknet::ContractAddress; - use starknet::storage::{StoragePointerReadAccess, StoragePathEntry, Map}; + use starknet::storage::{Map, StoragePathEntry, StoragePointerReadAccess}; #[starknet::storage_node] pub struct RandomData { diff --git a/crates/forge/tests/data/contract_state/tests/test_state.cairo b/crates/forge/tests/data/contract_state/tests/test_state.cairo index 7c944cacb8..817a53a56f 100644 --- a/crates/forge/tests/data/contract_state/tests/test_state.cairo +++ b/crates/forge/tests/data/contract_state/tests/test_state.cairo @@ -124,20 +124,15 @@ fn test_interact_with_state_map() { fn test_interact_with_state_internal_function() { let contract_address = deploy_contract("HelloStarknetExtended", array!['Name']); - let get_owner = - || -> ( - ContractAddress, felt252, - ) { - interact_with_state( - contract_address, - || -> ( - ContractAddress, felt252, - ) { - let mut state = HelloStarknetExtended::contract_state_for_testing(); - (state.owner.address.read(), state.owner.name.read()) - }, - ) - }; + let get_owner = || -> (ContractAddress, felt252) { + interact_with_state( + contract_address, + || -> (ContractAddress, felt252) { + let mut state = HelloStarknetExtended::contract_state_for_testing(); + (state.owner.address.read(), state.owner.name.read()) + }, + ) + }; let (owner_address, owner_name) = get_owner(); assert(owner_address == 0.try_into().unwrap(), 'Incorrect owner address'); assert(owner_name == 'Name', 'Incorrect owner name'); diff --git a/crates/forge/tests/data/contract_state/tests/test_storage_node.cairo b/crates/forge/tests/data/contract_state/tests/test_storage_node.cairo index 2cb78daea9..14f6e1a3aa 100644 --- a/crates/forge/tests/data/contract_state/tests/test_storage_node.cairo +++ b/crates/forge/tests/data/contract_state/tests/test_storage_node.cairo @@ -1,9 +1,9 @@ use contract_state::storage_node::{ - StorageNodeContract, IStorageNodeContractDispatcher, IStorageNodeContractDispatcherTrait, + IStorageNodeContractDispatcher, IStorageNodeContractDispatcherTrait, StorageNodeContract, }; use snforge_std::interact_with_state; +use starknet::storage::{StoragePathEntry, StoragePointerWriteAccess}; use crate::utils::deploy_contract; -use starknet::storage::{StoragePointerWriteAccess, StoragePathEntry}; #[test] fn test_storage_node() { diff --git a/crates/forge/tests/data/contract_state/tests/utils.cairo b/crates/forge/tests/data/contract_state/tests/utils.cairo index 1a4be39641..be84051310 100644 --- a/crates/forge/tests/data/contract_state/tests/utils.cairo +++ b/crates/forge/tests/data/contract_state/tests/utils.cairo @@ -1,4 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; pub fn deploy_contract(name: ByteArray, calldata: Array) -> starknet::ContractAddress { let contract = declare(name).unwrap().contract_class(); diff --git a/crates/forge/tests/data/debugging/src/lib.cairo b/crates/forge/tests/data/debugging/src/lib.cairo index 338144c893..3b199ce36d 100644 --- a/crates/forge/tests/data/debugging/src/lib.cairo +++ b/crates/forge/tests/data/debugging/src/lib.cairo @@ -20,11 +20,10 @@ trait Failing { mod SimpleContract { use core::array::ArrayTrait; use core::traits::Into; - use starknet::ContractAddress; - use starknet::get_contract_address; + use starknet::{ContractAddress, get_contract_address}; use super::{ - RecursiveCaller, RecursiveCallerDispatcher, RecursiveCallerDispatcherTrait, RecursiveCall, - Failing, + Failing, RecursiveCall, RecursiveCaller, RecursiveCallerDispatcher, + RecursiveCallerDispatcherTrait, }; @@ -45,7 +44,7 @@ mod SimpleContract { } .execute_calls(serviced_call.payload.clone()); i = i + 1; - }; + } calls } diff --git a/crates/forge/tests/data/debugging/tests/test_trace.cairo b/crates/forge/tests/data/debugging/tests/test_trace.cairo index 6dcad45a49..a86b20e85e 100644 --- a/crates/forge/tests/data/debugging/tests/test_trace.cairo +++ b/crates/forge/tests/data/debugging/tests/test_trace.cairo @@ -1,10 +1,9 @@ use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; -use snforge_std::trace::{get_call_trace}; - +use snforge_std::trace::get_call_trace; +use snforge_std::{ContractClassTrait, declare}; use trace_info::{ - RecursiveCallerDispatcher, RecursiveCallerDispatcherTrait, RecursiveCall, FailingDispatcher, - FailingDispatcherTrait, + FailingDispatcher, FailingDispatcherTrait, RecursiveCall, RecursiveCallerDispatcher, + RecursiveCallerDispatcherTrait, }; #[test] diff --git a/crates/forge/tests/data/debugging_fork/tests/test_trace.cairo b/crates/forge/tests/data/debugging_fork/tests/test_trace.cairo index 03afe0d7f8..c5d74261e6 100644 --- a/crates/forge/tests/data/debugging_fork/tests/test_trace.cairo +++ b/crates/forge/tests/data/debugging_fork/tests/test_trace.cairo @@ -1,10 +1,9 @@ use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; -use snforge_std::trace::{get_call_trace}; - +use snforge_std::trace::get_call_trace; +use snforge_std::{ContractClassTrait, declare}; use trace_info::{ - RecursiveCallerDispatcher, RecursiveCallerDispatcherTrait, RecursiveCall, FailingDispatcher, - FailingDispatcherTrait, + FailingDispatcher, FailingDispatcherTrait, RecursiveCall, RecursiveCallerDispatcher, + RecursiveCallerDispatcherTrait, }; #[test] diff --git a/crates/forge/tests/data/dispatchers/src/error_handler.cairo b/crates/forge/tests/data/dispatchers/src/error_handler.cairo index e84c13fc48..b92868f593 100644 --- a/crates/forge/tests/data/dispatchers/src/error_handler.cairo +++ b/crates/forge/tests/data/dispatchers/src/error_handler.cairo @@ -8,10 +8,10 @@ pub trait IErrorHandler { #[feature("safe_dispatcher")] #[starknet::contract] pub mod ErrorHandler { + use core::panic_with_felt252; use starknet::ContractAddress; use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; use crate::failable::{IFailableContractSafeDispatcher, IFailableContractSafeDispatcherTrait}; - use core::panic_with_felt252; #[storage] pub struct Storage { diff --git a/crates/forge/tests/data/dispatchers/tests/test.cairo b/crates/forge/tests/data/dispatchers/tests/test.cairo index eb6ff0e2e5..f6d17375ac 100644 --- a/crates/forge/tests/data/dispatchers/tests/test.cairo +++ b/crates/forge/tests/data/dispatchers/tests/test.cairo @@ -2,7 +2,7 @@ use dispatchers::error_handler::{ IErrorHandlerDispatcher, IErrorHandlerDispatcherTrait, IErrorHandlerSafeDispatcher, IErrorHandlerSafeDispatcherTrait, }; -use snforge_std::{declare, DeclareResultTrait, ContractClassTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use starknet::ContractAddress; fn deploy_contracts() -> ContractAddress { diff --git a/crates/forge/tests/data/erc20_package/src/erc20.cairo b/crates/forge/tests/data/erc20_package/src/erc20.cairo index eb3f39f616..07e6d4f9b3 100644 --- a/crates/forge/tests/data/erc20_package/src/erc20.cairo +++ b/crates/forge/tests/data/erc20_package/src/erc20.cairo @@ -22,10 +22,10 @@ pub trait IERC20 { #[starknet::contract] pub mod ERC20 { use core::num::traits::zero::Zero; - use starknet::{ - contract_address_const, get_caller_address, ContractAddress, - storage::{StoragePointerWriteAccess, StoragePointerReadAccess, StoragePathEntry, Map}, + use starknet::storage::{ + Map, StoragePathEntry, StoragePointerReadAccess, StoragePointerWriteAccess, }; + use starknet::{ContractAddress, contract_address_const, get_caller_address}; #[storage] pub struct Storage { name: felt252, diff --git a/crates/forge/tests/data/erc20_package/tests/test_complex.cairo b/crates/forge/tests/data/erc20_package/tests/test_complex.cairo index 893303236d..f0b6789d44 100644 --- a/crates/forge/tests/data/erc20_package/tests/test_complex.cairo +++ b/crates/forge/tests/data/erc20_package/tests/test_complex.cairo @@ -1,13 +1,10 @@ +use erc20_package::erc20::{IERC20Dispatcher, IERC20DispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use starknet::ContractAddress; - use snforge_std::{ - declare, ContractClassTrait, test_address, start_cheat_caller_address, - stop_cheat_caller_address, + ContractClassTrait, declare, start_cheat_caller_address, stop_cheat_caller_address, + test_address, }; - -use erc20_package::erc20::IERC20Dispatcher; -use erc20_package::erc20::IERC20DispatcherTrait; +use starknet::ContractAddress; const NAME: felt252 = 'TOKEN'; const SYMBOL: felt252 = 'TKN'; @@ -19,7 +16,7 @@ fn deploy_erc20( ) -> ContractAddress { let contract = declare("ERC20").unwrap().contract_class(); - let mut constructor_calldata: Array:: = array![name, symbol, decimals.into()]; + let mut constructor_calldata: Array = array![name, symbol, decimals.into()]; let mut initial_supply_serialized = array![]; initial_supply.serialize(ref initial_supply_serialized); diff --git a/crates/forge/tests/data/features/tests/test.cairo b/crates/forge/tests/data/features/tests/test.cairo index 9959de494e..9660d576b3 100644 --- a/crates/forge/tests/data/features/tests/test.cairo +++ b/crates/forge/tests/data/features/tests/test.cairo @@ -1,5 +1,5 @@ -use snforge_std::{declare, DeclareResultTrait, ContractClassTrait}; use features::{IContractDispatcher, IContractDispatcherTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; #[cfg(feature: 'snforge_test_only')] fn mock_in_tests() -> felt252 { diff --git a/crates/forge/tests/data/file_reading/tests/test.cairo b/crates/forge/tests/data/file_reading/tests/test.cairo index a64f86ddaa..20c4e16922 100644 --- a/crates/forge/tests/data/file_reading/tests/test.cairo +++ b/crates/forge/tests/data/file_reading/tests/test.cairo @@ -1,19 +1,12 @@ -use snforge_std::fs::{FileTrait, read_txt, read_json, FileParser}; use core::array::ArrayTrait; use core::option::OptionTrait; use core::serde::Serde; +use snforge_std::fs::{FileParser, FileTrait, read_json, read_txt}; fn compare_with_expected_content(content: Array) { let expected = array![ - 1, - 'hello', - 3, - 0x678, - ' ', - 'hello -world', - 'world', - 0, + 1, 'hello', 3, 0x678, ' ', 'hello +world', 'world', 0, 3618502788666131213697322783095070105623107215331596699973092056135872020480, ]; @@ -186,7 +179,7 @@ fn valid_content_different_folder() { while i != content.len() { assert(*content[i] == *expected[i], 'unexpected content'); i += 1; - }; + } assert(1 == 1, ''); } diff --git a/crates/forge/tests/data/fuzzing/src/lib.cairo b/crates/forge/tests/data/fuzzing/src/lib.cairo index 92c4e5c830..832c5325a1 100644 --- a/crates/forge/tests/data/fuzzing/src/lib.cairo +++ b/crates/forge/tests/data/fuzzing/src/lib.cairo @@ -16,8 +16,7 @@ pub fn fib(a: felt252, b: felt252, n: felt252) -> felt252 { #[cfg(test)] mod tests { - use super::adder; - use super::always_five; + use super::{adder, always_five}; #[test] #[fuzzer] @@ -133,7 +132,7 @@ mod tests { let mut i: u8 = 0; while i != a { i += 1; - }; + } assert(1 == 1, ''); } diff --git a/crates/forge/tests/data/fuzzing/tests/exit_first_fuzz.cairo b/crates/forge/tests/data/fuzzing/tests/exit_first_fuzz.cairo index 54d3072fa9..aeba281e36 100644 --- a/crates/forge/tests/data/fuzzing/tests/exit_first_fuzz.cairo +++ b/crates/forge/tests/data/fuzzing/tests/exit_first_fuzz.cairo @@ -1,5 +1,4 @@ -use fuzzing::adder; -use fuzzing::fib; +use fuzzing::{adder, fib}; #[test] diff --git a/crates/forge/tests/data/fuzzing/tests/exit_first_single_fail.cairo b/crates/forge/tests/data/fuzzing/tests/exit_first_single_fail.cairo index f244a16b5e..d2e520fdcb 100644 --- a/crates/forge/tests/data/fuzzing/tests/exit_first_single_fail.cairo +++ b/crates/forge/tests/data/fuzzing/tests/exit_first_single_fail.cairo @@ -1,5 +1,4 @@ -use fuzzing::adder; -use fuzzing::fib; +use fuzzing::{adder, fib}; #[test] diff --git a/crates/forge/tests/data/fuzzing/tests/multiple_attributes.cairo b/crates/forge/tests/data/fuzzing/tests/multiple_attributes.cairo index 7de218941d..a051a2cf04 100644 --- a/crates/forge/tests/data/fuzzing/tests/multiple_attributes.cairo +++ b/crates/forge/tests/data/fuzzing/tests/multiple_attributes.cairo @@ -1,5 +1,4 @@ -use fuzzing::adder; -use fuzzing::fib; +use fuzzing::{adder, fib}; #[available_gas(l2_gas: 40000000)] #[fuzzer(runs: 50, seed: 123)] diff --git a/crates/forge/tests/data/hello_workspaces/crates/fibonacci/src/lib.cairo b/crates/forge/tests/data/hello_workspaces/crates/fibonacci/src/lib.cairo index 64ced67cfd..b008e8e0eb 100644 --- a/crates/forge/tests/data/hello_workspaces/crates/fibonacci/src/lib.cairo +++ b/crates/forge/tests/data/hello_workspaces/crates/fibonacci/src/lib.cairo @@ -23,8 +23,8 @@ mod FibonacciContract { #[cfg(test)] mod tests { - use super::fib; use snforge_std::declare; + use super::fib; #[test] fn it_works() { diff --git a/crates/forge/tests/data/nonexistent_selector/tests/test_contract.cairo b/crates/forge/tests/data/nonexistent_selector/tests/test_contract.cairo index 7f3327e063..c8f2e639d7 100644 --- a/crates/forge/tests/data/nonexistent_selector/tests/test_contract.cairo +++ b/crates/forge/tests/data/nonexistent_selector/tests/test_contract.cairo @@ -1,7 +1,5 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - -use nonexistent_selector::IMyContractSafeDispatcher; -use nonexistent_selector::IMyContractSafeDispatcherTrait; +use nonexistent_selector::{IMyContractSafeDispatcher, IMyContractSafeDispatcherTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; #[test] #[feature("safe_dispatcher")] diff --git a/crates/forge/tests/data/simple_package/tests/contract.cairo b/crates/forge/tests/data/simple_package/tests/contract.cairo index 2584a26967..2dcb2d1200 100644 --- a/crates/forge/tests/data/simple_package/tests/contract.cairo +++ b/crates/forge/tests/data/simple_package/tests/contract.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use simple_package::hello_starknet::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use simple_package::hello_starknet::IHelloStarknetDispatcher; -use simple_package::hello_starknet::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn call_and_invoke() { diff --git a/crates/forge/tests/data/targets/custom_target/src/lib.cairo b/crates/forge/tests/data/targets/custom_target/src/lib.cairo index 1845c73974..fee7cdd91b 100644 --- a/crates/forge/tests/data/targets/custom_target/src/lib.cairo +++ b/crates/forge/tests/data/targets/custom_target/src/lib.cairo @@ -45,8 +45,8 @@ pub mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/custom_target/tests/tests.cairo b/crates/forge/tests/data/targets/custom_target/tests/tests.cairo index d8865f1d71..6b12e897a3 100644 --- a/crates/forge/tests/data/targets/custom_target/tests/tests.cairo +++ b/crates/forge/tests/data/targets/custom_target/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use custom_target::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use custom_target::IHelloStarknetDispatcher; -use custom_target::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/custom_target_custom_names/src/lib.cairo b/crates/forge/tests/data/targets/custom_target_custom_names/src/lib.cairo index 1845c73974..fee7cdd91b 100644 --- a/crates/forge/tests/data/targets/custom_target_custom_names/src/lib.cairo +++ b/crates/forge/tests/data/targets/custom_target_custom_names/src/lib.cairo @@ -45,8 +45,8 @@ pub mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/custom_target_custom_names/tests/tests.cairo b/crates/forge/tests/data/targets/custom_target_custom_names/tests/tests.cairo index 83c9c8d22e..27bed86be8 100644 --- a/crates/forge/tests/data/targets/custom_target_custom_names/tests/tests.cairo +++ b/crates/forge/tests/data/targets/custom_target_custom_names/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use custom_target_custom_names::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use custom_target_custom_names::IHelloStarknetDispatcher; -use custom_target_custom_names::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/custom_target_only_integration/src/lib.cairo b/crates/forge/tests/data/targets/custom_target_only_integration/src/lib.cairo index 7d154437f3..fee7cdd91b 100644 --- a/crates/forge/tests/data/targets/custom_target_only_integration/src/lib.cairo +++ b/crates/forge/tests/data/targets/custom_target_only_integration/src/lib.cairo @@ -9,7 +9,7 @@ pub trait IHelloStarknet { #[starknet::contract] pub mod HelloStarknet { use core::array::ArrayTrait; - use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess}; + use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; #[storage] struct Storage { @@ -45,8 +45,8 @@ pub mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/custom_target_only_integration/tests/tests.cairo b/crates/forge/tests/data/targets/custom_target_only_integration/tests/tests.cairo index 53ee7519ec..c4f9078be6 100644 --- a/crates/forge/tests/data/targets/custom_target_only_integration/tests/tests.cairo +++ b/crates/forge/tests/data/targets/custom_target_only_integration/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use custom_target_only_integration::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use custom_target_only_integration::IHelloStarknetDispatcher; -use custom_target_only_integration::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/only_integration/tests/tests.cairo b/crates/forge/tests/data/targets/only_integration/tests/tests.cairo index 9fa8fea73e..9e5be5e83b 100644 --- a/crates/forge/tests/data/targets/only_integration/tests/tests.cairo +++ b/crates/forge/tests/data/targets/only_integration/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use only_integration::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use only_integration::IHelloStarknetDispatcher; -use only_integration::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/only_lib_integration/tests/tests.cairo b/crates/forge/tests/data/targets/only_lib_integration/tests/tests.cairo index ae11be55e5..97fe88214e 100644 --- a/crates/forge/tests/data/targets/only_lib_integration/tests/tests.cairo +++ b/crates/forge/tests/data/targets/only_lib_integration/tests/tests.cairo @@ -1,10 +1,7 @@ use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; +use only_lib_integration::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use only_lib_integration::IHelloStarknetDispatcher; -use only_lib_integration::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/only_unit/src/lib.cairo b/crates/forge/tests/data/targets/only_unit/src/lib.cairo index ac33c6d936..7f23d54bd5 100644 --- a/crates/forge/tests/data/targets/only_unit/src/lib.cairo +++ b/crates/forge/tests/data/targets/only_unit/src/lib.cairo @@ -45,8 +45,8 @@ mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/unit_and_integration/src/lib.cairo b/crates/forge/tests/data/targets/unit_and_integration/src/lib.cairo index 1845c73974..fee7cdd91b 100644 --- a/crates/forge/tests/data/targets/unit_and_integration/src/lib.cairo +++ b/crates/forge/tests/data/targets/unit_and_integration/src/lib.cairo @@ -45,8 +45,8 @@ pub mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/unit_and_integration/tests/tests.cairo b/crates/forge/tests/data/targets/unit_and_integration/tests/tests.cairo index 699de9ce0f..c4de2de59f 100644 --- a/crates/forge/tests/data/targets/unit_and_integration/tests/tests.cairo +++ b/crates/forge/tests/data/targets/unit_and_integration/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use unit_and_integration::IHelloStarknetDispatcher; -use unit_and_integration::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; +use unit_and_integration::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/unit_and_lib_integration/src/lib.cairo b/crates/forge/tests/data/targets/unit_and_lib_integration/src/lib.cairo index 1f00f4e1e6..1727a68036 100644 --- a/crates/forge/tests/data/targets/unit_and_lib_integration/src/lib.cairo +++ b/crates/forge/tests/data/targets/unit_and_lib_integration/src/lib.cairo @@ -45,8 +45,8 @@ mod HelloStarknet { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/unit_and_lib_integration/tests/tests.cairo b/crates/forge/tests/data/targets/unit_and_lib_integration/tests/tests.cairo index 479433392a..32eedaedda 100644 --- a/crates/forge/tests/data/targets/unit_and_lib_integration/tests/tests.cairo +++ b/crates/forge/tests/data/targets/unit_and_lib_integration/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use unit_and_lib_integration::IHelloStarknetDispatcher; -use unit_and_lib_integration::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; +use unit_and_lib_integration::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/with_features/src/lib.cairo b/crates/forge/tests/data/targets/with_features/src/lib.cairo index 37751d9577..b4e0bee377 100644 --- a/crates/forge/tests/data/targets/with_features/src/lib.cairo +++ b/crates/forge/tests/data/targets/with_features/src/lib.cairo @@ -48,8 +48,8 @@ pub mod dummy { #[cfg(test)] mod tests { - use snforge_std::{declare}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; + use snforge_std::declare; #[test] fn declare_contract_from_lib() { diff --git a/crates/forge/tests/data/targets/with_features/tests/tests.cairo b/crates/forge/tests/data/targets/with_features/tests/tests.cairo index 85eaa1bfc7..57336de5d5 100644 --- a/crates/forge/tests/data/targets/with_features/tests/tests.cairo +++ b/crates/forge/tests/data/targets/with_features/tests/tests.cairo @@ -1,11 +1,8 @@ use core::array::ArrayTrait; use core::result::ResultTrait; - -use snforge_std::{declare, ContractClassTrait}; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; - -use with_features::IHelloStarknetDispatcher; -use with_features::IHelloStarknetDispatcherTrait; +use snforge_std::{ContractClassTrait, declare}; +use with_features::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait}; #[test] fn declare_and_call_contract_from_lib() { diff --git a/crates/forge/tests/data/trace/src/lib.cairo b/crates/forge/tests/data/trace/src/lib.cairo index 152a4b41b2..ae5de69957 100644 --- a/crates/forge/tests/data/trace/src/lib.cairo +++ b/crates/forge/tests/data/trace/src/lib.cairo @@ -20,8 +20,8 @@ pub trait Failing { pub mod SimpleContract { use core::array::ArrayTrait; use super::{ - RecursiveCaller, RecursiveCallerDispatcher, RecursiveCallerDispatcherTrait, RecursiveCall, - Failing, + Failing, RecursiveCall, RecursiveCaller, RecursiveCallerDispatcher, + RecursiveCallerDispatcherTrait, }; diff --git a/crates/forge/tests/data/trace/tests/test_trace.cairo b/crates/forge/tests/data/trace/tests/test_trace.cairo index 51e95d70da..09704f4581 100644 --- a/crates/forge/tests/data/trace/tests/test_trace.cairo +++ b/crates/forge/tests/data/trace/tests/test_trace.cairo @@ -1,11 +1,10 @@ -use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; -use snforge_std::trace::{get_call_trace}; use core::panic_with_felt252; - +use snforge_std::cheatcodes::contract_class::DeclareResultTrait; +use snforge_std::trace::get_call_trace; +use snforge_std::{ContractClassTrait, declare}; use trace_info::{ - RecursiveCallerDispatcher, RecursiveCallerDispatcherTrait, RecursiveCall, FailingSafeDispatcher, - FailingSafeDispatcherTrait, + FailingSafeDispatcher, FailingSafeDispatcherTrait, RecursiveCall, RecursiveCallerDispatcher, + RecursiveCallerDispatcherTrait, }; #[test] diff --git a/crates/forge/tests/data/trace_resources/src/lib.cairo b/crates/forge/tests/data/trace_resources/src/lib.cairo index 627d9173a7..7c9b4721a1 100644 --- a/crates/forge/tests/data/trace_resources/src/lib.cairo +++ b/crates/forge/tests/data/trace_resources/src/lib.cairo @@ -2,9 +2,8 @@ pub mod empty; pub mod trace_dummy; pub mod trace_info_checker; pub mod trace_info_proxy; - -use starknet::{ContractAddress, ClassHash, get_contract_address, SyscallResultTrait}; -use starknet::syscalls::{get_block_hash_syscall, emit_event_syscall, send_message_to_l1_syscall}; +use starknet::syscalls::{emit_event_syscall, get_block_hash_syscall, send_message_to_l1_syscall}; +use starknet::{ClassHash, ContractAddress, SyscallResultTrait, get_contract_address}; pub fn use_builtins_and_syscalls(empty_hash: ClassHash, salt: felt252) -> ContractAddress { 1_u8 >= 1_u8; diff --git a/crates/forge/tests/data/trace_resources/src/trace_dummy.cairo b/crates/forge/tests/data/trace_resources/src/trace_dummy.cairo index 00141f9a6f..66c8b55ca3 100644 --- a/crates/forge/tests/data/trace_resources/src/trace_dummy.cairo +++ b/crates/forge/tests/data/trace_resources/src/trace_dummy.cairo @@ -5,7 +5,7 @@ pub trait ITraceDummy { #[starknet::contract] mod TraceDummy { - use starknet::{ClassHash}; + use starknet::ClassHash; use super::super::use_builtins_and_syscalls; #[storage] diff --git a/crates/forge/tests/data/trace_resources/src/trace_info_checker.cairo b/crates/forge/tests/data/trace_resources/src/trace_info_checker.cairo index ed6903f74e..d2a91a5a65 100644 --- a/crates/forge/tests/data/trace_resources/src/trace_info_checker.cairo +++ b/crates/forge/tests/data/trace_resources/src/trace_info_checker.cairo @@ -8,12 +8,12 @@ pub trait ITraceInfoChecker { #[starknet::contract] mod TraceInfoChecker { - use super::ITraceInfoChecker; + use core::panic_with_felt252; + use starknet::{ClassHash, ContractAddress}; use trace_resources::trace_info_proxy::{ ITraceInfoProxyDispatcher, ITraceInfoProxyDispatcherTrait, }; - use starknet::{ContractAddress, ClassHash}; - use core::panic_with_felt252; + use super::ITraceInfoChecker; use super::super::use_builtins_and_syscalls; #[storage] diff --git a/crates/forge/tests/data/trace_resources/src/trace_info_proxy.cairo b/crates/forge/tests/data/trace_resources/src/trace_info_proxy.cairo index 7254aecd6f..ef7549da3d 100644 --- a/crates/forge/tests/data/trace_resources/src/trace_info_proxy.cairo +++ b/crates/forge/tests/data/trace_resources/src/trace_info_proxy.cairo @@ -1,4 +1,4 @@ -use starknet::{ContractAddress, ClassHash}; +use starknet::{ClassHash, ContractAddress}; #[starknet::interface] pub trait ITraceInfoProxy { @@ -22,13 +22,13 @@ pub trait ITraceInfoProxy { #[starknet::contract] mod TraceInfoProxy { - use super::ITraceInfoProxy; + use starknet::{ClassHash, ContractAddress}; + use trace_resources::trace_dummy::{ITraceDummyDispatcher, ITraceDummyDispatcherTrait}; use trace_resources::trace_info_checker::{ - ITraceInfoCheckerDispatcherTrait, ITraceInfoCheckerDispatcher, + ITraceInfoCheckerDispatcher, ITraceInfoCheckerDispatcherTrait, ITraceInfoCheckerLibraryDispatcher, }; - use trace_resources::trace_dummy::{ITraceDummyDispatcher, ITraceDummyDispatcherTrait}; - use starknet::{ContractAddress, ClassHash}; + use super::ITraceInfoProxy; use super::super::use_builtins_and_syscalls; #[storage] diff --git a/crates/forge/tests/data/trace_resources/tests/lib.cairo b/crates/forge/tests/data/trace_resources/tests/lib.cairo index d65df59642..6c56c4345e 100644 --- a/crates/forge/tests/data/trace_resources/tests/lib.cairo +++ b/crates/forge/tests/data/trace_resources/tests/lib.cairo @@ -1,6 +1,6 @@ mod test_call; mod test_deploy; -mod test_l1_handler; -mod test_lib_call; mod test_failed_call; mod test_failed_lib_call; +mod test_l1_handler; +mod test_lib_call; diff --git a/crates/forge/tests/data/trace_resources/tests/test_call.cairo b/crates/forge/tests/data/trace_resources/tests/test_call.cairo index 1afd966e88..eeb86ff7c6 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_call.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_call.cairo @@ -1,10 +1,9 @@ use core::clone::Clone; -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - -use trace_resources::{ - trace_info_checker::{ITraceInfoCheckerDispatcherTrait, ITraceInfoCheckerDispatcher}, - trace_info_proxy::{ITraceInfoProxyDispatcherTrait, ITraceInfoProxyDispatcher}, +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; +use trace_resources::trace_info_checker::{ + ITraceInfoCheckerDispatcher, ITraceInfoCheckerDispatcherTrait, }; +use trace_resources::trace_info_proxy::{ITraceInfoProxyDispatcher, ITraceInfoProxyDispatcherTrait}; #[test] fn test_call() { diff --git a/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo b/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo index 41f3a9c6e1..575436551e 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo @@ -1,7 +1,7 @@ use core::clone::Clone; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; -use starknet::{SyscallResultTrait}; +use snforge_std::{ContractClassTrait, declare}; +use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; #[test] diff --git a/crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo b/crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo index bde265d865..d95bc123e7 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_failed_call.cairo @@ -1,11 +1,12 @@ use core::clone::Clone; use core::panic_with_felt252; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; - -use trace_resources::{ - trace_info_checker::{ITraceInfoCheckerSafeDispatcherTrait, ITraceInfoCheckerSafeDispatcher}, - trace_info_proxy::{ITraceInfoProxySafeDispatcherTrait, ITraceInfoProxySafeDispatcher}, +use snforge_std::{ContractClassTrait, declare}; +use trace_resources::trace_info_checker::{ + ITraceInfoCheckerSafeDispatcher, ITraceInfoCheckerSafeDispatcherTrait, +}; +use trace_resources::trace_info_proxy::{ + ITraceInfoProxySafeDispatcher, ITraceInfoProxySafeDispatcherTrait, }; #[test] diff --git a/crates/forge/tests/data/trace_resources/tests/test_failed_lib_call.cairo b/crates/forge/tests/data/trace_resources/tests/test_failed_lib_call.cairo index 154dfde569..227731f0f0 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_failed_lib_call.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_failed_lib_call.cairo @@ -1,13 +1,12 @@ use core::clone::Clone; use core::panic_with_felt252; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; - -use trace_resources::{ - trace_info_checker::{ - ITraceInfoCheckerSafeLibraryDispatcher, ITraceInfoCheckerSafeDispatcherTrait, - }, - trace_info_proxy::{ITraceInfoProxySafeLibraryDispatcher, ITraceInfoProxySafeDispatcherTrait}, +use snforge_std::{ContractClassTrait, declare}; +use trace_resources::trace_info_checker::{ + ITraceInfoCheckerSafeDispatcherTrait, ITraceInfoCheckerSafeLibraryDispatcher, +}; +use trace_resources::trace_info_proxy::{ + ITraceInfoProxySafeDispatcherTrait, ITraceInfoProxySafeLibraryDispatcher, }; #[test] diff --git a/crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo b/crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo index 7f7b79e919..71b72bff54 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_l1_handler.cairo @@ -1,6 +1,6 @@ use core::clone::Clone; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait, L1HandlerTrait}; +use snforge_std::{ContractClassTrait, L1HandlerTrait, declare}; #[test] fn test_l1_handler() { diff --git a/crates/forge/tests/data/trace_resources/tests/test_lib_call.cairo b/crates/forge/tests/data/trace_resources/tests/test_lib_call.cairo index 6f509b1f90..23a9de176c 100644 --- a/crates/forge/tests/data/trace_resources/tests/test_lib_call.cairo +++ b/crates/forge/tests/data/trace_resources/tests/test_lib_call.cairo @@ -1,10 +1,11 @@ use core::clone::Clone; use snforge_std::cheatcodes::contract_class::DeclareResultTrait; -use snforge_std::{declare, ContractClassTrait}; - -use trace_resources::{ - trace_info_checker::{ITraceInfoCheckerLibraryDispatcher, ITraceInfoCheckerDispatcherTrait}, - trace_info_proxy::{ITraceInfoProxyLibraryDispatcher, ITraceInfoProxyDispatcherTrait}, +use snforge_std::{ContractClassTrait, declare}; +use trace_resources::trace_info_checker::{ + ITraceInfoCheckerDispatcherTrait, ITraceInfoCheckerLibraryDispatcher, +}; +use trace_resources::trace_info_proxy::{ + ITraceInfoProxyDispatcherTrait, ITraceInfoProxyLibraryDispatcher, }; #[test] diff --git a/crates/forge/tests/data/virtual_workspace/dummy_name/fibonacci2/src/lib.cairo b/crates/forge/tests/data/virtual_workspace/dummy_name/fibonacci2/src/lib.cairo index d380ed20d4..9aef0ae4b9 100644 --- a/crates/forge/tests/data/virtual_workspace/dummy_name/fibonacci2/src/lib.cairo +++ b/crates/forge/tests/data/virtual_workspace/dummy_name/fibonacci2/src/lib.cairo @@ -30,8 +30,8 @@ mod FibonacciContract { #[cfg(test)] mod tests { - use super::fib; use snforge_std::declare; + use super::fib; #[test] fn it_works() { diff --git a/crates/sncast/tests/data/contracts/map/src/lib.cairo b/crates/sncast/tests/data/contracts/map/src/lib.cairo index 55e0bd5107..354afe86a7 100644 --- a/crates/sncast/tests/data/contracts/map/src/lib.cairo +++ b/crates/sncast/tests/data/contracts/map/src/lib.cairo @@ -7,9 +7,7 @@ trait IMap { #[starknet::contract] mod Map { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; #[storage] struct Storage { storage: Map, diff --git a/crates/sncast/tests/data/scripts/call/src/invalid_address.cairo b/crates/sncast/tests/data/scripts/call/src/invalid_address.cairo index e8c84f4471..9e2ba34e88 100644 --- a/crates/sncast/tests/data/scripts/call/src/invalid_address.cairo +++ b/crates/sncast/tests/data/scripts/call/src/invalid_address.cairo @@ -1,4 +1,4 @@ -use sncast_std::{call, ScriptCommandError, ProviderError, StarknetError}; +use sncast_std::{ProviderError, ScriptCommandError, StarknetError, call}; fn main() { let eth = 0x049; diff --git a/crates/sncast/tests/data/scripts/call/src/invalid_calldata.cairo b/crates/sncast/tests/data/scripts/call/src/invalid_calldata.cairo index 69cb3d01bb..f695bce0c7 100644 --- a/crates/sncast/tests/data/scripts/call/src/invalid_calldata.cairo +++ b/crates/sncast/tests/data/scripts/call/src/invalid_calldata.cairo @@ -1,4 +1,4 @@ -use sncast_std::{call, ScriptCommandError}; +use sncast_std::{ScriptCommandError, call}; fn main() { let eth = 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7; diff --git a/crates/sncast/tests/data/scripts/call/src/invalid_entry_point.cairo b/crates/sncast/tests/data/scripts/call/src/invalid_entry_point.cairo index 0af2ab1ea6..b2d09160a1 100644 --- a/crates/sncast/tests/data/scripts/call/src/invalid_entry_point.cairo +++ b/crates/sncast/tests/data/scripts/call/src/invalid_entry_point.cairo @@ -1,4 +1,4 @@ -use sncast_std::{call, ScriptCommandError}; +use sncast_std::{ScriptCommandError, call}; fn main() { let eth = 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7; diff --git a/crates/sncast/tests/data/scripts/call/src/lib.cairo b/crates/sncast/tests/data/scripts/call/src/lib.cairo index 7ff0e2bcd3..3d16a15a22 100644 --- a/crates/sncast/tests/data/scripts/call/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/call/src/lib.cairo @@ -1,3 +1,3 @@ -mod invalid_entry_point; mod invalid_address; mod invalid_calldata; +mod invalid_entry_point; diff --git a/crates/sncast/tests/data/scripts/declare/src/fee_settings.cairo b/crates/sncast/tests/data/scripts/declare/src/fee_settings.cairo index b7cab109fa..62b24a8f31 100644 --- a/crates/sncast/tests/data/scripts/declare/src/fee_settings.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/fee_settings.cairo @@ -1,4 +1,4 @@ -use sncast_std::{get_nonce, declare, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, declare, get_nonce}; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/declare/src/insufficient_account_balance.cairo b/crates/sncast/tests/data/scripts/declare/src/insufficient_account_balance.cairo index fe7dce92e4..6aa60afba9 100644 --- a/crates/sncast/tests/data/scripts/declare/src/insufficient_account_balance.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/insufficient_account_balance.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - get_nonce, declare, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, ProviderError, ScriptCommandError, StarknetError, declare, get_nonce, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/declare/src/lib.cairo b/crates/sncast/tests/data/scripts/declare/src/lib.cairo index 863e2088b1..34edf0d924 100644 --- a/crates/sncast/tests/data/scripts/declare/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/lib.cairo @@ -1,8 +1,8 @@ +mod fee_settings; +mod insufficient_account_balance; mod no_contract; mod same_contract_twice; +mod time_out; mod with_invalid_max_fee; mod with_invalid_nonce; -mod insufficient_account_balance; -mod time_out; -mod fee_settings; diff --git a/crates/sncast/tests/data/scripts/declare/src/no_contract.cairo b/crates/sncast/tests/data/scripts/declare/src/no_contract.cairo index 8042e6f438..fbc7e0f641 100644 --- a/crates/sncast/tests/data/scripts/declare/src/no_contract.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/no_contract.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, declare}; fn main() { let fee_settings = FeeSettingsTrait::estimate(); diff --git a/crates/sncast/tests/data/scripts/declare/src/same_contract_twice.cairo b/crates/sncast/tests/data/scripts/declare/src/same_contract_twice.cairo index 442de810a7..d369fecfcb 100644 --- a/crates/sncast/tests/data/scripts/declare/src/same_contract_twice.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/same_contract_twice.cairo @@ -1,4 +1,4 @@ -use sncast_std::{get_nonce, declare, DeclareResult, DeclareResultTrait, FeeSettingsTrait}; +use sncast_std::{DeclareResult, DeclareResultTrait, FeeSettingsTrait, declare, get_nonce}; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/declare/src/time_out.cairo b/crates/sncast/tests/data/scripts/declare/src/time_out.cairo index a85e53435a..2fabf20e48 100644 --- a/crates/sncast/tests/data/scripts/declare/src/time_out.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/time_out.cairo @@ -1,4 +1,4 @@ -use sncast_std::{get_nonce, declare, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, declare, get_nonce}; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/declare/src/with_invalid_max_fee.cairo b/crates/sncast/tests/data/scripts/declare/src/with_invalid_max_fee.cairo index e6635a13ca..7afcaef930 100644 --- a/crates/sncast/tests/data/scripts/declare/src/with_invalid_max_fee.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/with_invalid_max_fee.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - get_nonce, declare, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, ProviderError, ScriptCommandError, StarknetError, declare, get_nonce, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/declare/src/with_invalid_nonce.cairo b/crates/sncast/tests/data/scripts/declare/src/with_invalid_nonce.cairo index 038785b3b1..86c9c1c127 100644 --- a/crates/sncast/tests/data/scripts/declare/src/with_invalid_nonce.cairo +++ b/crates/sncast/tests/data/scripts/declare/src/with_invalid_nonce.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - get_nonce, declare, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, ProviderError, ScriptCommandError, StarknetError, declare, get_nonce, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/deploy/src/fee_settings.cairo b/crates/sncast/tests/data/scripts/deploy/src/fee_settings.cairo index 1812445e99..b7412fa273 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/fee_settings.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/fee_settings.cairo @@ -1,5 +1,5 @@ -use sncast_std::{deploy, FeeSettingsTrait}; -use starknet::{ClassHash}; +use sncast_std::{FeeSettingsTrait, deploy}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/deploy/src/invalid_calldata.cairo b/crates/sncast/tests/data/scripts/deploy/src/invalid_calldata.cairo index b7493fc31b..6a7723508d 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/invalid_calldata.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/invalid_calldata.cairo @@ -1,5 +1,5 @@ -use sncast_std::{get_nonce, deploy, FeeSettingsTrait}; -use starknet::{ClassHash}; +use sncast_std::{FeeSettingsTrait, deploy, get_nonce}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/deploy/src/invalid_class_hash.cairo b/crates/sncast/tests/data/scripts/deploy/src/invalid_class_hash.cairo index a44c7f2320..9159f2ad4a 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/invalid_class_hash.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/invalid_class_hash.cairo @@ -1,5 +1,5 @@ -use sncast_std::{get_nonce, deploy, FeeSettingsTrait}; -use starknet::{ClassHash}; +use sncast_std::{FeeSettingsTrait, deploy, get_nonce}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/deploy/src/invalid_nonce.cairo b/crates/sncast/tests/data/scripts/deploy/src/invalid_nonce.cairo index 4eec7b6397..dee038988a 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/invalid_nonce.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/invalid_nonce.cairo @@ -1,8 +1,7 @@ use sncast_std::{ - get_nonce, deploy, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, ProviderError, ScriptCommandError, StarknetError, deploy, get_nonce, }; - -use starknet::{ClassHash}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/deploy/src/lib.cairo b/crates/sncast/tests/data/scripts/deploy/src/lib.cairo index 35cc3c7d44..6ae8bbf0a2 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/lib.cairo @@ -1,6 +1,6 @@ -mod with_calldata; -mod same_class_hash_and_salt; -mod invalid_class_hash; +mod fee_settings; mod invalid_calldata; +mod invalid_class_hash; mod invalid_nonce; -mod fee_settings; +mod same_class_hash_and_salt; +mod with_calldata; diff --git a/crates/sncast/tests/data/scripts/deploy/src/same_class_hash_and_salt.cairo b/crates/sncast/tests/data/scripts/deploy/src/same_class_hash_and_salt.cairo index 71f2153111..55e7f0fad1 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/same_class_hash_and_salt.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/same_class_hash_and_salt.cairo @@ -1,5 +1,5 @@ -use sncast_std::{get_nonce, deploy, FeeSettingsTrait}; -use starknet::{ClassHash}; +use sncast_std::{FeeSettingsTrait, deploy, get_nonce}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/deploy/src/with_calldata.cairo b/crates/sncast/tests/data/scripts/deploy/src/with_calldata.cairo index 76771532dc..7fa2fc291c 100644 --- a/crates/sncast/tests/data/scripts/deploy/src/with_calldata.cairo +++ b/crates/sncast/tests/data/scripts/deploy/src/with_calldata.cairo @@ -1,5 +1,5 @@ -use sncast_std::{deploy, FeeSettingsTrait}; -use starknet::{ClassHash}; +use sncast_std::{FeeSettingsTrait, deploy}; +use starknet::ClassHash; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/invoke/src/contract_does_not_exist.cairo b/crates/sncast/tests/data/scripts/invoke/src/contract_does_not_exist.cairo index f19420e2b7..274ff52ff3 100644 --- a/crates/sncast/tests/data/scripts/invoke/src/contract_does_not_exist.cairo +++ b/crates/sncast/tests/data/scripts/invoke/src/contract_does_not_exist.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - invoke, InvokeResult, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, InvokeResult, ProviderError, ScriptCommandError, StarknetError, invoke, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/invoke/src/max_fee_too_low.cairo b/crates/sncast/tests/data/scripts/invoke/src/max_fee_too_low.cairo index 1bbd61ca69..a9025992c8 100644 --- a/crates/sncast/tests/data/scripts/invoke/src/max_fee_too_low.cairo +++ b/crates/sncast/tests/data/scripts/invoke/src/max_fee_too_low.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - invoke, InvokeResult, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, InvokeResult, ProviderError, ScriptCommandError, StarknetError, invoke, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/invoke/src/wrong_calldata.cairo b/crates/sncast/tests/data/scripts/invoke/src/wrong_calldata.cairo index 7101675b9f..5d89726f6a 100644 --- a/crates/sncast/tests/data/scripts/invoke/src/wrong_calldata.cairo +++ b/crates/sncast/tests/data/scripts/invoke/src/wrong_calldata.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - invoke, InvokeResult, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, InvokeResult, ProviderError, ScriptCommandError, StarknetError, invoke, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/invoke/src/wrong_function_name.cairo b/crates/sncast/tests/data/scripts/invoke/src/wrong_function_name.cairo index aac6ce7c16..e233f06f20 100644 --- a/crates/sncast/tests/data/scripts/invoke/src/wrong_function_name.cairo +++ b/crates/sncast/tests/data/scripts/invoke/src/wrong_function_name.cairo @@ -1,5 +1,5 @@ use sncast_std::{ - invoke, InvokeResult, ScriptCommandError, ProviderError, StarknetError, FeeSettingsTrait, + FeeSettingsTrait, InvokeResult, ProviderError, ScriptCommandError, StarknetError, invoke, }; fn main() { diff --git a/crates/sncast/tests/data/scripts/map_script/contracts/src/lib.cairo b/crates/sncast/tests/data/scripts/map_script/contracts/src/lib.cairo index 0e69349a75..6ae59c95ad 100644 --- a/crates/sncast/tests/data/scripts/map_script/contracts/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/map_script/contracts/src/lib.cairo @@ -8,9 +8,7 @@ trait IMap { #[starknet::contract] mod Mapa { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; #[storage] struct Storage { @@ -35,9 +33,7 @@ mod Mapa { #[starknet::contract] mod Mapa2 { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; #[storage] struct Storage { diff --git a/crates/sncast/tests/data/scripts/map_script/scripts/src/display_debug_traits_for_subcommand_responses.cairo b/crates/sncast/tests/data/scripts/map_script/scripts/src/display_debug_traits_for_subcommand_responses.cairo index 9ab90b1663..c38ad6af5e 100644 --- a/crates/sncast/tests/data/scripts/map_script/scripts/src/display_debug_traits_for_subcommand_responses.cairo +++ b/crates/sncast/tests/data/scripts/map_script/scripts/src/display_debug_traits_for_subcommand_responses.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, deploy, invoke, call, DeclareResultTrait, get_nonce, FeeSettingsTrait}; +use sncast_std::{DeclareResultTrait, FeeSettingsTrait, call, declare, deploy, get_nonce, invoke}; fn main() { println!("test"); diff --git a/crates/sncast/tests/data/scripts/map_script/scripts/src/lib.cairo b/crates/sncast/tests/data/scripts/map_script/scripts/src/lib.cairo index 9551910cec..909f34f68f 100644 --- a/crates/sncast/tests/data/scripts/map_script/scripts/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/map_script/scripts/src/lib.cairo @@ -1,2 +1,2 @@ -mod map_script; mod display_debug_traits_for_subcommand_responses; +mod map_script; diff --git a/crates/sncast/tests/data/scripts/map_script/scripts/src/map_script.cairo b/crates/sncast/tests/data/scripts/map_script/scripts/src/map_script.cairo index cef75baa0a..c826c289c8 100644 --- a/crates/sncast/tests/data/scripts/map_script/scripts/src/map_script.cairo +++ b/crates/sncast/tests/data/scripts/map_script/scripts/src/map_script.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, deploy, invoke, call, DeclareResultTrait, get_nonce, FeeSettingsTrait}; +use sncast_std::{DeclareResultTrait, FeeSettingsTrait, call, declare, deploy, get_nonce, invoke}; fn second_contract() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/misc/src/lib.cairo b/crates/sncast/tests/data/scripts/misc/src/lib.cairo index e7386b453a..be82733a58 100644 --- a/crates/sncast/tests/data/scripts/misc/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/misc/src/lib.cairo @@ -1,3 +1,3 @@ -mod call_happy; mod call_fail; +mod call_happy; mod using_starknet_syscall; diff --git a/crates/sncast/tests/data/scripts/misc/src/using_starknet_syscall.cairo b/crates/sncast/tests/data/scripts/misc/src/using_starknet_syscall.cairo index 8243c3fd0e..d015c622b3 100644 --- a/crates/sncast/tests/data/scripts/misc/src/using_starknet_syscall.cairo +++ b/crates/sncast/tests/data/scripts/misc/src/using_starknet_syscall.cairo @@ -1,5 +1,5 @@ -use starknet::get_execution_info; use core::box::BoxTrait; +use starknet::get_execution_info; fn main() { let exec_info = get_execution_info().unbox(); diff --git a/crates/sncast/tests/data/scripts/state_file/src/all_tx_fail.cairo b/crates/sncast/tests/data/scripts/state_file/src/all_tx_fail.cairo index 5702549577..9de1010584 100644 --- a/crates/sncast/tests/data/scripts/state_file/src/all_tx_fail.cairo +++ b/crates/sncast/tests/data/scripts/state_file/src/all_tx_fail.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, deploy, invoke, get_nonce, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, declare, deploy, get_nonce, invoke}; use starknet::{ClassHash, ContractAddress}; fn main() { diff --git a/crates/sncast/tests/data/scripts/state_file/src/rerun_failed_tx.cairo b/crates/sncast/tests/data/scripts/state_file/src/rerun_failed_tx.cairo index 84f30fefc2..468b7bfc1e 100644 --- a/crates/sncast/tests/data/scripts/state_file/src/rerun_failed_tx.cairo +++ b/crates/sncast/tests/data/scripts/state_file/src/rerun_failed_tx.cairo @@ -1,4 +1,4 @@ -use sncast_std::{invoke, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, invoke}; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/state_script/contracts/src/lib.cairo b/crates/sncast/tests/data/scripts/state_script/contracts/src/lib.cairo index 6b2727de3e..b0664405b0 100644 --- a/crates/sncast/tests/data/scripts/state_script/contracts/src/lib.cairo +++ b/crates/sncast/tests/data/scripts/state_script/contracts/src/lib.cairo @@ -8,9 +8,7 @@ trait IState { #[starknet::contract] mod State { - use starknet::{ - storage::{StoragePointerWriteAccess, StorageMapReadAccess, StoragePathEntry, Map}, - }; + use starknet::storage::{Map, StorageMapReadAccess, StoragePathEntry, StoragePointerWriteAccess}; #[storage] struct Storage { diff --git a/crates/sncast/tests/data/scripts/state_script/scripts/src/state_script.cairo b/crates/sncast/tests/data/scripts/state_script/scripts/src/state_script.cairo index c517609472..a96d959b54 100644 --- a/crates/sncast/tests/data/scripts/state_script/scripts/src/state_script.cairo +++ b/crates/sncast/tests/data/scripts/state_script/scripts/src/state_script.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, deploy, invoke, call, DeclareResultTrait, get_nonce, FeeSettingsTrait}; +use sncast_std::{DeclareResultTrait, FeeSettingsTrait, call, declare, deploy, get_nonce, invoke}; fn main() { let fee_settings = FeeSettingsTrait::resource_bounds( diff --git a/crates/sncast/tests/data/scripts/tx_status/src/incorrect_transaction_hash.cairo b/crates/sncast/tests/data/scripts/tx_status/src/incorrect_transaction_hash.cairo index 58dd432b3e..a8e27be2d3 100644 --- a/crates/sncast/tests/data/scripts/tx_status/src/incorrect_transaction_hash.cairo +++ b/crates/sncast/tests/data/scripts/tx_status/src/incorrect_transaction_hash.cairo @@ -1,4 +1,4 @@ -use sncast_std::{tx_status, ScriptCommandError, ProviderError, StarknetError}; +use sncast_std::{ProviderError, ScriptCommandError, StarknetError, tx_status}; fn main() { let incorrect_tx_hash = 0x1; diff --git a/crates/sncast/tests/data/scripts/tx_status/src/status_reverted.cairo b/crates/sncast/tests/data/scripts/tx_status/src/status_reverted.cairo index b77d4560d6..8c5832cb9a 100644 --- a/crates/sncast/tests/data/scripts/tx_status/src/status_reverted.cairo +++ b/crates/sncast/tests/data/scripts/tx_status/src/status_reverted.cairo @@ -1,4 +1,4 @@ -use sncast_std::{tx_status, TxStatusResult, ExecutionStatus, FinalityStatus}; +use sncast_std::{ExecutionStatus, FinalityStatus, TxStatusResult, tx_status}; fn main() { let reverted_tx_hash = 0x00ae35dacba17cde62b8ceb12e3b18f4ab6e103fa2d5e3d9821cb9dc59d59a3c; diff --git a/crates/sncast/tests/data/scripts/tx_status/src/status_succeeded.cairo b/crates/sncast/tests/data/scripts/tx_status/src/status_succeeded.cairo index 9256ad0b1d..5b711b0153 100644 --- a/crates/sncast/tests/data/scripts/tx_status/src/status_succeeded.cairo +++ b/crates/sncast/tests/data/scripts/tx_status/src/status_succeeded.cairo @@ -1,4 +1,4 @@ -use sncast_std::{tx_status, TxStatusResult, ExecutionStatus, FinalityStatus}; +use sncast_std::{ExecutionStatus, FinalityStatus, TxStatusResult, tx_status}; fn main() { let succeeded_tx_hash = 0x07d2067cd7675f88493a9d773b456c8d941457ecc2f6201d2fe6b0607daadfd1; diff --git a/docs/listings/conditional_compilation/tests/test.cairo b/docs/listings/conditional_compilation/tests/test.cairo index e8f255bc4b..e4acfdee75 100644 --- a/docs/listings/conditional_compilation/tests/test.cairo +++ b/docs/listings/conditional_compilation/tests/test.cairo @@ -1,6 +1,5 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - use conditional_compilation::contract::{IMockContractDispatcher, IMockContractDispatcherTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; #[test] fn test_mock_contract() { diff --git a/docs/listings/declare/src/lib.cairo b/docs/listings/declare/src/lib.cairo index fa307755a2..b8a26a9475 100644 --- a/docs/listings/declare/src/lib.cairo +++ b/docs/listings/declare/src/lib.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, FeeSettingsTrait}; +use sncast_std::{FeeSettingsTrait, declare}; fn main() { let fee_settings = FeeSettingsTrait::max_fee(9999999); diff --git a/docs/listings/deploy/src/lib.cairo b/docs/listings/deploy/src/lib.cairo index 524b48fe88..7ead3aef6b 100644 --- a/docs/listings/deploy/src/lib.cairo +++ b/docs/listings/deploy/src/lib.cairo @@ -1,5 +1,5 @@ +use sncast_std::{FeeSettingsTrait, deploy}; use starknet::ClassHash; -use sncast_std::{deploy, FeeSettingsTrait}; fn main() { let fee_settings = FeeSettingsTrait::max_fee(9999999); diff --git a/docs/listings/direct_storage_access/src/felts_only.cairo b/docs/listings/direct_storage_access/src/felts_only.cairo index ed3cf7ba78..d7010f40d0 100644 --- a/docs/listings/direct_storage_access/src/felts_only.cairo +++ b/docs/listings/direct_storage_access/src/felts_only.cairo @@ -5,8 +5,9 @@ pub trait ISimpleStorageContract { #[starknet::contract] pub mod SimpleStorageContract { - use starknet::storage::Map; - use starknet::storage::{StoragePointerWriteAccess, StorageMapReadAccess, StorageMapWriteAccess}; + use starknet::storage::{ + Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerWriteAccess, + }; #[storage] struct Storage { diff --git a/docs/listings/direct_storage_access/src/lib.cairo b/docs/listings/direct_storage_access/src/lib.cairo index 786e8f5920..21e47c6be5 100644 --- a/docs/listings/direct_storage_access/src/lib.cairo +++ b/docs/listings/direct_storage_access/src/lib.cairo @@ -1,3 +1,3 @@ -pub mod felts_only; pub mod complex_structures; +pub mod felts_only; pub mod using_enums; diff --git a/docs/listings/direct_storage_access/src/using_enums.cairo b/docs/listings/direct_storage_access/src/using_enums.cairo index 3c946d42c2..d62507b8ba 100644 --- a/docs/listings/direct_storage_access/src/using_enums.cairo +++ b/docs/listings/direct_storage_access/src/using_enums.cairo @@ -5,7 +5,7 @@ pub trait IEnumsStorageContract { #[starknet::contract] pub mod EnumsStorageContract { - use starknet::storage::{StoragePointerReadAccess, StoragePathEntry, Map}; + use starknet::storage::{Map, StoragePathEntry, StoragePointerReadAccess}; #[storage] struct Storage { diff --git a/docs/listings/direct_storage_access/tests/complex_structures.cairo b/docs/listings/direct_storage_access/tests/complex_structures.cairo index 28a03dbe09..6aba4cedc7 100644 --- a/docs/listings/direct_storage_access/tests/complex_structures.cairo +++ b/docs/listings/direct_storage_access/tests/complex_structures.cairo @@ -1,6 +1,5 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, store, load, map_entry_address}; - use direct_storage_access::complex_structures::{MapKey, MapValue}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, load, map_entry_address, store}; #[test] fn store_in_complex_mapping() { diff --git a/docs/listings/direct_storage_access/tests/felts_only/field.cairo b/docs/listings/direct_storage_access/tests/felts_only/field.cairo index 85e2579d9b..9be8ecab2b 100644 --- a/docs/listings/direct_storage_access/tests/felts_only/field.cairo +++ b/docs/listings/direct_storage_access/tests/felts_only/field.cairo @@ -1,4 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, store, load, map_entry_address}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, load, map_entry_address, store}; #[test] fn test_store_and_load_plain_felt() { diff --git a/docs/listings/direct_storage_access/tests/felts_only/map_entry.cairo b/docs/listings/direct_storage_access/tests/felts_only/map_entry.cairo index 3c870af47b..51ee7c168a 100644 --- a/docs/listings/direct_storage_access/tests/felts_only/map_entry.cairo +++ b/docs/listings/direct_storage_access/tests/felts_only/map_entry.cairo @@ -1,4 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, store, load, map_entry_address}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, load, map_entry_address, store}; #[test] fn test_store_and_load_map_entries() { diff --git a/docs/listings/direct_storage_access/tests/lib.cairo b/docs/listings/direct_storage_access/tests/lib.cairo index 362ef8ad11..de578150b8 100644 --- a/docs/listings/direct_storage_access/tests/lib.cairo +++ b/docs/listings/direct_storage_access/tests/lib.cairo @@ -1,5 +1,5 @@ -pub mod felts_only; pub mod complex_structures; +pub mod felts_only; pub mod storage_address; -pub mod using_storage_address_from_base; pub mod using_enums; +pub mod using_storage_address_from_base; diff --git a/docs/listings/direct_storage_access/tests/using_enums.cairo b/docs/listings/direct_storage_access/tests/using_enums.cairo index 73587296d7..750ce0b841 100644 --- a/docs/listings/direct_storage_access/tests/using_enums.cairo +++ b/docs/listings/direct_storage_access/tests/using_enums.cairo @@ -1,7 +1,8 @@ -use direct_storage_access::using_enums::IEnumsStorageContractSafeDispatcherTrait; -use direct_storage_access::using_enums::IEnumsStorageContractSafeDispatcher; +use direct_storage_access::using_enums::{ + IEnumsStorageContractSafeDispatcher, IEnumsStorageContractSafeDispatcherTrait, +}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, load, map_entry_address, store}; use starknet::ContractAddress; -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, store, map_entry_address, load}; fn deploy_contract(name: ByteArray) -> ContractAddress { let contract = declare(name).unwrap().contract_class(); diff --git a/docs/listings/direct_storage_access/tests/using_storage_address_from_base.cairo b/docs/listings/direct_storage_access/tests/using_storage_address_from_base.cairo index 2862c4d439..2f8a212643 100644 --- a/docs/listings/direct_storage_access/tests/using_storage_address_from_base.cairo +++ b/docs/listings/direct_storage_access/tests/using_storage_address_from_base.cairo @@ -1,12 +1,9 @@ -use starknet::storage::StorageAsPointer; -use starknet::storage::StoragePathEntry; - -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, store, load}; -use starknet::storage_access::{storage_address_from_base}; - use direct_storage_access::felts_only::{ - SimpleStorageContract, ISimpleStorageContractDispatcher, ISimpleStorageContractDispatcherTrait, + ISimpleStorageContractDispatcher, ISimpleStorageContractDispatcherTrait, SimpleStorageContract, }; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, load, store}; +use starknet::storage::{StorageAsPointer, StoragePathEntry}; +use starknet::storage_access::storage_address_from_base; #[test] fn update_mapping() { diff --git a/docs/listings/fork_testing/tests/explicit.cairo b/docs/listings/fork_testing/tests/explicit.cairo index 6936d8e141..028dde19fc 100644 --- a/docs/listings/fork_testing/tests/explicit.cairo +++ b/docs/listings/fork_testing/tests/explicit.cairo @@ -1,3 +1,3 @@ -pub mod block_number; pub mod block_hash; +pub mod block_number; pub mod block_tag; diff --git a/docs/listings/fork_testing/tests/lib.cairo b/docs/listings/fork_testing/tests/lib.cairo index 68d0e261d8..db25c296ef 100644 --- a/docs/listings/fork_testing/tests/lib.cairo +++ b/docs/listings/fork_testing/tests/lib.cairo @@ -1,3 +1,3 @@ -pub mod name; pub mod explicit; +pub mod name; pub mod overridden_name; diff --git a/docs/listings/full_example/src/full_example.cairo b/docs/listings/full_example/src/full_example.cairo index 30ad4b6f2a..b56bb977bd 100644 --- a/docs/listings/full_example/src/full_example.cairo +++ b/docs/listings/full_example/src/full_example.cairo @@ -1,4 +1,4 @@ -use sncast_std::{declare, deploy, invoke, call, DeclareResultTrait, get_nonce, FeeSettingsTrait}; +use sncast_std::{DeclareResultTrait, FeeSettingsTrait, call, declare, deploy, get_nonce, invoke}; fn main() { let fee_settings = FeeSettingsTrait::max_fee(999999999999999); diff --git a/docs/listings/hello_sncast/src/data_transformer_contract.cairo b/docs/listings/hello_sncast/src/data_transformer_contract.cairo index ee8e8fc52f..5dfb1aba7a 100644 --- a/docs/listings/hello_sncast/src/data_transformer_contract.cairo +++ b/docs/listings/hello_sncast/src/data_transformer_contract.cairo @@ -35,7 +35,7 @@ pub trait IDataTransformerContract { #[starknet::contract] pub mod DataTransformerContract { - use super::{NestedStructWithField, Enum}; + use super::{Enum, NestedStructWithField}; #[storage] struct Storage {} diff --git a/docs/listings/hello_sncast/src/hello_sncast.cairo b/docs/listings/hello_sncast/src/hello_sncast.cairo index bdd7cb855a..6777554671 100644 --- a/docs/listings/hello_sncast/src/hello_sncast.cairo +++ b/docs/listings/hello_sncast/src/hello_sncast.cairo @@ -7,7 +7,7 @@ pub trait IHelloSncast { #[starknet::contract] mod HelloSncast { - use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess}; + use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; #[storage] struct Storage { balance: felt252, diff --git a/docs/listings/hello_sncast/src/lib.cairo b/docs/listings/hello_sncast/src/lib.cairo index b282cbfd57..1b067150b9 100644 --- a/docs/listings/hello_sncast/src/lib.cairo +++ b/docs/listings/hello_sncast/src/lib.cairo @@ -1,3 +1,3 @@ -pub mod hello_sncast; -pub mod data_transformer_contract; pub mod constructor_contract; +pub mod data_transformer_contract; +pub mod hello_sncast; diff --git a/docs/listings/hello_snforge/src/lib.cairo b/docs/listings/hello_snforge/src/lib.cairo index 9354ff6c3b..9716ca48db 100644 --- a/docs/listings/hello_snforge/src/lib.cairo +++ b/docs/listings/hello_snforge/src/lib.cairo @@ -6,7 +6,7 @@ pub trait IHelloStarknet { #[starknet::contract] mod HelloStarknet { - use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess}; + use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; #[storage] struct Storage { balance: felt252, diff --git a/docs/listings/hello_starknet/src/lib.cairo b/docs/listings/hello_starknet/src/lib.cairo index 9354ff6c3b..9716ca48db 100644 --- a/docs/listings/hello_starknet/src/lib.cairo +++ b/docs/listings/hello_starknet/src/lib.cairo @@ -6,7 +6,7 @@ pub trait IHelloStarknet { #[starknet::contract] mod HelloStarknet { - use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess}; + use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; #[storage] struct Storage { balance: felt252, diff --git a/docs/listings/hello_starknet/tests/test_contract.cairo b/docs/listings/hello_starknet/tests/test_contract.cairo index 7e83c196e9..565ce681ad 100644 --- a/docs/listings/hello_starknet/tests/test_contract.cairo +++ b/docs/listings/hello_starknet/tests/test_contract.cairo @@ -1,12 +1,10 @@ +use hello_starknet::{ + IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetSafeDispatcher, + IHelloStarknetSafeDispatcherTrait, +}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use starknet::ContractAddress; -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - -use hello_starknet::IHelloStarknetSafeDispatcher; -use hello_starknet::IHelloStarknetSafeDispatcherTrait; -use hello_starknet::IHelloStarknetDispatcher; -use hello_starknet::IHelloStarknetDispatcherTrait; - fn deploy_contract(name: ByteArray) -> ContractAddress { let contract = declare(name).unwrap().contract_class(); let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap(); diff --git a/docs/listings/hello_workspaces/crates/fibonacci/src/lib.cairo b/docs/listings/hello_workspaces/crates/fibonacci/src/lib.cairo index 64ced67cfd..b008e8e0eb 100644 --- a/docs/listings/hello_workspaces/crates/fibonacci/src/lib.cairo +++ b/docs/listings/hello_workspaces/crates/fibonacci/src/lib.cairo @@ -23,8 +23,8 @@ mod FibonacciContract { #[cfg(test)] mod tests { - use super::fib; use snforge_std::declare; + use super::fib; #[test] fn it_works() { diff --git a/docs/listings/invoke/src/lib.cairo b/docs/listings/invoke/src/lib.cairo index 8757b6f3ff..719f99652c 100644 --- a/docs/listings/invoke/src/lib.cairo +++ b/docs/listings/invoke/src/lib.cairo @@ -1,5 +1,5 @@ +use sncast_std::{FeeSettingsTrait, invoke}; use starknet::ContractAddress; -use sncast_std::{invoke, FeeSettingsTrait}; fn main() { let contract_address: ContractAddress = diff --git a/docs/listings/testing_contract_internals/src/contract.cairo b/docs/listings/testing_contract_internals/src/contract.cairo index 1ccb9f9d4d..db60cc9992 100644 --- a/docs/listings/testing_contract_internals/src/contract.cairo +++ b/docs/listings/testing_contract_internals/src/contract.cairo @@ -5,10 +5,10 @@ pub trait IContract { #[starknet::contract] pub mod Contract { + use starknet::ContractAddress; use starknet::storage::{ - StoragePointerReadAccess, StorageMapReadAccess, StorageMapWriteAccess, Map, + Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess, }; - use starknet::ContractAddress; #[storage] pub struct Storage { diff --git a/docs/listings/testing_contract_internals/src/lib.cairo b/docs/listings/testing_contract_internals/src/lib.cairo index 722e9752d3..821c9adafb 100644 --- a/docs/listings/testing_contract_internals/src/lib.cairo +++ b/docs/listings/testing_contract_internals/src/lib.cairo @@ -1,4 +1,4 @@ pub mod contract; pub mod spying_for_events; -pub mod using_library_calls; pub mod using_interact_with_state; +pub mod using_library_calls; diff --git a/docs/listings/testing_contract_internals/src/using_interact_with_state.cairo b/docs/listings/testing_contract_internals/src/using_interact_with_state.cairo index 3ef86a373b..d07d5a4ea6 100644 --- a/docs/listings/testing_contract_internals/src/using_interact_with_state.cairo +++ b/docs/listings/testing_contract_internals/src/using_interact_with_state.cairo @@ -5,8 +5,8 @@ trait IContract { #[starknet::contract] pub mod Contract { - use starknet::storage::{StorageMapReadAccess, StorageMapWriteAccess, Map}; use starknet::ContractAddress; + use starknet::storage::{Map, StorageMapReadAccess, StorageMapWriteAccess}; #[storage] pub struct Storage { @@ -31,11 +31,11 @@ pub mod Contract { #[cfg(test)] mod tests { // 0. Import necessary structs and traits + use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, interact_with_state}; + use starknet::ContractAddress; use starknet::storage::{StorageMapReadAccess, StorageMapWriteAccess}; - use super::{Contract, IContractDispatcher, IContractDispatcherTrait}; use super::Contract::InternalTrait; - use snforge_std::{declare, DeclareResultTrait, ContractClassTrait, interact_with_state}; - use starknet::ContractAddress; + use super::{Contract, IContractDispatcher, IContractDispatcherTrait}; fn deploy_contract() -> starknet::ContractAddress { let contract = declare("Contract").unwrap().contract_class(); diff --git a/docs/listings/testing_contract_internals/src/using_library_calls.cairo b/docs/listings/testing_contract_internals/src/using_library_calls.cairo index 99431a636f..0ae71785a0 100644 --- a/docs/listings/testing_contract_internals/src/using_library_calls.cairo +++ b/docs/listings/testing_contract_internals/src/using_library_calls.cairo @@ -6,7 +6,7 @@ pub trait ILibraryContract { #[starknet::contract] pub mod LibraryContract { - use starknet::storage::{StoragePointerWriteAccess, StoragePointerReadAccess}; + use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess}; #[storage] struct Storage { value: felt252, diff --git a/docs/listings/testing_contract_internals/tests/interact_with_state.cairo b/docs/listings/testing_contract_internals/tests/interact_with_state.cairo index 86caf5e487..e63fdcc9de 100644 --- a/docs/listings/testing_contract_internals/tests/interact_with_state.cairo +++ b/docs/listings/testing_contract_internals/tests/interact_with_state.cairo @@ -1,9 +1,9 @@ // 0. Import necessary structs and traits +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, interact_with_state}; +use starknet::ContractAddress; use starknet::storage::{StorageMapReadAccess, StorageMapWriteAccess}; -use testing_contract_internals::contract::{Contract, IContractDispatcher, IContractDispatcherTrait}; use testing_contract_internals::contract::Contract::InternalTrait; -use snforge_std::{declare, DeclareResultTrait, ContractClassTrait, interact_with_state}; -use starknet::ContractAddress; +use testing_contract_internals::contract::{Contract, IContractDispatcher, IContractDispatcherTrait}; fn deploy_contract() -> starknet::ContractAddress { let contract = declare("Contract").unwrap().contract_class(); diff --git a/docs/listings/testing_contract_internals/tests/lib.cairo b/docs/listings/testing_contract_internals/tests/lib.cairo index 581972220f..c35f689119 100644 --- a/docs/listings/testing_contract_internals/tests/lib.cairo +++ b/docs/listings/testing_contract_internals/tests/lib.cairo @@ -1,4 +1,4 @@ +pub mod interact_with_state; pub mod mocking_the_context_info; pub mod spying_for_events; pub mod using_library_calls; -pub mod interact_with_state; diff --git a/docs/listings/testing_contract_internals/tests/mocking_the_context_info.cairo b/docs/listings/testing_contract_internals/tests/mocking_the_context_info.cairo index 055cd42750..b9272a9459 100644 --- a/docs/listings/testing_contract_internals/tests/mocking_the_context_info.cairo +++ b/docs/listings/testing_contract_internals/tests/mocking_the_context_info.cairo @@ -1,7 +1,7 @@ -use core::result::ResultTrait; use core::box::BoxTrait; -use starknet::ContractAddress; +use core::result::ResultTrait; use snforge_std::{start_cheat_block_number, stop_cheat_block_number, test_address}; +use starknet::ContractAddress; #[test] fn test_cheat_block_number_test_state() { diff --git a/docs/listings/testing_contract_internals/tests/spying_for_events.cairo b/docs/listings/testing_contract_internals/tests/spying_for_events.cairo index 4d179b0fad..85d17ea45c 100644 --- a/docs/listings/testing_contract_internals/tests/spying_for_events.cairo +++ b/docs/listings/testing_contract_internals/tests/spying_for_events.cairo @@ -1,2 +1,2 @@ -pub mod tests; pub mod syscall_tests; +pub mod tests; diff --git a/docs/listings/testing_contract_internals/tests/spying_for_events/syscall_tests.cairo b/docs/listings/testing_contract_internals/tests/spying_for_events/syscall_tests.cairo index bda1483a67..670b1f3edf 100644 --- a/docs/listings/testing_contract_internals/tests/spying_for_events/syscall_tests.cairo +++ b/docs/listings/testing_contract_internals/tests/spying_for_events/syscall_tests.cairo @@ -1,10 +1,11 @@ use core::array::ArrayTrait; use core::result::ResultTrait; -use starknet::{ContractAddress, SyscallResultTrait, syscalls::emit_event_syscall}; use snforge_std::{ - declare, ContractClassTrait, spy_events, EventSpy, EventSpyTrait, EventSpyAssertionsTrait, - Event, test_address, + ContractClassTrait, Event, EventSpy, EventSpyAssertionsTrait, EventSpyTrait, declare, + spy_events, test_address, }; +use starknet::syscalls::emit_event_syscall; +use starknet::{ContractAddress, SyscallResultTrait}; #[test] fn test_expect_event() { diff --git a/docs/listings/testing_contract_internals/tests/spying_for_events/tests.cairo b/docs/listings/testing_contract_internals/tests/spying_for_events/tests.cairo index 78574b3bb8..53468af487 100644 --- a/docs/listings/testing_contract_internals/tests/spying_for_events/tests.cairo +++ b/docs/listings/testing_contract_internals/tests/spying_for_events/tests.cairo @@ -1,7 +1,7 @@ use core::array::ArrayTrait; use snforge_std::{ - declare, ContractClassTrait, spy_events, EventSpy, EventSpyTrait, EventSpyAssertionsTrait, - Event, test_address, + ContractClassTrait, Event, EventSpy, EventSpyAssertionsTrait, EventSpyTrait, declare, + spy_events, test_address, }; use testing_contract_internals::spying_for_events::Emitter; diff --git a/docs/listings/testing_contract_internals/tests/using_library_calls.cairo b/docs/listings/testing_contract_internals/tests/using_library_calls.cairo index b611f2a3be..d599af933b 100644 --- a/docs/listings/testing_contract_internals/tests/using_library_calls.cairo +++ b/docs/listings/testing_contract_internals/tests/using_library_calls.cairo @@ -1,8 +1,9 @@ +use snforge_std::{DeclareResultTrait, declare}; +use starknet::syscalls::library_call_syscall; +use starknet::{ClassHash, ContractAddress}; use testing_contract_internals::using_library_calls::{ - ILibraryContractSafeLibraryDispatcher, ILibraryContractSafeDispatcherTrait, + ILibraryContractSafeDispatcherTrait, ILibraryContractSafeLibraryDispatcher, }; -use starknet::{ClassHash, ContractAddress, syscalls::library_call_syscall}; -use snforge_std::{declare, DeclareResultTrait}; #[test] fn test_library_calls() { diff --git a/docs/listings/testing_events/src/syscall.cairo b/docs/listings/testing_events/src/syscall.cairo index 3dd6faf0bd..8f87ab7541 100644 --- a/docs/listings/testing_events/src/syscall.cairo +++ b/docs/listings/testing_events/src/syscall.cairo @@ -24,8 +24,8 @@ pub mod SpySyscallEventsChecker { pub fn emit_one_event(ref self: ContractState, some_data: felt252) { self.emit(FirstEvent { some_data }); } - - use core::starknet::{SyscallResultTrait, syscalls::emit_event_syscall}; + use core::starknet::SyscallResultTrait; + use core::starknet::syscalls::emit_event_syscall; #[external(v0)] pub fn emit_event_with_syscall(ref self: ContractState, some_key: felt252, some_data: felt252) { diff --git a/docs/listings/testing_events/src/syscall_dummy.cairo b/docs/listings/testing_events/src/syscall_dummy.cairo index b245a154f0..79437d68c5 100644 --- a/docs/listings/testing_events/src/syscall_dummy.cairo +++ b/docs/listings/testing_events/src/syscall_dummy.cairo @@ -9,7 +9,8 @@ pub mod SpySyscallEventsChecker { // ... // Rest of the implementation identical to `SpyEventsChecker` - use core::starknet::{SyscallResultTrait, syscalls::emit_event_syscall}; + use core::starknet::SyscallResultTrait; + use core::starknet::syscalls::emit_event_syscall; #[external(v0)] pub fn emit_event_with_syscall(ref self: ContractState, some_key: felt252, some_data: felt252) { diff --git a/docs/listings/testing_events/tests/assert_emitted.cairo b/docs/listings/testing_events/tests/assert_emitted.cairo index f947fe302d..bfff1dd1ea 100644 --- a/docs/listings/testing_events/tests/assert_emitted.cairo +++ b/docs/listings/testing_events/tests/assert_emitted.cairo @@ -2,9 +2,8 @@ use snforge_std::{ declare, ContractClassTrait, DeclareResultTrait, spy_events, EventSpyAssertionsTrait // Add for assertions on the EventSpy }; - use testing_events::contract::{ - SpyEventsChecker, ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, + ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, SpyEventsChecker, }; #[test] diff --git a/docs/listings/testing_events/tests/assert_manually.cairo b/docs/listings/testing_events/tests/assert_manually.cairo index dd00dea153..6ab90c8a94 100644 --- a/docs/listings/testing_events/tests/assert_manually.cairo +++ b/docs/listings/testing_events/tests/assert_manually.cairo @@ -4,13 +4,11 @@ use snforge_std::{ Event, // A structure describing a raw `Event` IsEmitted // Trait for checking if a given event was ever emitted }; - +use starknet::ContractAddress; use testing_events::contract::{ - SpyEventsChecker, ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, + ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, SpyEventsChecker, }; -use starknet::ContractAddress; - #[test] fn test_complex_assertions() { let contract = declare("SpyEventsChecker").unwrap().contract_class(); diff --git a/docs/listings/testing_events/tests/filter.cairo b/docs/listings/testing_events/tests/filter.cairo index 6a179b61bb..51f201ee29 100644 --- a/docs/listings/testing_events/tests/filter.cairo +++ b/docs/listings/testing_events/tests/filter.cairo @@ -3,9 +3,8 @@ use snforge_std::{ EventSpyTrait, Event, EventsFilterTrait // Add for filtering the Events object (result of `get_events`) }; - use testing_events::contract::{ - SpyEventsChecker, ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, + ISpyEventsCheckerDispatcher, ISpyEventsCheckerDispatcherTrait, SpyEventsChecker, }; #[test] diff --git a/docs/listings/testing_events/tests/syscall.cairo b/docs/listings/testing_events/tests/syscall.cairo index 081c5fa081..8402132197 100644 --- a/docs/listings/testing_events/tests/syscall.cairo +++ b/docs/listings/testing_events/tests/syscall.cairo @@ -1,8 +1,7 @@ use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, spy_events, EventSpyAssertionsTrait, - EventSpyTrait, Event, EventsFilterTrait, + ContractClassTrait, DeclareResultTrait, Event, EventSpyAssertionsTrait, EventSpyTrait, + EventsFilterTrait, declare, spy_events, }; - use testing_events::syscall::{ ISpySyscallEventsCheckerDispatcher, ISpySyscallEventsCheckerDispatcherTrait, }; diff --git a/docs/listings/testing_messages_to_l1/src/lib.cairo b/docs/listings/testing_messages_to_l1/src/lib.cairo index 558b082484..31c6b60273 100644 --- a/docs/listings/testing_messages_to_l1/src/lib.cairo +++ b/docs/listings/testing_messages_to_l1/src/lib.cairo @@ -7,7 +7,6 @@ pub trait IMessageSender { pub mod MessageSender { #[storage] struct Storage {} - use starknet::syscalls::send_message_to_l1_syscall; #[external(v0)] diff --git a/docs/listings/testing_messages_to_l1/tests/detailed.cairo b/docs/listings/testing_messages_to_l1/tests/detailed.cairo index 2724ee3148..237a2a38b0 100644 --- a/docs/listings/testing_messages_to_l1/tests/detailed.cairo +++ b/docs/listings/testing_messages_to_l1/tests/detailed.cairo @@ -1,9 +1,8 @@ -use starknet::EthAddress; use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, spy_messages_to_l1, MessageToL1SpyTrait, - MessageToL1SpyAssertionsTrait, MessageToL1, MessageToL1FilterTrait, + ContractClassTrait, DeclareResultTrait, MessageToL1, MessageToL1FilterTrait, + MessageToL1SpyAssertionsTrait, MessageToL1SpyTrait, declare, spy_messages_to_l1, }; - +use starknet::EthAddress; use testing_messages_to_l1::{IMessageSenderDispatcher, IMessageSenderDispatcherTrait}; #[test] diff --git a/docs/listings/testing_messages_to_l1/tests/lib.cairo b/docs/listings/testing_messages_to_l1/tests/lib.cairo index 9401d75e40..8e6b82f6a0 100644 --- a/docs/listings/testing_messages_to_l1/tests/lib.cairo +++ b/docs/listings/testing_messages_to_l1/tests/lib.cairo @@ -1,2 +1,2 @@ -pub mod simple; pub mod detailed; +pub mod simple; diff --git a/docs/listings/testing_messages_to_l1/tests/simple.cairo b/docs/listings/testing_messages_to_l1/tests/simple.cairo index 3a4755b9dd..c6056af01d 100644 --- a/docs/listings/testing_messages_to_l1/tests/simple.cairo +++ b/docs/listings/testing_messages_to_l1/tests/simple.cairo @@ -1,9 +1,8 @@ -use starknet::EthAddress; use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, spy_messages_to_l1, - MessageToL1SpyAssertionsTrait, MessageToL1, + ContractClassTrait, DeclareResultTrait, MessageToL1, MessageToL1SpyAssertionsTrait, declare, + spy_messages_to_l1, }; - +use starknet::EthAddress; use testing_messages_to_l1::{IMessageSenderDispatcher, IMessageSenderDispatcherTrait}; #[test] diff --git a/docs/listings/testing_smart_contracts_handling_errors/tests/handle_panic.cairo b/docs/listings/testing_smart_contracts_handling_errors/tests/handle_panic.cairo index e6cad3b8e2..3a5a40381a 100644 --- a/docs/listings/testing_smart_contracts_handling_errors/tests/handle_panic.cairo +++ b/docs/listings/testing_smart_contracts_handling_errors/tests/handle_panic.cairo @@ -1,7 +1,6 @@ // Necessary utility function import use snforge_std::byte_array::try_deserialize_bytearray_error; -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use testing_smart_contracts_handling_errors::{ IPanicContractSafeDispatcher, IPanicContractSafeDispatcherTrait, }; diff --git a/docs/listings/testing_smart_contracts_handling_errors/tests/panic.cairo b/docs/listings/testing_smart_contracts_handling_errors/tests/panic.cairo index 82c267fd0e..7a0243112f 100644 --- a/docs/listings/testing_smart_contracts_handling_errors/tests/panic.cairo +++ b/docs/listings/testing_smart_contracts_handling_errors/tests/panic.cairo @@ -1,6 +1,5 @@ //ANCHOR:first_half -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use testing_smart_contracts_handling_errors::{ IPanicContractDispatcher, IPanicContractDispatcherTrait, }; diff --git a/docs/listings/testing_smart_contracts_safe_dispatcher/tests/safe_dispatcher.cairo b/docs/listings/testing_smart_contracts_safe_dispatcher/tests/safe_dispatcher.cairo index c7786c2536..b48d470f24 100644 --- a/docs/listings/testing_smart_contracts_safe_dispatcher/tests/safe_dispatcher.cairo +++ b/docs/listings/testing_smart_contracts_safe_dispatcher/tests/safe_dispatcher.cairo @@ -1,5 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use testing_smart_contracts_safe_dispatcher::{ IPanicContractSafeDispatcher, IPanicContractSafeDispatcherTrait, }; diff --git a/docs/listings/testing_smart_contracts_writing_tests/tests/simple_contract.cairo b/docs/listings/testing_smart_contracts_writing_tests/tests/simple_contract.cairo index e387e8449a..77ad33f062 100644 --- a/docs/listings/testing_smart_contracts_writing_tests/tests/simple_contract.cairo +++ b/docs/listings/testing_smart_contracts_writing_tests/tests/simple_contract.cairo @@ -1,5 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; - +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use testing_smart_contracts_writing_tests::{ ISimpleContractDispatcher, ISimpleContractDispatcherTrait, }; diff --git a/docs/listings/tx_status/src/lib.cairo b/docs/listings/tx_status/src/lib.cairo index aa839b289b..4e44a8ecd7 100644 --- a/docs/listings/tx_status/src/lib.cairo +++ b/docs/listings/tx_status/src/lib.cairo @@ -1,4 +1,4 @@ -use sncast_std::{tx_status}; +use sncast_std::tx_status; fn main() { let transaction_hash = 0x00ae35dacba17cde62b8ceb12e3b18f4ab6e103fa2d5e3d9821cb9dc59d59a3c; diff --git a/docs/listings/using_cheatcodes/tests/lib.cairo b/docs/listings/using_cheatcodes/tests/lib.cairo index 646dfdf4ea..c4494bab1c 100644 --- a/docs/listings/using_cheatcodes/tests/lib.cairo +++ b/docs/listings/using_cheatcodes/tests/lib.cairo @@ -1,4 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare}; use using_cheatcodes::{ICheatcodeCheckerDispatcher, ICheatcodeCheckerDispatcherTrait}; #[test] diff --git a/docs/listings/using_cheatcodes_cancelling_cheat/tests/lib.cairo b/docs/listings/using_cheatcodes_cancelling_cheat/tests/lib.cairo index c8ca4e773e..4ddebdceff 100644 --- a/docs/listings/using_cheatcodes_cancelling_cheat/tests/lib.cairo +++ b/docs/listings/using_cheatcodes_cancelling_cheat/tests/lib.cairo @@ -1,8 +1,7 @@ use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, start_cheat_caller_address, + ContractClassTrait, DeclareResultTrait, declare, start_cheat_caller_address, stop_cheat_caller_address, }; - use using_cheatcodes_cancelling_cheat::{ ICheatcodeCheckerSafeDispatcher, ICheatcodeCheckerSafeDispatcherTrait, }; diff --git a/docs/listings/using_cheatcodes_cheat_address/tests/lib.cairo b/docs/listings/using_cheatcodes_cheat_address/tests/lib.cairo index 5c29b4d211..80d3c2ccd1 100644 --- a/docs/listings/using_cheatcodes_cheat_address/tests/lib.cairo +++ b/docs/listings/using_cheatcodes_cheat_address/tests/lib.cairo @@ -1,4 +1,4 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, start_cheat_caller_address}; +use snforge_std::{ContractClassTrait, DeclareResultTrait, declare, start_cheat_caller_address}; use using_cheatcodes_cheat_address::{ICheatcodeCheckerDispatcher, ICheatcodeCheckerDispatcherTrait}; #[test] diff --git a/docs/listings/using_cheatcodes_others/tests/caller_address/proper_use_global.cairo b/docs/listings/using_cheatcodes_others/tests/caller_address/proper_use_global.cairo index 91747317b7..9ca67bd215 100644 --- a/docs/listings/using_cheatcodes_others/tests/caller_address/proper_use_global.cairo +++ b/docs/listings/using_cheatcodes_others/tests/caller_address/proper_use_global.cairo @@ -1,5 +1,5 @@ use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, start_cheat_caller_address_global, + ContractClassTrait, DeclareResultTrait, declare, start_cheat_caller_address_global, stop_cheat_caller_address_global, }; use using_cheatcodes_others::{ICheatcodeCheckerDispatcher, ICheatcodeCheckerDispatcherTrait}; diff --git a/docs/listings/using_cheatcodes_others/tests/caller_address/span.cairo b/docs/listings/using_cheatcodes_others/tests/caller_address/span.cairo index 2436a2d782..4c9b3cfe7e 100644 --- a/docs/listings/using_cheatcodes_others/tests/caller_address/span.cairo +++ b/docs/listings/using_cheatcodes_others/tests/caller_address/span.cairo @@ -1,6 +1,5 @@ -use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, cheat_caller_address, CheatSpan}; +use snforge_std::{CheatSpan, ContractClassTrait, DeclareResultTrait, cheat_caller_address, declare}; use starknet::ContractAddress; - use using_cheatcodes_others::{ ICheatcodeCheckerSafeDispatcher, ICheatcodeCheckerSafeDispatcherTrait, }; diff --git a/docs/listings/using_cheatcodes_others/tests/cheat_constructor.cairo b/docs/listings/using_cheatcodes_others/tests/cheat_constructor.cairo index fd1c67068b..30212a3a55 100644 --- a/docs/listings/using_cheatcodes_others/tests/cheat_constructor.cairo +++ b/docs/listings/using_cheatcodes_others/tests/cheat_constructor.cairo @@ -1,8 +1,7 @@ use snforge_std::{ - declare, ContractClassTrait, DeclareResultTrait, start_cheat_block_number, + ContractClassTrait, DeclareResultTrait, declare, start_cheat_block_number, start_cheat_block_timestamp, }; - use using_cheatcodes_others::{ICheatcodeCheckerDispatcher, ICheatcodeCheckerDispatcherTrait}; #[test] diff --git a/docs/listings/using_cheatcodes_others/tests/lib.cairo b/docs/listings/using_cheatcodes_others/tests/lib.cairo index 33881ff51b..7e5baac46e 100644 --- a/docs/listings/using_cheatcodes_others/tests/lib.cairo +++ b/docs/listings/using_cheatcodes_others/tests/lib.cairo @@ -1,4 +1,4 @@ pub mod caller_address; pub mod cheat_constructor; -pub mod set_balance_strk; pub mod set_balance_custom_token; +pub mod set_balance_strk; diff --git a/sncast_std/src/lib.cairo b/sncast_std/src/lib.cairo index 4f6670876d..6e17671137 100644 --- a/sncast_std/src/lib.cairo +++ b/sncast_std/src/lib.cairo @@ -1,7 +1,8 @@ use core::array::ArrayTrait; -use core::serde::Serde; -use starknet::{testing::cheatcode, ContractAddress, ClassHash}; use core::fmt::{Debug, Display, Error, Formatter}; +use core::serde::Serde; +use starknet::testing::cheatcode; +use starknet::{ClassHash, ContractAddress}; #[derive(Drop, PartialEq, Serde, Debug)] pub struct ErrorData { @@ -196,7 +197,7 @@ pub impl DisplayContractAddress of Display { #[derive(Drop, Clone, Debug, Serde)] pub struct CallResult { - pub data: Array::, + pub data: Array, } impl DisplayCallResult of Display { @@ -206,7 +207,7 @@ impl DisplayCallResult of Display { } pub fn call( - contract_address: ContractAddress, function_selector: felt252, calldata: Array::, + contract_address: ContractAddress, function_selector: felt252, calldata: Array, ) -> Result { let contract_address_felt: felt252 = contract_address.into(); let mut inputs = array![contract_address_felt, function_selector]; @@ -376,7 +377,7 @@ pub impl FeeSettingsImpl of FeeSettingsTrait { pub fn deploy( class_hash: ClassHash, - constructor_calldata: Array::, + constructor_calldata: Array, salt: Option, unique: bool, fee_settings: FeeSettings, @@ -428,7 +429,7 @@ impl DisplayInvokeResult of Display { pub fn invoke( contract_address: ContractAddress, entry_point_selector: felt252, - calldata: Array::, + calldata: Array, fee_settings: FeeSettings, nonce: Option, ) -> Result { diff --git a/snforge_std/src/cheatcodes.cairo b/snforge_std/src/cheatcodes.cairo index 70f69dd7c8..b6823aa7d2 100644 --- a/snforge_std/src/cheatcodes.cairo +++ b/snforge_std/src/cheatcodes.cairo @@ -1,16 +1,16 @@ -use starknet::{ContractAddress, ClassHash, contract_address_const}; +use starknet::{ClassHash, ContractAddress, contract_address_const}; use super::cheatcode::execute_cheatcode_and_deserialize; +pub mod block_hash; +pub mod contract_class; +pub mod erc20; pub mod events; -pub mod l1_handler; -pub mod contract_class; -pub mod storage; pub mod execution_info; -pub mod erc20; -pub mod message_to_l1; -pub mod generate_random_felt; pub mod generate_arg; -pub mod block_hash; +pub mod generate_random_felt; +pub mod l1_handler; +pub mod message_to_l1; +pub mod storage; /// Enum used to specify how long the target should be cheated for. #[derive(Copy, Drop, Serde, PartialEq, Clone, Debug)] diff --git a/snforge_std/src/cheatcodes/block_hash.cairo b/snforge_std/src/cheatcodes/block_hash.cairo index c18b3cd8be..f0a9f4da63 100644 --- a/snforge_std/src/cheatcodes/block_hash.cairo +++ b/snforge_std/src/cheatcodes/block_hash.cairo @@ -1,8 +1,7 @@ +use starknet::ContractAddress; use crate::cheatcode::execute_cheatcode_and_deserialize; -use super::execution_info::Operation; -use super::execution_info::CheatArguments; use super::CheatSpan; -use starknet::ContractAddress; +use super::execution_info::{CheatArguments, Operation}; /// Changes the block hash for the given block number and contract address. /// - `contract_address` - The contract address to which the cheat applies. diff --git a/snforge_std/src/cheatcodes/contract_class.cairo b/snforge_std/src/cheatcodes/contract_class.cairo index a76aafe72f..e2d613d597 100644 --- a/snforge_std/src/cheatcodes/contract_class.cairo +++ b/snforge_std/src/cheatcodes/contract_class.cairo @@ -1,4 +1,4 @@ -use starknet::{ContractAddress, ClassHash, SyscallResult}; +use starknet::{ClassHash, ContractAddress, SyscallResult}; use crate::byte_array::byte_array_as_felt_array; use crate::cheatcode::execute_cheatcode_and_deserialize; @@ -123,9 +123,9 @@ pub fn get_class_hash(contract_address: ContractAddress) -> ClassHash { fn _prepare_calldata( class_hash: @ClassHash, constructor_calldata: @Array::, -) -> Array:: { +) -> Array { let class_hash: felt252 = class_hash.clone().into(); - let mut inputs: Array:: = array![class_hash]; + let mut inputs: Array = array![class_hash]; constructor_calldata.serialize(ref inputs); inputs } diff --git a/snforge_std/src/cheatcodes/erc20.cairo b/snforge_std/src/cheatcodes/erc20.cairo index f88beb0773..bc31a9a631 100644 --- a/snforge_std/src/cheatcodes/erc20.cairo +++ b/snforge_std/src/cheatcodes/erc20.cairo @@ -1,5 +1,5 @@ -use starknet::{ContractAddress}; use snforge_std::cheatcodes::storage::{map_entry_address, store}; +use starknet::ContractAddress; const STRK_CONTRACT_ADDRESS: felt252 = 0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d; diff --git a/snforge_std/src/cheatcodes/events.cairo b/snforge_std/src/cheatcodes/events.cairo index fe545b21a1..be5dd8fe44 100644 --- a/snforge_std/src/cheatcodes/events.cairo +++ b/snforge_std/src/cheatcodes/events.cairo @@ -50,7 +50,7 @@ impl EventsFilterTraitImpl of EventsFilterTrait { if *from == contract_address { new_events.append((*from, event.clone())); }; - }; + } Events { events: new_events } } } @@ -100,7 +100,7 @@ pub impl IsEmittedImpl, +Drop> of IsEmitted { is_emitted = true; break; }; - }; + } return is_emitted; } } diff --git a/snforge_std/src/cheatcodes/execution_info.cairo b/snforge_std/src/cheatcodes/execution_info.cairo index f665f032a6..faa3250616 100644 --- a/snforge_std/src/cheatcodes/execution_info.cairo +++ b/snforge_std/src/cheatcodes/execution_info.cairo @@ -1,27 +1,26 @@ -use starknet::ContractAddress; -use starknet::ResourcesBounds; use snforge_std::cheatcodes::CheatSpan; +use starknet::{ContractAddress, ResourcesBounds}; use crate::cheatcode::execute_cheatcode_and_deserialize; +pub mod account_contract_address; +pub mod account_deployment_data; +pub mod block_number; +pub mod block_timestamp; pub mod caller_address; +pub mod chain_id; #[doc(hidden)] pub mod contract_address; -pub mod block_number; -pub mod block_timestamp; -pub mod sequencer_address; -pub mod version; +pub mod fee_data_availability_mode; pub mod max_fee; -pub mod signature; -pub mod transaction_hash; -pub mod chain_id; pub mod nonce; +pub mod nonce_data_availability_mode; +pub mod paymaster_data; pub mod resource_bounds; +pub mod sequencer_address; +pub mod signature; pub mod tip; -pub mod paymaster_data; -pub mod nonce_data_availability_mode; -pub mod fee_data_availability_mode; -pub mod account_deployment_data; -pub mod account_contract_address; +pub mod transaction_hash; +pub mod version; #[derive(Serde, Drop, Copy)] diff --git a/snforge_std/src/cheatcodes/execution_info/account_contract_address.cairo b/snforge_std/src/cheatcodes/execution_info/account_contract_address.cairo index 73f005b3b1..3d612b4127 100644 --- a/snforge_std/src/cheatcodes/execution_info/account_contract_address.cairo +++ b/snforge_std/src/cheatcodes/execution_info/account_contract_address.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the address of an account which the transaction originates from, for the given contract diff --git a/snforge_std/src/cheatcodes/execution_info/account_deployment_data.cairo b/snforge_std/src/cheatcodes/execution_info/account_deployment_data.cairo index 0cb8b343a8..b0fd2fa547 100644 --- a/snforge_std/src/cheatcodes/execution_info/account_deployment_data.cairo +++ b/snforge_std/src/cheatcodes/execution_info/account_deployment_data.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction account deployment data for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/block_number.cairo b/snforge_std/src/cheatcodes/execution_info/block_number.cairo index 7bc254ba88..077f12934b 100644 --- a/snforge_std/src/cheatcodes/execution_info/block_number.cairo +++ b/snforge_std/src/cheatcodes/execution_info/block_number.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the block number for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/block_timestamp.cairo b/snforge_std/src/cheatcodes/execution_info/block_timestamp.cairo index 483727d8bd..3d3ace1ae3 100644 --- a/snforge_std/src/cheatcodes/execution_info/block_timestamp.cairo +++ b/snforge_std/src/cheatcodes/execution_info/block_timestamp.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the block timestamp for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/caller_address.cairo b/snforge_std/src/cheatcodes/execution_info/caller_address.cairo index 7a8c8852ed..0741d45733 100644 --- a/snforge_std/src/cheatcodes/execution_info/caller_address.cairo +++ b/snforge_std/src/cheatcodes/execution_info/caller_address.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the caller address for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/chain_id.cairo b/snforge_std/src/cheatcodes/execution_info/chain_id.cairo index 17681e3604..4f578c7583 100644 --- a/snforge_std/src/cheatcodes/execution_info/chain_id.cairo +++ b/snforge_std/src/cheatcodes/execution_info/chain_id.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction chain_id for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/contract_address.cairo b/snforge_std/src/cheatcodes/execution_info/contract_address.cairo index 045a56ff62..a971a11282 100644 --- a/snforge_std/src/cheatcodes/execution_info/contract_address.cairo +++ b/snforge_std/src/cheatcodes/execution_info/contract_address.cairo @@ -3,10 +3,10 @@ //! They are not exposed through the public API in a general form, as there are no known use cases //! that would require them. +use crate::test_address; use super::{ - ExecutionInfoMock, cheat_execution_info, Operation, ContractAddress, CheatArguments, CheatSpan, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; -use crate::test_address; /// Overrides the contract address for the default test address. /// After this function is called, any call to `starknet::get_contract_address()` diff --git a/snforge_std/src/cheatcodes/execution_info/fee_data_availability_mode.cairo b/snforge_std/src/cheatcodes/execution_info/fee_data_availability_mode.cairo index e539cd62a0..c93351cf0f 100644 --- a/snforge_std/src/cheatcodes/execution_info/fee_data_availability_mode.cairo +++ b/snforge_std/src/cheatcodes/execution_info/fee_data_availability_mode.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction fee data availability mode for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/max_fee.cairo b/snforge_std/src/cheatcodes/execution_info/max_fee.cairo index fa1f503c69..7028b7bda4 100644 --- a/snforge_std/src/cheatcodes/execution_info/max_fee.cairo +++ b/snforge_std/src/cheatcodes/execution_info/max_fee.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction max fee for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/nonce.cairo b/snforge_std/src/cheatcodes/execution_info/nonce.cairo index 0de1a70f0c..fa22229aa7 100644 --- a/snforge_std/src/cheatcodes/execution_info/nonce.cairo +++ b/snforge_std/src/cheatcodes/execution_info/nonce.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction nonce for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/nonce_data_availability_mode.cairo b/snforge_std/src/cheatcodes/execution_info/nonce_data_availability_mode.cairo index 8a09611c8d..5caf450da1 100644 --- a/snforge_std/src/cheatcodes/execution_info/nonce_data_availability_mode.cairo +++ b/snforge_std/src/cheatcodes/execution_info/nonce_data_availability_mode.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction nonce data availability mode for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/paymaster_data.cairo b/snforge_std/src/cheatcodes/execution_info/paymaster_data.cairo index 2560daec2a..5d6d36436e 100644 --- a/snforge_std/src/cheatcodes/execution_info/paymaster_data.cairo +++ b/snforge_std/src/cheatcodes/execution_info/paymaster_data.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction paymaster data for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/resource_bounds.cairo b/snforge_std/src/cheatcodes/execution_info/resource_bounds.cairo index d62e254151..d7775051d7 100644 --- a/snforge_std/src/cheatcodes/execution_info/resource_bounds.cairo +++ b/snforge_std/src/cheatcodes/execution_info/resource_bounds.cairo @@ -1,7 +1,7 @@ +use starknet::ResourcesBounds; use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; -use starknet::ResourcesBounds; /// Changes the transaction resource bounds for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/sequencer_address.cairo b/snforge_std/src/cheatcodes/execution_info/sequencer_address.cairo index 2f0c14cf6b..3ac639f293 100644 --- a/snforge_std/src/cheatcodes/execution_info/sequencer_address.cairo +++ b/snforge_std/src/cheatcodes/execution_info/sequencer_address.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the sequencer address for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/signature.cairo b/snforge_std/src/cheatcodes/execution_info/signature.cairo index 79742f04d4..9cd9ddd857 100644 --- a/snforge_std/src/cheatcodes/execution_info/signature.cairo +++ b/snforge_std/src/cheatcodes/execution_info/signature.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction signature for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/tip.cairo b/snforge_std/src/cheatcodes/execution_info/tip.cairo index 56569b312a..64841cce9d 100644 --- a/snforge_std/src/cheatcodes/execution_info/tip.cairo +++ b/snforge_std/src/cheatcodes/execution_info/tip.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction tip for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/transaction_hash.cairo b/snforge_std/src/cheatcodes/execution_info/transaction_hash.cairo index c8e4f747d2..a23ce265e5 100644 --- a/snforge_std/src/cheatcodes/execution_info/transaction_hash.cairo +++ b/snforge_std/src/cheatcodes/execution_info/transaction_hash.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction hash for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/execution_info/version.cairo b/snforge_std/src/cheatcodes/execution_info/version.cairo index ed06ebf77b..cc354c26a1 100644 --- a/snforge_std/src/cheatcodes/execution_info/version.cairo +++ b/snforge_std/src/cheatcodes/execution_info/version.cairo @@ -1,5 +1,5 @@ use super::{ - ExecutionInfoMock, Operation, CheatArguments, CheatSpan, cheat_execution_info, ContractAddress, + CheatArguments, CheatSpan, ContractAddress, ExecutionInfoMock, Operation, cheat_execution_info, }; /// Changes the transaction version for the given contract address and span. diff --git a/snforge_std/src/cheatcodes/l1_handler.cairo b/snforge_std/src/cheatcodes/l1_handler.cairo index 1c7d5f41ef..49cb8a6f60 100644 --- a/snforge_std/src/cheatcodes/l1_handler.cairo +++ b/snforge_std/src/cheatcodes/l1_handler.cairo @@ -9,9 +9,7 @@ pub struct L1Handler { pub trait L1HandlerTrait { fn new(target: ContractAddress, selector: felt252) -> L1Handler; - fn execute( - self: L1Handler, from_address: felt252, payload: Span::, - ) -> SyscallResult<()>; + fn execute(self: L1Handler, from_address: felt252, payload: Span) -> SyscallResult<()>; } impl L1HandlerImpl of L1HandlerTrait { @@ -29,9 +27,9 @@ impl L1HandlerImpl of L1HandlerTrait { /// `payload` - The handlers' function arguments serialized with `Serde` /// Returns () or panic data if it failed fn execute( - self: L1Handler, from_address: felt252, payload: Span::, + self: L1Handler, from_address: felt252, payload: Span, ) -> SyscallResult<()> { - let mut inputs: Array:: = array![ + let mut inputs: Array = array![ self.target.into(), self.selector, from_address.into(), ]; payload.serialize(ref inputs); diff --git a/snforge_std/src/cheatcodes/message_to_l1.cairo b/snforge_std/src/cheatcodes/message_to_l1.cairo index 8ce424a3ff..706cc8037b 100644 --- a/snforge_std/src/cheatcodes/message_to_l1.cairo +++ b/snforge_std/src/cheatcodes/message_to_l1.cairo @@ -55,9 +55,9 @@ impl MessageToL1FilterTraitImpl of MessageToL1FilterTrait { let (sent_by, msg) = self.messages.at(counter); if *sent_by == contract_address { new_messages.append((*sent_by, msg.clone())); - }; + } counter += 1; - }; + } MessagesToL1 { messages: new_messages } } fn sent_to(self: @MessagesToL1, to_address: EthAddress) -> MessagesToL1 { @@ -67,9 +67,9 @@ impl MessageToL1FilterTraitImpl of MessageToL1FilterTrait { let (sent_by, msg) = self.messages.at(counter); if *msg.to_address == to_address { new_messages.append((*sent_by, msg.clone())); - }; + } counter += 1; - }; + } MessagesToL1 { messages: new_messages } } } @@ -128,9 +128,9 @@ fn is_sent( && message.to_address == expected_message.to_address { is_emitted = true; break; - }; + } i += 1; - }; + } return is_emitted; } diff --git a/snforge_std/src/cheatcodes/storage.cairo b/snforge_std/src/cheatcodes/storage.cairo index 152cd2fdcf..974ddde4da 100644 --- a/snforge_std/src/cheatcodes/storage.cairo +++ b/snforge_std/src/cheatcodes/storage.cairo @@ -52,7 +52,7 @@ pub fn load(target: ContractAddress, storage_address: felt252, size: felt252) -> let loaded = load_felt252(target, storage_address + offset.into()); output_array.append(loaded); offset += 1; - }; + } output_array } diff --git a/snforge_std/src/fs.cairo b/snforge_std/src/fs.cairo index 85a8ccba52..628f2fb07a 100644 --- a/snforge_std/src/fs.cairo +++ b/snforge_std/src/fs.cairo @@ -1,7 +1,4 @@ mod file_operations; pub use file_operations::File; -pub use file_operations::FileTrait; -pub use file_operations::read_txt; -pub use file_operations::read_json; -pub use file_operations::FileParser; +pub use file_operations::{FileParser, FileTrait, read_json, read_txt}; diff --git a/snforge_std/src/fuzzable.cairo b/snforge_std/src/fuzzable.cairo index b200f1ac06..fad82c8571 100644 --- a/snforge_std/src/fuzzable.cairo +++ b/snforge_std/src/fuzzable.cairo @@ -1,5 +1,5 @@ -pub use super::cheatcodes::generate_arg::generate_arg; use core::fmt::Debug; +pub use super::cheatcodes::generate_arg::generate_arg; const MAX_FELT: felt252 = 0x800000000000011000000000000000000000000000000000000000000000000; @@ -19,8 +19,8 @@ impl FuzzableFelt of Fuzzable { } mod nums { - use super::{Fuzzable, generate_arg, Debug}; use core::num::traits::{Bounded, Zero}; + use super::{Debug, Fuzzable, generate_arg}; pub impl FuzzableNum< T, +Zero, +Bounded, +Drop, +Serde, +Into, +Debug, @@ -78,7 +78,7 @@ pub impl FuzzableByteArray1000ASCII of Fuzzable { let letter = Fuzzable::::generate() % 95; ba.append_byte(letter + 32); ba_len = ba_len - 1; - }; + } ba } diff --git a/snforge_std/src/lib.cairo b/snforge_std/src/lib.cairo index 2d581f950e..f819af4ebb 100644 --- a/snforge_std/src/lib.cairo +++ b/snforge_std/src/lib.cairo @@ -1,164 +1,137 @@ pub mod cheatcodes; +pub use cheatcodes::CheatSpan; + +pub use cheatcodes::block_hash::cheat_block_hash; +pub use cheatcodes::block_hash::{ + start_cheat_block_hash, start_cheat_block_hash_global, stop_cheat_block_hash, + stop_cheat_block_hash_global, +}; + pub use cheatcodes::contract_class::declare; -pub use cheatcodes::contract_class::get_class_hash; -pub use cheatcodes::contract_class::ContractClass; -pub use cheatcodes::contract_class::ContractClassTrait; -pub use cheatcodes::contract_class::DeclareResult; -pub use cheatcodes::contract_class::DeclareResultTrait; +pub use cheatcodes::contract_class::{ + ContractClass, ContractClassTrait, DeclareResult, DeclareResultTrait, get_class_hash, +}; -pub use cheatcodes::l1_handler::L1Handler; -pub use cheatcodes::l1_handler::L1HandlerTrait; +pub use cheatcodes::erc20::set_balance; +pub use cheatcodes::erc20::{CustomToken, Token, TokenImpl, TokenTrait}; pub use cheatcodes::events::Event; -pub use cheatcodes::events::EventSpy; -pub use cheatcodes::events::EventSpyTrait; -pub use cheatcodes::events::EventSpyAssertionsTrait; -pub use cheatcodes::events::EventsFilterTrait; -pub use cheatcodes::events::spy_events; -pub use cheatcodes::events::IsEmitted; +pub use cheatcodes::events::{ + EventSpy, EventSpyAssertionsTrait, EventSpyTrait, EventsFilterTrait, IsEmitted, spy_events, +}; +pub use cheatcodes::execution_info::account_contract_address::{ + cheat_account_contract_address, start_cheat_account_contract_address, + start_cheat_account_contract_address_global, stop_cheat_account_contract_address, + stop_cheat_account_contract_address_global, +}; +pub use cheatcodes::execution_info::account_deployment_data::{ + cheat_account_deployment_data, start_cheat_account_deployment_data, + start_cheat_account_deployment_data_global, stop_cheat_account_deployment_data, + stop_cheat_account_deployment_data_global, +}; +pub use cheatcodes::execution_info::block_number::{ + cheat_block_number, start_cheat_block_number, start_cheat_block_number_global, + stop_cheat_block_number, stop_cheat_block_number_global, +}; +pub use cheatcodes::execution_info::block_timestamp::{ + cheat_block_timestamp, start_cheat_block_timestamp, start_cheat_block_timestamp_global, + stop_cheat_block_timestamp, stop_cheat_block_timestamp_global, +}; -pub use cheatcodes::message_to_l1::{ - spy_messages_to_l1, MessageToL1, MessageToL1Spy, MessageToL1SpyTrait, MessageToL1FilterTrait, - MessageToL1SpyAssertionsTrait, +pub use cheatcodes::execution_info::caller_address::cheat_caller_address; +pub use cheatcodes::execution_info::caller_address::{ + start_cheat_caller_address, start_cheat_caller_address_global, stop_cheat_caller_address, + stop_cheat_caller_address_global, +}; +pub use cheatcodes::execution_info::chain_id::{ + cheat_chain_id, start_cheat_chain_id, start_cheat_chain_id_global, stop_cheat_chain_id, + stop_cheat_chain_id_global, +}; +pub use cheatcodes::execution_info::fee_data_availability_mode::{ + cheat_fee_data_availability_mode, start_cheat_fee_data_availability_mode, + start_cheat_fee_data_availability_mode_global, stop_cheat_fee_data_availability_mode, + stop_cheat_fee_data_availability_mode_global, +}; +pub use cheatcodes::execution_info::max_fee::{ + cheat_max_fee, start_cheat_max_fee, start_cheat_max_fee_global, stop_cheat_max_fee, + stop_cheat_max_fee_global, +}; +pub use cheatcodes::execution_info::nonce::{ + cheat_nonce, start_cheat_nonce, start_cheat_nonce_global, stop_cheat_nonce, + stop_cheat_nonce_global, +}; +pub use cheatcodes::execution_info::nonce_data_availability_mode::{ + cheat_nonce_data_availability_mode, start_cheat_nonce_data_availability_mode, + start_cheat_nonce_data_availability_mode_global, stop_cheat_nonce_data_availability_mode, + stop_cheat_nonce_data_availability_mode_global, +}; +pub use cheatcodes::execution_info::paymaster_data::{ + cheat_paymaster_data, start_cheat_paymaster_data, start_cheat_paymaster_data_global, + stop_cheat_paymaster_data, stop_cheat_paymaster_data_global, +}; +pub use cheatcodes::execution_info::resource_bounds::{ + cheat_resource_bounds, start_cheat_resource_bounds, start_cheat_resource_bounds_global, + stop_cheat_resource_bounds, stop_cheat_resource_bounds_global, +}; +pub use cheatcodes::execution_info::sequencer_address::{ + cheat_sequencer_address, start_cheat_sequencer_address, start_cheat_sequencer_address_global, + stop_cheat_sequencer_address, stop_cheat_sequencer_address_global, +}; +pub use cheatcodes::execution_info::signature::{ + cheat_signature, start_cheat_signature, start_cheat_signature_global, stop_cheat_signature, + stop_cheat_signature_global, +}; +pub use cheatcodes::execution_info::tip::{ + cheat_tip, start_cheat_tip, start_cheat_tip_global, stop_cheat_tip, stop_cheat_tip_global, +}; +pub use cheatcodes::execution_info::transaction_hash::{ + cheat_transaction_hash, start_cheat_transaction_hash, start_cheat_transaction_hash_global, + stop_cheat_transaction_hash, stop_cheat_transaction_hash_global, +}; +pub use cheatcodes::execution_info::version::{ + cheat_transaction_version, start_cheat_transaction_version, + start_cheat_transaction_version_global, stop_cheat_transaction_version, + stop_cheat_transaction_version_global, }; -pub use cheatcodes::storage::store; -pub use cheatcodes::storage::load; -pub use cheatcodes::storage::map_entry_address; -pub use cheatcodes::storage::interact_with_state; +pub use cheatcodes::generate_random_felt::generate_random_felt; -pub use cheatcodes::erc20::set_balance; -pub use cheatcodes::erc20::Token; -pub use cheatcodes::erc20::TokenImpl; -pub use cheatcodes::erc20::TokenTrait; -pub use cheatcodes::erc20::CustomToken; +pub use cheatcodes::l1_handler::L1Handler; +pub use cheatcodes::l1_handler::L1HandlerTrait; -pub use cheatcodes::CheatSpan; -pub use cheatcodes::ReplaceBytecodeError; -pub use cheatcodes::test_address; -pub use cheatcodes::test_selector; -pub use cheatcodes::mock_call; -pub use cheatcodes::start_mock_call; -pub use cheatcodes::stop_mock_call; -pub use cheatcodes::replace_bytecode; +pub use cheatcodes::message_to_l1::{ + MessageToL1, MessageToL1FilterTrait, MessageToL1Spy, MessageToL1SpyAssertionsTrait, + MessageToL1SpyTrait, spy_messages_to_l1, +}; -pub use cheatcodes::execution_info::caller_address::cheat_caller_address; -pub use cheatcodes::execution_info::caller_address::start_cheat_caller_address_global; -pub use cheatcodes::execution_info::caller_address::stop_cheat_caller_address; -pub use cheatcodes::execution_info::caller_address::stop_cheat_caller_address_global; -pub use cheatcodes::execution_info::caller_address::start_cheat_caller_address; -pub use cheatcodes::execution_info::block_number::cheat_block_number; -pub use cheatcodes::execution_info::block_number::start_cheat_block_number_global; -pub use cheatcodes::execution_info::block_number::stop_cheat_block_number; -pub use cheatcodes::execution_info::block_number::stop_cheat_block_number_global; -pub use cheatcodes::execution_info::block_number::start_cheat_block_number; -pub use cheatcodes::execution_info::block_timestamp::cheat_block_timestamp; -pub use cheatcodes::execution_info::block_timestamp::start_cheat_block_timestamp_global; -pub use cheatcodes::execution_info::block_timestamp::stop_cheat_block_timestamp; -pub use cheatcodes::execution_info::block_timestamp::stop_cheat_block_timestamp_global; -pub use cheatcodes::execution_info::block_timestamp::start_cheat_block_timestamp; -pub use cheatcodes::execution_info::sequencer_address::cheat_sequencer_address; -pub use cheatcodes::execution_info::sequencer_address::start_cheat_sequencer_address_global; -pub use cheatcodes::execution_info::sequencer_address::stop_cheat_sequencer_address; -pub use cheatcodes::execution_info::sequencer_address::stop_cheat_sequencer_address_global; -pub use cheatcodes::execution_info::sequencer_address::start_cheat_sequencer_address; -pub use cheatcodes::execution_info::version::cheat_transaction_version; -pub use cheatcodes::execution_info::version::start_cheat_transaction_version_global; -pub use cheatcodes::execution_info::version::stop_cheat_transaction_version; -pub use cheatcodes::execution_info::version::stop_cheat_transaction_version_global; -pub use cheatcodes::execution_info::version::start_cheat_transaction_version; -pub use cheatcodes::execution_info::max_fee::cheat_max_fee; -pub use cheatcodes::execution_info::max_fee::start_cheat_max_fee_global; -pub use cheatcodes::execution_info::max_fee::stop_cheat_max_fee; -pub use cheatcodes::execution_info::max_fee::stop_cheat_max_fee_global; -pub use cheatcodes::execution_info::max_fee::start_cheat_max_fee; -pub use cheatcodes::execution_info::signature::cheat_signature; -pub use cheatcodes::execution_info::signature::start_cheat_signature_global; -pub use cheatcodes::execution_info::signature::stop_cheat_signature; -pub use cheatcodes::execution_info::signature::stop_cheat_signature_global; -pub use cheatcodes::execution_info::signature::start_cheat_signature; -pub use cheatcodes::execution_info::transaction_hash::cheat_transaction_hash; -pub use cheatcodes::execution_info::transaction_hash::start_cheat_transaction_hash_global; -pub use cheatcodes::execution_info::transaction_hash::stop_cheat_transaction_hash; -pub use cheatcodes::execution_info::transaction_hash::stop_cheat_transaction_hash_global; -pub use cheatcodes::execution_info::transaction_hash::start_cheat_transaction_hash; -pub use cheatcodes::execution_info::chain_id::cheat_chain_id; -pub use cheatcodes::execution_info::chain_id::start_cheat_chain_id_global; -pub use cheatcodes::execution_info::chain_id::stop_cheat_chain_id; -pub use cheatcodes::execution_info::chain_id::stop_cheat_chain_id_global; -pub use cheatcodes::execution_info::chain_id::start_cheat_chain_id; -pub use cheatcodes::execution_info::nonce::cheat_nonce; -pub use cheatcodes::execution_info::nonce::start_cheat_nonce_global; -pub use cheatcodes::execution_info::nonce::stop_cheat_nonce; -pub use cheatcodes::execution_info::nonce::stop_cheat_nonce_global; -pub use cheatcodes::execution_info::nonce::start_cheat_nonce; -pub use cheatcodes::execution_info::resource_bounds::cheat_resource_bounds; -pub use cheatcodes::execution_info::resource_bounds::start_cheat_resource_bounds_global; -pub use cheatcodes::execution_info::resource_bounds::stop_cheat_resource_bounds; -pub use cheatcodes::execution_info::resource_bounds::stop_cheat_resource_bounds_global; -pub use cheatcodes::execution_info::resource_bounds::start_cheat_resource_bounds; -pub use cheatcodes::execution_info::tip::cheat_tip; -pub use cheatcodes::execution_info::tip::start_cheat_tip_global; -pub use cheatcodes::execution_info::tip::stop_cheat_tip; -pub use cheatcodes::execution_info::tip::stop_cheat_tip_global; -pub use cheatcodes::execution_info::tip::start_cheat_tip; -pub use cheatcodes::execution_info::paymaster_data::cheat_paymaster_data; -pub use cheatcodes::execution_info::paymaster_data::start_cheat_paymaster_data_global; -pub use cheatcodes::execution_info::paymaster_data::stop_cheat_paymaster_data; -pub use cheatcodes::execution_info::paymaster_data::stop_cheat_paymaster_data_global; -pub use cheatcodes::execution_info::paymaster_data::start_cheat_paymaster_data; -pub use cheatcodes::execution_info::nonce_data_availability_mode::cheat_nonce_data_availability_mode; -pub use cheatcodes::execution_info::nonce_data_availability_mode::start_cheat_nonce_data_availability_mode_global; -pub use cheatcodes::execution_info::nonce_data_availability_mode::stop_cheat_nonce_data_availability_mode; -pub use cheatcodes::execution_info::nonce_data_availability_mode::stop_cheat_nonce_data_availability_mode_global; -pub use cheatcodes::execution_info::nonce_data_availability_mode::start_cheat_nonce_data_availability_mode; -pub use cheatcodes::execution_info::fee_data_availability_mode::cheat_fee_data_availability_mode; -pub use cheatcodes::execution_info::fee_data_availability_mode::start_cheat_fee_data_availability_mode_global; -pub use cheatcodes::execution_info::fee_data_availability_mode::stop_cheat_fee_data_availability_mode; -pub use cheatcodes::execution_info::fee_data_availability_mode::stop_cheat_fee_data_availability_mode_global; -pub use cheatcodes::execution_info::fee_data_availability_mode::start_cheat_fee_data_availability_mode; -pub use cheatcodes::execution_info::account_deployment_data::cheat_account_deployment_data; -pub use cheatcodes::execution_info::account_deployment_data::start_cheat_account_deployment_data_global; -pub use cheatcodes::execution_info::account_deployment_data::stop_cheat_account_deployment_data; -pub use cheatcodes::execution_info::account_deployment_data::stop_cheat_account_deployment_data_global; -pub use cheatcodes::execution_info::account_deployment_data::start_cheat_account_deployment_data; -pub use cheatcodes::execution_info::account_contract_address::cheat_account_contract_address; -pub use cheatcodes::execution_info::account_contract_address::start_cheat_account_contract_address_global; -pub use cheatcodes::execution_info::account_contract_address::stop_cheat_account_contract_address; -pub use cheatcodes::execution_info::account_contract_address::stop_cheat_account_contract_address_global; -pub use cheatcodes::execution_info::account_contract_address::start_cheat_account_contract_address; +pub use cheatcodes::storage::store; +pub use cheatcodes::storage::{interact_with_state, load, map_entry_address}; +pub use cheatcodes::{ + ReplaceBytecodeError, mock_call, replace_bytecode, start_mock_call, stop_mock_call, + test_address, test_selector, +}; -pub use cheatcodes::generate_random_felt::generate_random_felt; +pub mod byte_array; -pub use cheatcodes::block_hash::cheat_block_hash; -pub use cheatcodes::block_hash::start_cheat_block_hash_global; -pub use cheatcodes::block_hash::stop_cheat_block_hash; -pub use cheatcodes::block_hash::stop_cheat_block_hash_global; -pub use cheatcodes::block_hash::start_cheat_block_hash; +mod cheatcode; -pub mod fuzzable; +mod config_types; + +pub mod env; pub mod fs; -pub mod env; +pub mod fuzzable; pub mod signature; pub mod trace; -pub mod byte_array; - -mod config_types; - -mod cheatcode; - #[doc(hidden)] pub mod _internals { + pub use cheatcode::{is_config_run, save_fuzzer_arg}; use super::cheatcode; - pub use cheatcode::is_config_run; - pub use cheatcode::save_fuzzer_arg; - pub use super::config_types; } diff --git a/snforge_std/src/signature/secp256k1_curve.cairo b/snforge_std/src/signature/secp256k1_curve.cairo index 5069a272e2..33bd0364f3 100644 --- a/snforge_std/src/signature/secp256k1_curve.cairo +++ b/snforge_std/src/signature/secp256k1_curve.cairo @@ -1,13 +1,12 @@ -use core::serde::Serde; use core::option::OptionTrait; +use core::serde::Serde; +use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; +use starknet::SyscallResultTrait; +use starknet::secp256_trait::{Secp256PointTrait, Secp256Trait, is_valid_signature}; use starknet::secp256k1::Secp256k1Point; -use starknet::secp256_trait::{is_valid_signature, Secp256Trait, Secp256PointTrait}; -use starknet::{SyscallResultTrait}; use crate::cheatcode::execute_cheatcode_and_deserialize; use super::SignError; -use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; - pub impl Secp256k1CurveKeyPairImpl of KeyPairTrait { fn generate() -> KeyPair { let (secret_key, pk_x, pk_y) = execute_cheatcode_and_deserialize::< diff --git a/snforge_std/src/signature/secp256r1_curve.cairo b/snforge_std/src/signature/secp256r1_curve.cairo index dca875dcf4..b1c42928e0 100644 --- a/snforge_std/src/signature/secp256r1_curve.cairo +++ b/snforge_std/src/signature/secp256r1_curve.cairo @@ -1,9 +1,9 @@ -use starknet::secp256r1::Secp256r1Point; -use starknet::secp256_trait::{is_valid_signature, Secp256Trait, Secp256PointTrait}; +use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; use starknet::SyscallResultTrait; +use starknet::secp256_trait::{Secp256PointTrait, Secp256Trait, is_valid_signature}; +use starknet::secp256r1::Secp256r1Point; use crate::cheatcode::execute_cheatcode_and_deserialize; use super::SignError; -use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; pub impl Secp256r1CurveKeyPairImpl of KeyPairTrait { fn generate() -> KeyPair { diff --git a/snforge_std/src/signature/stark_curve.cairo b/snforge_std/src/signature/stark_curve.cairo index 5f8af3fb7c..2ac8448bdc 100644 --- a/snforge_std/src/signature/stark_curve.cairo +++ b/snforge_std/src/signature/stark_curve.cairo @@ -1,10 +1,9 @@ +use core::ec::{EcPoint, EcPointImpl, stark_curve}; use core::ecdsa::check_ecdsa_signature; -use core::ec::{EcPointImpl, EcPoint, stark_curve}; +use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; use crate::cheatcode::execute_cheatcode_and_deserialize; use super::SignError; -use snforge_std::signature::{KeyPair, KeyPairTrait, SignerTrait, VerifierTrait}; - pub impl StarkCurveKeyPairImpl of KeyPairTrait { fn generate() -> KeyPair { let (secret_key, public_key) = execute_cheatcode_and_deserialize::< diff --git a/snforge_std/src/trace.cairo b/snforge_std/src/trace.cairo index c562467b92..161bd43fd3 100644 --- a/snforge_std/src/trace.cairo +++ b/snforge_std/src/trace.cairo @@ -68,8 +68,7 @@ pub enum CallFailure { pub fn get_call_trace() -> CallTrace { execute_cheatcode_and_deserialize::<'get_call_trace'>(array![].span()) } - -use core::fmt::{Display, Formatter, Error, Debug}; +use core::fmt::{Debug, Display, Error, Formatter}; impl DisplayCallResult of Display { fn fmt(self: @CallResult, ref f: Formatter) -> Result<(), Error> { @@ -86,7 +85,7 @@ impl DisplayCallResult of Display { CallFailure::Error(msg) => { Display::fmt(msg, ref f)?; }, }; }, - }; + } Result::Ok(()) } } @@ -196,7 +195,7 @@ impl DisplayIndentedCallTraceArray of Display>> { if i != trace_len { write!(f, ",\n").unwrap(); } - }; + } Result::Ok(()) }