diff --git a/listings/advanced-concepts/hash_solidity_compatible/src/contract.cairo b/listings/advanced-concepts/hash_solidity_compatible/src/contract.cairo index 3bdfcfe5..08e357f5 100644 --- a/listings/advanced-concepts/hash_solidity_compatible/src/contract.cairo +++ b/listings/advanced-concepts/hash_solidity_compatible/src/contract.cairo @@ -6,7 +6,6 @@ pub trait ISolidityHashExample { #[starknet::contract] pub mod SolidityHashExample { use keccak::{keccak_u256s_be_inputs}; - use core::array::Span; use core::integer; #[storage] diff --git a/listings/advanced-concepts/hash_solidity_compatible/src/tests.cairo b/listings/advanced-concepts/hash_solidity_compatible/src/tests.cairo index 5a9fac4b..cae933bc 100644 --- a/listings/advanced-concepts/hash_solidity_compatible/src/tests.cairo +++ b/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 = ArrayTrait::new(); + let mut array: Array = array![]; array.append(1); let hash_expected: u256 = diff --git a/listings/advanced-concepts/hash_trait/src/hash_trait.cairo b/listings/advanced-concepts/hash_trait/src/hash_trait.cairo index 17e19fb9..f09592f9 100644 --- a/listings/advanced-concepts/hash_trait/src/hash_trait.cairo +++ b/listings/advanced-concepts/hash_trait/src/hash_trait.cairo @@ -1,5 +1,5 @@ #[starknet::interface] -trait IHashTrait { +pub trait IHashTrait { fn save_user_with_poseidon( ref self: T, id: felt252, username: felt252, password: felt252 ) -> felt252; @@ -10,7 +10,7 @@ trait IHashTrait { // ANCHOR: hash #[starknet::contract] -mod HashTraits { +pub mod HashTraits { use core::hash::{HashStateTrait, HashStateExTrait}; use core::{pedersen::PedersenTrait, poseidon::PoseidonTrait}; @@ -63,7 +63,7 @@ mod HashTraits { #[cfg(test)] mod tests { - use core::starknet::SyscallResultTrait; + use starknet::SyscallResultTrait; use super::{HashTraits, IHashTraitDispatcher, IHashTraitDispatcherTrait}; use core::hash::{HashStateTrait, HashStateExTrait}; @@ -71,7 +71,7 @@ mod tests { 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 ) diff --git a/listings/advanced-concepts/store_using_packing/src/contract.cairo b/listings/advanced-concepts/store_using_packing/src/contract.cairo index 00718b68..5cdb79b5 100644 --- a/listings/advanced-concepts/store_using_packing/src/contract.cairo +++ b/listings/advanced-concepts/store_using_packing/src/contract.cairo @@ -14,9 +14,6 @@ pub trait ITime { 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 { diff --git a/listings/advanced-concepts/store_using_packing/src/tests.cairo b/listings/advanced-concepts/store_using_packing/src/tests.cairo index 6d8f3630..64a99b4e 100644 --- a/listings/advanced-concepts/store_using_packing/src/tests.cairo +++ b/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 = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( TimeContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) diff --git a/listings/advanced-concepts/storing_arrays/src/contract.cairo b/listings/advanced-concepts/storing_arrays/src/contract.cairo index 1f940fd3..615ab566 100644 --- a/listings/advanced-concepts/storing_arrays/src/contract.cairo +++ b/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> { fn read_at_offset( address_domain: u32, base: StorageBaseAddress, mut offset: u8 ) -> SyscallResult> { - let mut arr: Array = ArrayTrait::new(); + let mut arr: Array = array![]; // Read the stored array's length. If the length is superior to 255, the read will fail. let len: u8 = Store::::read_at_offset(address_domain, base, offset) diff --git a/listings/advanced-concepts/storing_arrays/src/tests.cairo b/listings/advanced-concepts/storing_arrays/src/tests.cairo index 8ff0c49c..7c4093a5 100644 --- a/listings/advanced-concepts/storing_arrays/src/tests.cairo +++ b/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,7 +9,7 @@ mod tests { #[available_gas(20000000)] fn test_array_storage() { // Set up. - let mut calldata: Array = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( StoreArrayContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) @@ -17,7 +17,7 @@ mod tests { let mut contract = IStoreArrayContractDispatcher { contract_address: address0 }; // Store an array. - let mut array: Array = ArrayTrait::new(); + let mut array: Array = array![]; array.append(1); array.append(2); contract.store_array(array); @@ -34,7 +34,7 @@ mod tests { #[should_panic(expected: ('Storage - Span too large', 'ENTRYPOINT_FAILED'))] fn test_array_storage_too_large() { // Set up. - let mut calldata: Array = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( StoreArrayContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) @@ -42,7 +42,7 @@ mod tests { let mut contract = IStoreArrayContractDispatcher { contract_address: address0 }; // Store an array. - let mut array: Array = ArrayTrait::new(); + let mut array: Array = array![]; let mut i = 0; loop { if i == 256 { diff --git a/listings/advanced-concepts/struct_as_mapping_key/src/test.cairo b/listings/advanced-concepts/struct_as_mapping_key/src/test.cairo index d9d0858e..b78463ab 100644 --- a/listings/advanced-concepts/struct_as_mapping_key/src/test.cairo +++ b/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 = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( PetRegistry::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) diff --git a/listings/advanced-concepts/using_lists/src/contract.cairo b/listings/advanced-concepts/using_lists/src/contract.cairo index e58fba01..35101fa8 100644 --- a/listings/advanced-concepts/using_lists/src/contract.cairo +++ b/listings/advanced-concepts/using_lists/src/contract.cairo @@ -19,9 +19,6 @@ pub trait IListExample { #[starknet::contract] pub mod ListExample { use super::Task; - - use core::option::OptionTrait; - use core::result::ResultTrait; use alexandria_storage::list::{List, ListTrait}; #[storage] diff --git a/listings/advanced-concepts/using_lists/src/tests.cairo b/listings/advanced-concepts/using_lists/src/tests.cairo index 72224c03..8ce5c390 100644 --- a/listings/advanced-concepts/using_lists/src/tests.cairo +++ b/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 diff --git a/listings/advanced-concepts/write_to_any_slot/src/contract.cairo b/listings/advanced-concepts/write_to_any_slot/src/contract.cairo index add0c812..0a08a21b 100644 --- a/listings/advanced-concepts/write_to_any_slot/src/contract.cairo +++ b/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 = ArrayTrait::new(); + let mut data: Array = array![]; data.append(variable_name); let hashed_name: felt252 = poseidon_hash_span(data.span()); let MASK_250: u256 = 0x03ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; diff --git a/listings/advanced-concepts/write_to_any_slot/src/tests.cairo b/listings/advanced-concepts/write_to_any_slot/src/tests.cairo index 50f54cb6..371be462 100644 --- a/listings/advanced-concepts/write_to_any_slot/src/tests.cairo +++ b/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 = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( WriteToAnySlot::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) diff --git a/listings/applications/components/src/contracts/owned.cairo b/listings/applications/components/src/contracts/owned.cairo index 086f2183..3eacbdd8 100644 --- a/listings/applications/components/src/contracts/owned.cairo +++ b/listings/applications/components/src/contracts/owned.cairo @@ -1,11 +1,11 @@ // ANCHOR: contract #[starknet::interface] -trait IOwned { +pub trait IOwned { 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 },) } diff --git a/listings/applications/components/src/contracts/switch.cairo b/listings/applications/components/src/contracts/switch.cairo index 507a4df7..e6219d12 100644 --- a/listings/applications/components/src/contracts/switch.cairo +++ b/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 { diff --git a/listings/applications/components/src/contracts/tests/switch_collision_tests.cairo b/listings/applications/components/src/contracts/tests/switch_collision_tests.cairo index de89e0bc..9ffe848e 100644 --- a/listings/applications/components/src/contracts/tests/switch_collision_tests.cairo +++ b/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 }, diff --git a/listings/applications/components_dependencies/src/contract_countable.cairo b/listings/applications/components_dependencies/src/contract_countable.cairo index 581f5391..fd813427 100644 --- a/listings/applications/components_dependencies/src/contract_countable.cairo +++ b/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) { diff --git a/listings/applications/components_dependencies/src/contract_countable_switchable.cairo b/listings/applications/components_dependencies/src/contract_countable_switchable.cairo index 36e3b2d6..9ef201fa 100644 --- a/listings/applications/components_dependencies/src/contract_countable_switchable.cairo +++ b/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) { diff --git a/listings/applications/components_dependencies/src/contract_countable_switchable_internal.cairo b/listings/applications/components_dependencies/src/contract_countable_switchable_internal.cairo index e98eddcf..e52f3cb1 100644 --- a/listings/applications/components_dependencies/src/contract_countable_switchable_internal.cairo +++ b/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) { diff --git a/listings/applications/constant_product_amm/src/tests.cairo b/listings/applications/constant_product_amm/src/tests.cairo index 5147f4c3..e57774ad 100644 --- a/listings/applications/constant_product_amm/src/tests.cairo +++ b/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; diff --git a/listings/applications/simple_vault/src/simple_vault.cairo b/listings/applications/simple_vault/src/simple_vault.cairo index 11cc19e7..22cd61b9 100644 --- a/listings/applications/simple_vault/src/simple_vault.cairo +++ b/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 { +pub trait IERC20 { fn name(self: @TContractState) -> felt252; fn symbol(self: @TContractState) -> felt252; fn decimals(self: @TContractState) -> u8; @@ -18,15 +18,16 @@ trait IERC20 { } #[starknet::interface] -trait ISimpleVault { +pub trait ISimpleVault { 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, diff --git a/listings/applications/upgradeable_contract/src/upgradeable_contract_v0.cairo b/listings/applications/upgradeable_contract/src/upgradeable_contract_v0.cairo index f5063a8b..e2071b92 100644 --- a/listings/applications/upgradeable_contract/src/upgradeable_contract_v0.cairo +++ b/listings/applications/upgradeable_contract/src/upgradeable_contract_v0.cairo @@ -2,13 +2,13 @@ use starknet::class_hash::ClassHash; #[starknet::interface] -trait IUpgradeableContract { +pub trait IUpgradeableContract { 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; diff --git a/listings/applications/upgradeable_contract/src/upgradeable_contract_v1.cairo b/listings/applications/upgradeable_contract/src/upgradeable_contract_v1.cairo index 06ed16a9..b8402f85 100644 --- a/listings/applications/upgradeable_contract/src/upgradeable_contract_v1.cairo +++ b/listings/applications/upgradeable_contract/src/upgradeable_contract_v1.cairo @@ -1,13 +1,13 @@ use starknet::class_hash::ClassHash; #[starknet::interface] -trait IUpgradeableContract { +pub trait IUpgradeableContract { 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; @@ -15,7 +15,6 @@ mod UpgradeableContract_V1 { #[storage] struct Storage {} - #[event] #[derive(Drop, starknet::Event)] enum Event { diff --git a/listings/getting-started/cairo_cheatsheet/src/array_example.cairo b/listings/getting-started/cairo_cheatsheet/src/array_example.cairo index 34d84852..c06ac7cf 100644 --- a/listings/getting-started/cairo_cheatsheet/src/array_example.cairo +++ b/listings/getting-started/cairo_cheatsheet/src/array_example.cairo @@ -1,5 +1,5 @@ fn array() -> bool { - let mut arr = ArrayTrait::::new(); + let mut arr = array![]; arr.append(10); arr.append(20); arr.append(30); diff --git a/listings/getting-started/cairo_cheatsheet/src/loop_example.cairo b/listings/getting-started/cairo_cheatsheet/src/loop_example.cairo index 1d8b2b9d..5abd9885 100644 --- a/listings/getting-started/cairo_cheatsheet/src/loop_example.cairo +++ b/listings/getting-started/cairo_cheatsheet/src/loop_example.cairo @@ -1,6 +1,6 @@ fn do_loop() { // ANCHOR: sheet - let mut arr = ArrayTrait::new(); + let mut arr = array![]; // Same as ~ while (i < 10) arr.append(i++); let mut i: u32 = 0; diff --git a/listings/getting-started/cairo_cheatsheet/src/while_example.cairo b/listings/getting-started/cairo_cheatsheet/src/while_example.cairo index fbcf7b42..c9011114 100644 --- a/listings/getting-started/cairo_cheatsheet/src/while_example.cairo +++ b/listings/getting-started/cairo_cheatsheet/src/while_example.cairo @@ -1,6 +1,6 @@ fn do_loop() { // ANCHOR: sheet - let mut arr = ArrayTrait::new(); + let mut arr = array![]; let mut i: u32 = 0; while (i < 10) { diff --git a/listings/getting-started/calling_other_contracts/src/tests.cairo b/listings/getting-started/calling_other_contracts/src/tests.cairo index 75e52979..7aa699b3 100644 --- a/listings/getting-started/calling_other_contracts/src/tests.cairo +++ b/listings/getting-started/calling_other_contracts/src/tests.cairo @@ -1,23 +1,22 @@ mod tests { - use calling_other_contracts::callee::Callee::__member_module_value::InternalContractMemberStateTrait; - use core::starknet::SyscallResultTrait; - use core::traits::TryInto; - use core::result::ResultTrait; - use calling_other_contracts::callee::{Callee, ICalleeDispatcher, ICalleeDispatcherTrait}; + use calling_other_contracts::callee::{ + Callee, ICalleeDispatcher, ICalleeDispatcherTrait, Callee::valueContractMemberStateTrait + }; use calling_other_contracts::caller::{Caller, ICallerDispatcher, ICallerDispatcherTrait}; use starknet::{ContractAddress, contract_address_const}; use starknet::testing::{set_contract_address}; use starknet::syscalls::deploy_syscall; + use starknet::SyscallResultTrait; fn deploy() -> (ICalleeDispatcher, ICallerDispatcher) { - let calldata: Span = ArrayTrait::new().span(); + let calldata: Span = array![].span(); let (address_callee, _) = deploy_syscall( Callee::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata, false ) .unwrap_syscall(); let (address_caller, _) = deploy_syscall( - Caller::TEST_CLASS_HASH.try_into().unwrap(), 0, ArrayTrait::new().span(), false + Caller::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false ) .unwrap_syscall(); ( diff --git a/listings/getting-started/constructor/src/tests.cairo b/listings/getting-started/constructor/src/tests.cairo index ac461f85..0e0cef7b 100644 --- a/listings/getting-started/constructor/src/tests.cairo +++ b/listings/getting-started/constructor/src/tests.cairo @@ -1,13 +1,12 @@ mod tests { - use core::traits::Into; - use core::result::ResultTrait; use starknet::testing::set_contract_address; use starknet::{ContractAddress, contract_address_const}; + use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; - use constructor::constructor::ExampleConstructor; - // use constructor::constructor::ExampleConstructor::namesContractMemberStateTrait; - use constructor::constructor::ExampleConstructor::__member_module_names::InternalContractMemberStateTrait; + use constructor::constructor::{ + ExampleConstructor, ExampleConstructor::namesContractMemberStateTrait + }; #[test] #[available_gas(2000000000)] @@ -22,7 +21,7 @@ mod tests { let (address_0, _) = deploy_syscall( ExampleConstructor::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) - .unwrap(); + .unwrap_syscall(); let state = ExampleConstructor::unsafe_new_contract_state(); set_contract_address(address_0); diff --git a/listings/getting-started/counter/src/tests.cairo b/listings/getting-started/counter/src/tests.cairo index 78468a7e..29a00d60 100644 --- a/listings/getting-started/counter/src/tests.cairo +++ b/listings/getting-started/counter/src/tests.cairo @@ -1,17 +1,17 @@ mod tests { - use core::result::ResultTrait; use counter::contracts::{ SimpleCounter, ISimpleCounterDispatcher, ISimpleCounterDispatcherTrait }; use starknet::ContractAddress; use starknet::syscalls::deploy_syscall; + use starknet::SyscallResultTrait; fn deploy(init_value: u128) -> ISimpleCounterDispatcher { let calldata: Array = array![init_value.into()]; let (address0, _) = deploy_syscall( SimpleCounter::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) - .unwrap(); + .unwrap_syscall(); ISimpleCounterDispatcher { contract_address: address0 } } diff --git a/listings/getting-started/custom_type_serde/src/tests.cairo b/listings/getting-started/custom_type_serde/src/tests.cairo index d1f0eb02..d8a23b1b 100644 --- a/listings/getting-started/custom_type_serde/src/tests.cairo +++ b/listings/getting-started/custom_type_serde/src/tests.cairo @@ -5,16 +5,16 @@ mod tests { use custom_type_serde::contract::{ SerdeCustomType, Person, ISerdeCustomTypeDispatcher, ISerdeCustomTypeDispatcherTrait }; - use core::result::ResultTrait; use starknet::ContractAddress; use starknet::syscalls::deploy_syscall; + use starknet::SyscallResultTrait; fn deploy() -> ISerdeCustomTypeDispatcher { let calldata: Array = array![]; let (address0, _) = deploy_syscall( SerdeCustomType::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) - .unwrap(); + .unwrap_syscall(); ISerdeCustomTypeDispatcher { contract_address: address0 } } diff --git a/listings/getting-started/errors/src/custom_errors.cairo b/listings/getting-started/errors/src/custom_errors.cairo index a97e989c..f8f4a24a 100644 --- a/listings/getting-started/errors/src/custom_errors.cairo +++ b/listings/getting-started/errors/src/custom_errors.cairo @@ -4,13 +4,13 @@ pub mod Errors { } #[starknet::interface] -trait ICustomErrorsExample { +pub trait ICustomErrorsExample { fn test_assert(self: @TContractState, i: u256); fn test_panic(self: @TContractState, i: u256); } #[starknet::contract] -mod CustomErrorsExample { +pub mod CustomErrorsExample { use super::Errors; #[storage] diff --git a/listings/getting-started/errors/src/simple_errors.cairo b/listings/getting-started/errors/src/simple_errors.cairo index a7c29f29..10f2645d 100644 --- a/listings/getting-started/errors/src/simple_errors.cairo +++ b/listings/getting-started/errors/src/simple_errors.cairo @@ -1,10 +1,11 @@ #[starknet::interface] -trait IErrorsExample { +pub trait IErrorsExample { fn test_assert(self: @TContractState, i: u256); fn test_panic(self: @TContractState, i: u256); } + #[starknet::contract] -mod ErrorsExample { +pub mod ErrorsExample { #[storage] struct Storage {} diff --git a/listings/getting-started/errors/src/vault_errors.cairo b/listings/getting-started/errors/src/vault_errors.cairo index eb015fea..71bc8724 100644 --- a/listings/getting-started/errors/src/vault_errors.cairo +++ b/listings/getting-started/errors/src/vault_errors.cairo @@ -4,13 +4,13 @@ pub mod VaultErrors { } #[starknet::interface] -trait IVaultErrorsExample { +pub trait IVaultErrorsExample { fn deposit(ref self: TContractState, amount: u256); fn withdraw(ref self: TContractState, amount: u256); } #[starknet::contract] -mod VaultErrorsExample { +pub mod VaultErrorsExample { use super::VaultErrors; #[storage] diff --git a/listings/getting-started/events/src/counter.cairo b/listings/getting-started/events/src/counter.cairo index 61a3bfcb..7e93def1 100644 --- a/listings/getting-started/events/src/counter.cairo +++ b/listings/getting-started/events/src/counter.cairo @@ -1,11 +1,13 @@ // ANCHOR: contract #[starknet::interface] -trait IEventCounter { +pub trait IEventCounter { fn increment(ref self: TContractState); } + #[starknet::contract] -mod EventCounter { +pub mod EventCounter { use starknet::{get_caller_address, ContractAddress}; + #[storage] struct Storage { // Counter value diff --git a/listings/getting-started/factory/src/simple_factory.cairo b/listings/getting-started/factory/src/simple_factory.cairo index 7deb61d8..fb4670b5 100644 --- a/listings/getting-started/factory/src/simple_factory.cairo +++ b/listings/getting-started/factory/src/simple_factory.cairo @@ -18,7 +18,7 @@ pub trait ICounterFactory { #[starknet::contract] pub mod CounterFactory { - use starknet::{ContractAddress, ClassHash}; + use starknet::{ContractAddress, ClassHash, SyscallResultTrait}; use starknet::syscalls::deploy_syscall; #[storage] @@ -46,7 +46,7 @@ pub mod CounterFactory { let (deployed_address, _) = deploy_syscall( self.counter_class_hash.read(), 0, constructor_calldata.span(), false ) - .expect('failed to deploy counter'); + .unwrap_syscall(); deployed_address } diff --git a/listings/getting-started/factory/src/tests.cairo b/listings/getting-started/factory/src/tests.cairo index 9e622250..e0c633b9 100644 --- a/listings/getting-started/factory/src/tests.cairo +++ b/listings/getting-started/factory/src/tests.cairo @@ -1,8 +1,5 @@ mod tests { - use core::starknet::SyscallResultTrait; - use core::option::OptionTrait; - use core::traits::Into; - use core::traits::TryInto; + use starknet::SyscallResultTrait; use starknet::{ContractAddress, ClassHash, contract_address_const}; use starknet::syscalls::deploy_syscall; diff --git a/listings/getting-started/interfaces_traits/src/implicit.cairo b/listings/getting-started/interfaces_traits/src/implicit.cairo index 3b98cc62..bca71f9e 100644 --- a/listings/getting-started/interfaces_traits/src/implicit.cairo +++ b/listings/getting-started/interfaces_traits/src/implicit.cairo @@ -1,5 +1,5 @@ #[starknet::contract] -mod ImplicitInterfaceContract { +pub mod ImplicitInterfaceContract { #[storage] struct Storage { value: u32 diff --git a/listings/getting-started/interfaces_traits/src/tests.cairo b/listings/getting-started/interfaces_traits/src/tests.cairo index 4ec68632..840fce3a 100644 --- a/listings/getting-started/interfaces_traits/src/tests.cairo +++ b/listings/getting-started/interfaces_traits/src/tests.cairo @@ -2,12 +2,12 @@ mod tests { // TODO } mod explicit_interface_contract_tests { - use core::starknet::SyscallResultTrait; use interfaces_traits::explicit::{ IExplicitInterfaceContract, ExplicitInterfaceContract, IExplicitInterfaceContractDispatcher, IExplicitInterfaceContractDispatcherTrait }; use starknet::ContractAddress; + use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; #[test] @@ -16,7 +16,7 @@ mod explicit_interface_contract_tests { let (contract_address, _) = deploy_syscall( ExplicitInterfaceContract::TEST_CLASS_HASH.try_into().unwrap(), 0, - ArrayTrait::new().span(), + array![].span(), false ) .unwrap_syscall(); @@ -38,6 +38,7 @@ mod implicit_internal_contract_tests { IImplicitInternalContractDispatcherTrait }; use starknet::ContractAddress; + use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; #[test] @@ -45,12 +46,10 @@ mod implicit_internal_contract_tests { fn test_interface() { // Set up. let (contract_address, _) = deploy_syscall( - ImplicitInternalContract::TEST_CLASS_HASH.try_into().unwrap(), - 0, - ArrayTrait::new().span(), - false + ImplicitInternalContract::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false ) - .unwrap(); + .unwrap_syscall(); + let mut contract = IImplicitInternalContractDispatcher { contract_address }; let initial_value: u32 = 0; diff --git a/listings/getting-started/mappings/src/tests.cairo b/listings/getting-started/mappings/src/tests.cairo index a81b5a42..5809d9de 100644 --- a/listings/getting-started/mappings/src/tests.cairo +++ b/listings/getting-started/mappings/src/tests.cairo @@ -1,23 +1,14 @@ -use starknet::ContractAddress; -#[starknet::interface] -trait IMapContract { - fn set(ref self: TContractState, key: ContractAddress, value: felt252); - - fn get(self: @TContractState, key: ContractAddress) -> felt252; -} - mod tests { - use core::starknet::SyscallResultTrait; - use super::super::mappings::MapContract; - use super::{IMapContract, IMapContractDispatcher, IMapContractDispatcherTrait}; + use mappings::mappings::{MapContract, IMapContractDispatcher, IMapContractDispatcherTrait}; use starknet::ContractAddress; + use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; #[test] #[available_gas(2000000000)] fn test_set_get() { // Set up. - let mut calldata: Array = ArrayTrait::new(); + let mut calldata: Array = array![]; let (address0, _) = deploy_syscall( MapContract::TEST_CLASS_HASH.try_into().unwrap(), 0, calldata.span(), false ) diff --git a/listings/getting-started/storage/src/contract.cairo b/listings/getting-started/storage/src/contract.cairo index e66252f0..341aed77 100644 --- a/listings/getting-started/storage/src/contract.cairo +++ b/listings/getting-started/storage/src/contract.cairo @@ -1,5 +1,5 @@ #[starknet::contract] -mod Contract { +pub mod Contract { #[storage] struct Storage { a: u128, diff --git a/listings/getting-started/storage/src/minimal_contract.cairo b/listings/getting-started/storage/src/minimal_contract.cairo index 22291808..e83f1644 100644 --- a/listings/getting-started/storage/src/minimal_contract.cairo +++ b/listings/getting-started/storage/src/minimal_contract.cairo @@ -1,5 +1,5 @@ #[starknet::contract] -mod Contract { +pub mod Contract { #[storage] struct Storage {} } diff --git a/listings/getting-started/testing_how_to/src/tests.cairo b/listings/getting-started/testing_how_to/src/tests.cairo index d683832b..8beb1c3a 100644 --- a/listings/getting-started/testing_how_to/src/tests.cairo +++ b/listings/getting-started/testing_how_to/src/tests.cairo @@ -1,7 +1,6 @@ #[cfg(test)] mod tests { // Import the interface and dispatcher to be able to interact with the contract. - use core::starknet::SyscallResultTrait; use testing_how_to::contract::{ ISimpleContract, SimpleContract, ISimpleContractDispatcher, ISimpleContractDispatcherTrait }; @@ -10,6 +9,7 @@ mod tests { use starknet::{ ContractAddress, get_caller_address, get_contract_address, contract_address_const }; + use starknet::SyscallResultTrait; use starknet::syscalls::deploy_syscall; // Use starknet test utils to fake the transaction context. @@ -18,7 +18,7 @@ mod tests { // Deploy the contract and return its dispatcher. fn deploy(initial_value: u32) -> ISimpleContractDispatcher { // Set up constructor arguments. - let mut calldata = ArrayTrait::new(); + let mut calldata = array![]; initial_value.serialize(ref calldata); // Declare and deploy diff --git a/listings/getting-started/variables/src/global_variables.cairo b/listings/getting-started/variables/src/global_variables.cairo index fd31e6d0..48b52dee 100644 --- a/listings/getting-started/variables/src/global_variables.cairo +++ b/listings/getting-started/variables/src/global_variables.cairo @@ -1,9 +1,9 @@ #[starknet::interface] -trait IGlobalExample { +pub trait IGlobalExample { fn foo(ref self: TContractState); } #[starknet::contract] -mod GlobalExample { +pub mod GlobalExample { // import the required functions from the starknet core library use starknet::get_caller_address; diff --git a/listings/getting-started/variables/src/local_variables.cairo b/listings/getting-started/variables/src/local_variables.cairo index 3ccaf1b4..0a9e1859 100644 --- a/listings/getting-started/variables/src/local_variables.cairo +++ b/listings/getting-started/variables/src/local_variables.cairo @@ -1,10 +1,10 @@ #[starknet::interface] -trait ILocalVariablesExample { +pub trait ILocalVariablesExample { fn do_something(self: @TContractState, value: u32) -> u32; } #[starknet::contract] -mod LocalVariablesExample { +pub mod LocalVariablesExample { #[storage] struct Storage {} diff --git a/listings/getting-started/variables/src/storage_variables.cairo b/listings/getting-started/variables/src/storage_variables.cairo index 6bd105ae..f2c201fd 100644 --- a/listings/getting-started/variables/src/storage_variables.cairo +++ b/listings/getting-started/variables/src/storage_variables.cairo @@ -1,10 +1,11 @@ #[starknet::interface] -trait IStorageVariableExample { +pub trait IStorageVariableExample { fn set(ref self: TContractState, value: u32); fn get(self: @TContractState) -> u32; } + #[starknet::contract] -mod StorageVariablesExample { +pub mod StorageVariablesExample { // All storage variables are contained in a struct called Storage // annotated with the `#[storage]` attribute #[storage] diff --git a/listings/getting-started/visibility/src/visibility.cairo b/listings/getting-started/visibility/src/visibility.cairo index 87109995..dd093017 100644 --- a/listings/getting-started/visibility/src/visibility.cairo +++ b/listings/getting-started/visibility/src/visibility.cairo @@ -11,7 +11,6 @@ pub mod ExampleContract { value: u32 } - // The `abi(embed_v0)` attribute indicates that all the functions in this implementation can be called externally. // Omitting this attribute would make all the functions in this implementation internal. #[abi(embed_v0)] diff --git a/src/ch00/basics/syscalls.md b/src/ch00/basics/syscalls.md index 9efbd15d..7a4fc336 100644 --- a/src/ch00/basics/syscalls.md +++ b/src/ch00/basics/syscalls.md @@ -154,10 +154,10 @@ Example of the usage of the `emit_event` syscall from the [Events](../basics/eve