Skip to content

Run scarbfmt #3419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ trait IByteArrayPanickingContractProxy<TContractState> {
#[starknet::contract]
mod ByteArrayPanickingContractProxy {
use starknet::ContractAddress;
use super::{IByteArrayPanickingContractDispatcherTrait, IByteArrayPanickingContractDispatcher};
use super::{IByteArrayPanickingContractDispatcher, IByteArrayPanickingContractDispatcherTrait};

#[storage]
struct Storage {}
Expand Down
4 changes: 2 additions & 2 deletions crates/cheatnet/tests/contracts/src/cheat_block_hash.cairo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod checker;
mod constructor_checker;
mod checker_proxy;
mod checker_library_call;
mod checker_proxy;
mod constructor_checker;
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ trait ICheatBlockHashCheckerLibCall<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ trait ICheatBlockHashCheckerProxy<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ trait IConstructorCheatBlockHashChecker<TContractState> {

#[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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod checker;
mod constructor_checker;
mod checker_library_call;
mod checker_proxy;
mod constructor_checker;
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ trait ICheatBlockNumberCheckerLibCall<TContractState> {

#[starknet::contract]
mod CheatBlockNumberCheckerLibCall {
use super::{ICheatBlockNumberCheckerDispatcherTrait, ICheatBlockNumberCheckerLibraryDispatcher};
use starknet::ClassHash;
use super::{ICheatBlockNumberCheckerDispatcherTrait, ICheatBlockNumberCheckerLibraryDispatcher};

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ trait ICheatBlockNumberCheckerProxy<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod checker;
mod constructor_checker;
mod checker_library_call;
mod checker_proxy;
mod constructor_checker;
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ trait ICheatBlockTimestampCheckerLibCall<TContractState> {

#[starknet::contract]
mod CheatBlockTimestampCheckerLibCall {
use starknet::ClassHash;
use super::{
ICheatBlockTimestampCheckerDispatcherTrait, ICheatBlockTimestampCheckerLibraryDispatcher,
};
use starknet::ClassHash;

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ trait ICheatBlockTimestampCheckerProxy<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ trait ICheatCallerAddressChecker<TContractState> {

#[starknet::contract]
mod CheatCallerAddressChecker {
use core::{option::Option, traits::Into};
use core::option::Option;
use core::traits::Into;

#[storage]
struct Storage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ trait ICairo0Contract<TContractState> {
#[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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ trait ICheatCallerAddressCheckerLibCall<TContractState> {

#[starknet::contract]
mod CheatCallerAddressCheckerLibCall {
use starknet::ClassHash;
use super::{
ICheatCallerAddressCheckerDispatcherTrait, ICheatCallerAddressCheckerLibraryDispatcher,
};
use starknet::ClassHash;

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ trait ICheatCallerAddressCheckerProxy<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod checker;
mod constructor_checker;
mod checker_library_call;
mod checker_proxy;
mod constructor_checker;
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ trait ICheatSequencerAddressCheckerLibCall<TContractState> {

#[starknet::contract]
mod CheatSequencerAddressCheckerLibCall {
use starknet::{ClassHash, ContractAddress};
use super::{
ICheatSequencerAddressCheckerDispatcherTrait,
ICheatSequencerAddressCheckerLibraryDispatcher,
};
use starknet::{ClassHash, ContractAddress};

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ trait ICheatSequencerAddressCheckerProxy<TContractState> {

#[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 {}
Expand Down
4 changes: 2 additions & 2 deletions crates/cheatnet/tests/contracts/src/cheat_tx_info.cairo
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ trait ITxHashCheckerProxy<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ trait ICheatTxInfoChecker<TContractState> {

#[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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ trait ICheatTxInfoCheckerLibCall<TContractState> {

#[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 {}
Expand Down
2 changes: 1 addition & 1 deletion crates/cheatnet/tests/contracts/src/common.cairo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mod hello_starknet;
mod constructor_simple;
mod constructor_simple2;
mod hello_starknet;
8 changes: 4 additions & 4 deletions crates/cheatnet/tests/contracts/src/events.cairo
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ trait ISpyEventsChecker<TContractState> {

#[starknet::contract]
mod SpyEventsChecker {
use starknet::ContractAddress;
use starknet::SyscallResultTrait;
use starknet::{ContractAddress, SyscallResultTrait};

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ trait ISpyEventsChecker<TContractState> {
#[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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use starknet::ContractAddress;
use starknet::ClassHash;
use starknet::{ClassHash, ContractAddress};

#[starknet::interface]
trait ISpyEventsLibCall<TContractState> {
Expand Down
20 changes: 10 additions & 10 deletions crates/cheatnet/tests/contracts/src/lib.cairo
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion crates/cheatnet/tests/contracts/src/mock.cairo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mod mock_checker;
mod constructor_mock_checker;
mod mock_checker;
mod mock_checker_library_call;
mod mock_checker_proxy;
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ trait IMockChecker<TContractState> {

#[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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ trait IMockCheckerLibCall<TContractState> {

#[starknet::contract]
mod MockCheckerLibCall {
use super::{IMockCheckerDispatcherTrait, IMockCheckerLibraryDispatcher};
use starknet::ClassHash;
use super::{IMockCheckerDispatcherTrait, IMockCheckerLibraryDispatcher};

#[storage]
struct Storage {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ trait IMockCheckerProxy<TContractState> {
#[starknet::contract]
mod MockCheckerProxy {
use starknet::ContractAddress;
use super::IMockCheckerDispatcherTrait;
use super::IMockCheckerDispatcher;
use super::{IMockCheckerDispatcher, IMockCheckerDispatcherTrait};

#[storage]
struct Storage {}
Expand Down
4 changes: 1 addition & 3 deletions crates/cheatnet/tests/contracts/src/panic_call.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ mod PanicCall {
fn panic_call(ref self: ContractState) {
panic(
array![
'shortstring',
0,
0x800000000000011000000000000000000000000000000000000000000000000,
'shortstring', 0, 0x800000000000011000000000000000000000000000000000000000000000000,
'shortstring2',
],
);
Expand Down
Loading
Loading