Merge pull request #3 from dinahmaccodes/main

chore: updated scarb version

Author: aji70

.github/workflows/test.yml

@@ -25,6 +25,6 @@ jobs:
           scarb-version: 2.11.2
       - uses: foundry-rs/setup-snfoundry@v3
         with:
-          starknet-foundry-version: 0.37.0
+          starknet-foundry-version: 0.40.0
       - name: Run cairo tests
         run: snforge test

src/factory.cairo

@@ -14,7 +14,7 @@ pub mod TribesNftFactory {
     };
     use starknet::syscalls::deploy_syscall;
     use starknet::{
-        ContractAddress, SyscallResultTrait, get_caller_address, get_block_timestamp,
+        ContractAddress, SyscallResultTrait, get_block_timestamp, get_caller_address,
         get_contract_address,
     };
 
@@ -207,7 +207,7 @@ pub mod TribesNftFactory {
                 }
                 collection_arr.append(artist_collections.at(i).read());
                 i += 1;
-            };
+            }
 
             collection_arr
         }
@@ -217,11 +217,9 @@ pub mod TribesNftFactory {
             let mut collections_arr = ArrayTrait::new();
             let stored_collections = self.collections;
 
-            for i in 0
-                ..stored_collections
-                    .len() {
-                        collections_arr.append(self.collections.at(i).read());
-                    };
+            for i in 0..stored_collections.len() {
+                collections_arr.append(self.collections.at(i).read());
+            }
 
             collections_arr
         }
@@ -265,7 +263,7 @@ pub mod TribesNftFactory {
                     taken = true;
                 }
                 i += 1;
-            };
+            }
 
             taken
         }

src/interfaces.cairo

@@ -7,7 +7,7 @@ use starknet::ContractAddress;
 #[starknet::interface]
 pub trait IERC721<TContractState> {
     fn mint_ticket_nft(
-        ref self: TContractState, payment_amount: u256, payment_token: ContractAddress
+        ref self: TContractState, payment_amount: u256, payment_token: ContractAddress,
     ) -> u256;
     fn burn_nft(ref self: TContractState, token_id: u256);
     fn pause(ref self: TContractState);

src/mockUSDC.cairo

@@ -3,13 +3,12 @@ use starknet::ContractAddress;
 
 #[starknet::contract]
 pub mod MockUsdc {
+    use loop_starknet::interfaces::IExternal;
     use openzeppelin::access::ownable::OwnableComponent;
     use openzeppelin::token::erc20::interface::IERC20Metadata;
     use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};
-    use loop_starknet::interfaces::IExternal;
     use starknet::ContractAddress;
-
-    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess,};
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
 
     component!(path: ERC20Component, storage: erc20, event: ERC20Event);
     component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
@@ -33,7 +32,7 @@ pub mod MockUsdc {
     }
 
     #[constructor]
-    fn constructor(ref self: ContractState, owner: ContractAddress, decimals: u8,) {
+    fn constructor(ref self: ContractState, owner: ContractAddress, decimals: u8) {
         self.erc20.initializer(format!("USDC"), format!("USDC"));
         self.ownable.initializer(owner);
         self.custom_decimals.write(decimals);

src/nfts/tribes_nft.cairo

@@ -10,9 +10,9 @@ pub mod TribesNFT {
     use openzeppelin::access::accesscontrol::AccessControlComponent;
     use openzeppelin::introspection::src5::SRC5Component;
     use openzeppelin::security::pausable::PausableComponent;
-    use openzeppelin::token::erc721::ERC721Component;
-    use openzeppelin::token::erc20::{ERC20ABIDispatcher, ERC20ABIDispatcherTrait};
     use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
+    use openzeppelin::token::erc20::{ERC20ABIDispatcher, ERC20ABIDispatcherTrait};
+    use openzeppelin::token::erc721::ERC721Component;
     use starknet::storage::{
         Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess,
         StoragePointerWriteAccess,
@@ -158,7 +158,7 @@ pub mod TribesNFT {
         }
 
         fn mint_ticket_nft(
-            ref self: ContractState, payment_amount: u256, payment_token: ContractAddress
+            ref self: ContractState, payment_amount: u256, payment_token: ContractAddress,
         ) -> u256 {
             let artist_address = get_contract_address();
             let caller = get_caller_address();

tests/test_contract.cairo

@@ -1,8 +1,8 @@
 use core::num::traits::Zero;
 use loop_starknet::factory::TribesNftFactory;
 use loop_starknet::interfaces::{
-    IERC721Dispatcher, IERC721DispatcherTrait, ITribesFactoryDispatcher,
-    ITribesFactoryDispatcherTrait, IExternalDispatcher, IExternalDispatcherTrait
+    IERC721Dispatcher, IERC721DispatcherTrait, IExternalDispatcher, IExternalDispatcherTrait,
+    ITribesFactoryDispatcher, ITribesFactoryDispatcherTrait,
 };
 use loop_starknet::nfts::tribes_nft::TribesNFT;
 use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
@@ -278,7 +278,7 @@ fn test_symbol_should_panic() {
     factory_dispatcher
         .create_collection(
             artist, name2.clone(), symbol.clone(), // Same symbol
-             collection_details.clone(),
+            collection_details.clone(),
         );
     stop_cheat_caller_address(factory_address);
 }