chore: cleaning (#174)

listings/advanced-concepts/hash_solidity_compatible/src/contract.cairo

@@ -6,7 +6,6 @@ pub trait ISolidityHashExample<TContractState> {
 #[starknet::contract]
 pub mod SolidityHashExample {
     use keccak::{keccak_u256s_be_inputs};
-    use core::array::Span;
     use core::integer;
 
     #[storage]

listings/advanced-concepts/hash_solidity_compatible/src/tests.cairo

@@ -17,7 +17,7 @@ mod tests {
     #[available_gas(2000000000)]
     fn get_same_hash_solidity() {
         let mut state = setup();
-        let mut array: Array<u256> = ArrayTrait::new();
+        let mut array: Array<u256> = array![];
         array.append(1);
 
         let hash_expected: u256 =

listings/advanced-concepts/hash_trait/src/hash_trait.cairo

@@ -1,5 +1,5 @@
 #[starknet::interface]
-trait IHashTrait<T> {
+pub trait IHashTrait<T> {
     fn save_user_with_poseidon(
         ref self: T, id: felt252, username: felt252, password: felt252
     ) -> felt252;
@@ -10,7 +10,7 @@ trait IHashTrait<T> {
 
 // ANCHOR: hash
 #[starknet::contract]
-mod HashTraits {
+pub mod HashTraits {
     use core::hash::{HashStateTrait, HashStateExTrait};
     use core::{pedersen::PedersenTrait, poseidon::PoseidonTrait};
 
@@ -63,15 +63,15 @@ mod HashTraits {
 
 #[cfg(test)]
 mod tests {
-    use core::starknet::SyscallResultTrait;
+    use starknet::SyscallResultTrait;
     use super::{HashTraits, IHashTraitDispatcher, IHashTraitDispatcherTrait};
 
     use core::hash::{HashStateTrait, HashStateExTrait};
     use core::{pedersen::PedersenTrait, poseidon::PoseidonTrait};
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> IHashTraitDispatcher {
-        let mut calldata = ArrayTrait::new();
+        let mut calldata = array![];
         let (address, _) = deploy_syscall(
             HashTraits::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )

listings/advanced-concepts/store_using_packing/src/contract.cairo

@@ -14,9 +14,6 @@ pub trait ITime<TContractState> {
 pub mod TimeContract {
     use super::Time;
     use starknet::storage_access::StorePacking;
-    use core::traits::{Into, TryInto, DivRem};
-    use core::option::OptionTrait;
-    use core::serde::Serde;
 
     #[storage]
     struct Storage {

listings/advanced-concepts/store_using_packing/src/tests.cairo

@@ -1,5 +1,5 @@
 mod tests {
-    use core::starknet::SyscallResultTrait;
+    use starknet::SyscallResultTrait;
     use store_using_packing::contract::{TimeContract, Time, ITimeDispatcher, ITimeDispatcherTrait};
 
     use starknet::syscalls::deploy_syscall;
@@ -8,7 +8,7 @@ mod tests {
     #[available_gas(20000000)]
     fn test_packing() {
         // Set up.
-        let mut calldata: Array<felt252> = ArrayTrait::new();
+        let mut calldata: Array<felt252> = array![];
         let (address0, _) = deploy_syscall(
             TimeContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )

listings/advanced-concepts/storing_arrays/src/contract.cairo

@@ -1,5 +1,4 @@
-use core::result::ResultTrait;
-use core::starknet::SyscallResultTrait;
+use starknet::SyscallResultTrait;
 use starknet::{Store, SyscallResult};
 use starknet::storage_access::{StorageBaseAddress, storage_address_from_base_and_offset};
 use starknet::syscalls::{storage_read_syscall, storage_write_syscall};
@@ -19,7 +18,7 @@ impl StoreFelt252Array of Store<Array<felt252>> {
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, mut offset: u8
     ) -> SyscallResult<Array<felt252>> {
-        let mut arr: Array<felt252> = ArrayTrait::new();
+        let mut arr: Array<felt252> = array![];
 
         // Read the stored array's length. If the length is superior to 255, the read will fail.
         let len: u8 = Store::<u8>::read_at_offset(address_domain, base, offset)

listings/advanced-concepts/storing_arrays/src/tests.cairo

@@ -1,5 +1,5 @@
 mod tests {
-    use core::starknet::SyscallResultTrait;
+    use starknet::SyscallResultTrait;
     use storing_arrays::contract::{
         StoreArrayContract, IStoreArrayContractDispatcher, IStoreArrayContractDispatcherTrait
     };
@@ -9,15 +9,15 @@ mod tests {
     #[available_gas(20000000)]
     fn test_array_storage() {
         // Set up.
-        let mut calldata: Array<felt252> = ArrayTrait::new();
+        let mut calldata: Array<felt252> = array![];
         let (address0, _) = deploy_syscall(
             StoreArrayContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )
             .unwrap_syscall();
         let mut contract = IStoreArrayContractDispatcher { contract_address: address0 };
 
         // Store an array.
-        let mut array: Array<felt252> = ArrayTrait::new();
+        let mut array: Array<felt252> = array![];
         array.append(1);
         array.append(2);
         contract.store_array(array);
@@ -34,15 +34,15 @@ mod tests {
     #[should_panic(expected: ('Storage - Span too large', 'ENTRYPOINT_FAILED'))]
     fn test_array_storage_too_large() {
         // Set up.
-        let mut calldata: Array<felt252> = ArrayTrait::new();
+        let mut calldata: Array<felt252> = array![];
         let (address0, _) = deploy_syscall(
             StoreArrayContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )
             .unwrap();
         let mut contract = IStoreArrayContractDispatcher { contract_address: address0 };
 
         // Store an array.
-        let mut array: Array<felt252> = ArrayTrait::new();
+        let mut array: Array<felt252> = array![];
         let mut i = 0;
         loop {
             if i == 256 {

listings/advanced-concepts/struct_as_mapping_key/src/test.cairo

@@ -1,5 +1,5 @@
 mod tests {
-    use core::starknet::SyscallResultTrait;
+    use starknet::SyscallResultTrait;
     use struct_as_mapping_key::contract::{PetRegistry, Pet};
     use starknet::syscalls::deploy_syscall;
 
@@ -13,7 +13,7 @@ mod tests {
     #[available_gas(20000000)]
     fn test_e2e() {
         // Set up.
-        let mut calldata: Array<felt252> = ArrayTrait::new();
+        let mut calldata: Array<felt252> = array![];
         let (address0, _) = deploy_syscall(
             PetRegistry::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )

listings/advanced-concepts/using_lists/src/contract.cairo

@@ -19,9 +19,6 @@ pub trait IListExample<TContractState> {
 #[starknet::contract]
 pub mod ListExample {
     use super::Task;
-
-    use core::option::OptionTrait;
-    use core::result::ResultTrait;
     use alexandria_storage::list::{List, ListTrait};
 
     #[storage]

listings/advanced-concepts/using_lists/src/tests.cairo

@@ -1,5 +1,4 @@
 use using_lists::contract::IListExample;
-use core::array::ArrayTrait;
 use using_lists::contract::{Task, ListExample};
 use using_lists::contract::ListExample::{
     amountContractMemberStateTrait, tasksContractMemberStateTrait

listings/advanced-concepts/write_to_any_slot/src/contract.cairo

@@ -31,7 +31,7 @@ pub mod WriteToAnySlot {
         }
     }
     pub fn get_address_from_name(variable_name: felt252) -> StorageAddress {
-        let mut data: Array<felt252> = ArrayTrait::new();
+        let mut data: Array<felt252> = array![];
         data.append(variable_name);
         let hashed_name: felt252 = poseidon_hash_span(data.span());
         let MASK_250: u256 = 0x03ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;

listings/advanced-concepts/write_to_any_slot/src/tests.cairo

@@ -16,7 +16,7 @@ mod tests {
     #[available_gas(2000000000)]
     fn test_read_write() {
         // Set up.
-        let mut calldata: Array<felt252> = ArrayTrait::new();
+        let mut calldata: Array<felt252> = array![];
         let (address0, _) = deploy_syscall(
             WriteToAnySlot::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false
         )

listings/applications/components/src/contracts/owned.cairo

@@ -1,11 +1,11 @@
 // ANCHOR: contract
 #[starknet::interface]
-trait IOwned<TContractState> {
+pub trait IOwned<TContractState> {
     fn do_something(ref self: TContractState);
 }
 
 #[starknet::contract]
-mod OwnedContract {
+pub mod OwnedContract {
     use components::ownable::{IOwnable, ownable_component, ownable_component::OwnableInternalTrait};
 
     component!(path: ownable_component, storage: ownable, event: OwnableEvent);
@@ -50,13 +50,14 @@ mod tests {
     use starknet::{contract_address_const, ContractAddress};
     use starknet::testing::{set_caller_address, set_contract_address};
     use starknet::storage::StorageMemberAccessTrait;
+    use starknet::SyscallResultTrait;
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> (IOwnedDispatcher, IOwnableDispatcher) {
         let (contract_address, _) = deploy_syscall(
             OwnedContract::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false
         )
-            .unwrap();
+            .unwrap_syscall();
 
         (IOwnedDispatcher { contract_address }, IOwnableDispatcher { contract_address },)
     }

listings/applications/components/src/contracts/switch.cairo

@@ -1,6 +1,6 @@
 // ANCHOR: contract
 #[starknet::contract]
-mod SwitchContract {
+pub mod SwitchContract {
     use components::switchable::switchable_component;
 
     component!(path: switchable_component, storage: switch, event: SwitchableEvent);
@@ -33,7 +33,7 @@ mod tests {
     use components::switchable::switchable_component::SwitchableInternalTrait;
     use components::switchable::ISwitchable;
 
-    use core::starknet::storage::StorageMemberAccessTrait;
+    use starknet::storage::StorageMemberAccessTrait;
     use super::SwitchContract;
 
     fn STATE() -> SwitchContract::ContractState {

listings/applications/components/src/contracts/tests/switch_collision_tests.cairo

@@ -7,13 +7,14 @@ mod switch_collision_tests {
     };
 
     use starknet::storage::StorageMemberAccessTrait;
+    use starknet::SyscallResultTrait;
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> (ISwitchCollisionDispatcher, ISwitchableDispatcher) {
         let (contract_address, _) = deploy_syscall(
             SwitchCollisionContract::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false
         )
-            .unwrap();
+            .unwrap_syscall();
 
         (
             ISwitchCollisionDispatcher { contract_address },

listings/applications/components_dependencies/src/contract_countable.cairo

@@ -43,12 +43,12 @@ mod CountableContract {
 
 #[cfg(test)]
 mod tests {
-    use core::starknet::SyscallResultTrait;
     use super::CountableContract;
     use components::countable::{ICountable, ICountableDispatcher, ICountableDispatcherTrait};
     use components::switchable::{ISwitchable, ISwitchableDispatcher, ISwitchableDispatcherTrait};
 
-    use core::starknet::storage::StorageMemberAccessTrait;
+    use starknet::storage::StorageMemberAccessTrait;
+    use starknet::SyscallResultTrait;
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> (ICountableDispatcher, ISwitchableDispatcher) {

listings/applications/components_dependencies/src/contract_countable_switchable.cairo

@@ -37,12 +37,12 @@ mod CountableContract {
 
 #[cfg(test)]
 mod tests {
-    use core::starknet::SyscallResultTrait;
     use super::CountableContract;
     use components::countable::{ICountable, ICountableDispatcher, ICountableDispatcherTrait};
     use components::switchable::{ISwitchable, ISwitchableDispatcher, ISwitchableDispatcherTrait};
 
-    use core::starknet::storage::StorageMemberAccessTrait;
+    use starknet::storage::StorageMemberAccessTrait;
+    use starknet::SyscallResultTrait;
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> (ICountableDispatcher, ISwitchableDispatcher) {

listings/applications/components_dependencies/src/contract_countable_switchable_internal.cairo

@@ -1,6 +1,6 @@
 // ANCHOR: contract
 #[starknet::contract]
-mod CountableContract {
+pub mod CountableContract {
     use components_dependencies::countable_internal_dep_switch::countable_component;
     use components::switchable::switchable_component;
 
@@ -37,12 +37,12 @@ mod CountableContract {
 
 #[cfg(test)]
 mod tests {
-    use core::starknet::SyscallResultTrait;
     use super::CountableContract;
     use components::countable::{ICountable, ICountableDispatcher, ICountableDispatcherTrait};
     use components::switchable::{ISwitchable, ISwitchableDispatcher, ISwitchableDispatcherTrait};
 
-    use core::starknet::storage::StorageMemberAccessTrait;
+    use starknet::storage::StorageMemberAccessTrait;
+    use starknet::SyscallResultTrait;
     use starknet::syscalls::deploy_syscall;
 
     fn deploy() -> (ICountableDispatcher, ISwitchableDispatcher) {

listings/applications/constant_product_amm/src/tests.cairo

@@ -1,5 +1,5 @@
 #[starknet::contract]
-mod ERC20Token {
+pub mod ERC20Token {
     use openzeppelin::token::erc20::ERC20Component;
     use openzeppelin::token::erc20::interface::IERC20Metadata;
     use starknet::ContractAddress;
@@ -64,10 +64,8 @@ mod ERC20Token {
 }
 
 mod tests {
-    use core::option::OptionTrait;
-    use core::traits::TryInto;
-    use openzeppelin::token::erc20::{interface::IERC20Dispatcher, interface::IERC20DispatcherTrait};
     use super::ERC20Token;
+    use openzeppelin::token::erc20::{interface::IERC20Dispatcher, interface::IERC20DispatcherTrait};
     use openzeppelin::utils::serde::SerializedAppend;
     use openzeppelin::tests::utils;
 

listings/applications/simple_vault/src/simple_vault.cairo

@@ -1,9 +1,9 @@
-use starknet::{ContractAddress};
+use starknet::ContractAddress;
 
 // In order to make contract calls within our Vault,
 // we need to have the interface of the remote ERC20 contract defined to import the Dispatcher.
 #[starknet::interface]
-trait IERC20<TContractState> {
+pub trait IERC20<TContractState> {
     fn name(self: @TContractState) -> felt252;
     fn symbol(self: @TContractState) -> felt252;
     fn decimals(self: @TContractState) -> u8;
@@ -18,15 +18,16 @@ trait IERC20<TContractState> {
 }
 
 #[starknet::interface]
-trait ISimpleVault<TContractState> {
+pub trait ISimpleVault<TContractState> {
     fn deposit(ref self: TContractState, amount: u256);
     fn withdraw(ref self: TContractState, shares: u256);
 }
 
 #[starknet::contract]
-mod SimpleVault {
+pub mod SimpleVault {
     use super::{IERC20Dispatcher, IERC20DispatcherTrait};
     use starknet::{ContractAddress, get_caller_address, get_contract_address};
+
     #[storage]
     struct Storage {
         token: IERC20Dispatcher,

listings/applications/upgradeable_contract/src/upgradeable_contract_v0.cairo

@@ -2,13 +2,13 @@
 use starknet::class_hash::ClassHash;
 
 #[starknet::interface]
-trait IUpgradeableContract<TContractState> {
+pub trait IUpgradeableContract<TContractState> {
     fn upgrade(ref self: TContractState, impl_hash: ClassHash);
     fn version(self: @TContractState) -> u8;
 }
 
 #[starknet::contract]
-mod UpgradeableContract_V0 {
+pub mod UpgradeableContract_V0 {
     use starknet::class_hash::ClassHash;
     use starknet::SyscallResultTrait;
     use core::num::traits::Zero;

listings/applications/upgradeable_contract/src/upgradeable_contract_v1.cairo

@@ -1,21 +1,20 @@
 use starknet::class_hash::ClassHash;
 
 #[starknet::interface]
-trait IUpgradeableContract<TContractState> {
+pub trait IUpgradeableContract<TContractState> {
     fn upgrade(ref self: TContractState, impl_hash: ClassHash);
     fn version(self: @TContractState) -> u8;
 }
 
 #[starknet::contract]
-mod UpgradeableContract_V1 {
+pub mod UpgradeableContract_V1 {
     use starknet::class_hash::ClassHash;
     use starknet::SyscallResultTrait;
     use core::num::traits::Zero;
 
     #[storage]
     struct Storage {}
 
-
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {

listings/getting-started/cairo_cheatsheet/src/array_example.cairo

@@ -1,5 +1,5 @@
 fn array() -> bool {
-    let mut arr = ArrayTrait::<u32>::new();
+    let mut arr = array![];
     arr.append(10);
     arr.append(20);
     arr.append(30);