Merge pull request #42 from Samuel1-ona/main

Remove redundancy

Author: Samuel1-ona

Scarb.toml

@@ -23,35 +23,3 @@ test = "snforge test"
 [profile.dev.cairo]
 unstable-add-statements-code-locations-debug-info = true
 unstable-add-statements-functions-debug-info = true
-
-
-
-# Visit https://foundry-rs.github.io/starknet-foundry/appendix/scarb-toml.html for more information
-
-# [tool.snforge]                                             # Define `snforge` tool section
-# exit_first = true                                          # Stop tests execution immediately upon the first failure
-# fuzzer_runs = 1234                                         # Number of runs of the random fuzzer
-# fuzzer_seed = 1111                                         # Seed for the random fuzzer
-
-# [[tool.snforge.fork]]                                      # Used for fork testing
-# name = "SOME_NAME"                                         # Fork name
-# url = "http://your.rpc.url"                                # Url of the RPC provider
-# block_id.tag = "latest"                                    # Block to fork from (block tag)
-
-# [[tool.snforge.fork]]
-# name = "SOME_SECOND_NAME"
-# url = "http://your.second.rpc.url"                         
-# block_id.number = "123"                                    # Block to fork from (block number)
-
-# [[tool.snforge.fork]]
-# name = "SOME_THIRD_NAME"
-# url = "http://your.third.rpc.url"
-# block_id.hash = "0x123"                                    # Block to fork from (block hash)
-
-# [profile.dev.cairo]                                        # Configure Cairo compiler
-# unstable-add-statements-code-locations-debug-info = true   # Should be used if you want to use coverage
-# unstable-add-statements-functions-debug-info = true        # Should be used if you want to use coverage/profiler
-# inlining-strategy = "avoid"                                # Should be used if you want to use coverage
-
-# [features]                                                 # Used for conditional compilation
-# enable_for_tests = []                                      # Feature name and list of other features that should be enabled with it

src/interfaces/IWeaver.cairo

@@ -1,6 +1,5 @@
 use starknet::ContractAddress;
 use starknet::class_hash::ClassHash;
-use core::fmt::{Debug, Formatter};
 
 // *************************************************************************
 //                              INTERFACE of  WEAVER

src/weaver.cairo

@@ -1,4 +1,4 @@
-use core::starknet::ContractAddress;
+
 
 #[starknet::contract]
 pub mod Weaver {
@@ -18,7 +18,6 @@ pub mod Weaver {
         get_caller_address,
     };
 
-    use weaver_contract::interfaces::IWeaver::{IWeaverDispatcher, IWeaverDispatcherTrait};
     use weaver_contract::interfaces::IWeaver::{User, ProtocolInfo, TaskInfo};
     use weaver_contract::interfaces::IWeaver::IWeaver;
     use weaver_contract::interfaces::IWeaverNFT::{IWeaverNFTDispatcher, IWeaverNFTDispatcherTrait};
@@ -103,7 +102,7 @@ pub mod Weaver {
             self.emit(Event::UserRegistered(UserRegistered { user: get_caller_address() }));
         }
 
-    
+
         fn mint(ref self: ContractState, task_id: u256) {
             let caller = get_caller_address();
 
@@ -126,7 +125,6 @@ pub mod Weaver {
             self.emit(Event::TaskMinted(TaskMinted { task_id, user: caller }));
         }
 
-     
 
         fn protocol_register(ref self: ContractState, protocol_name: ByteArray) {
             assert(protocol_name.len() > 0, 'INVALID_PROTOCOL_NAME');
@@ -144,8 +142,6 @@ pub mod Weaver {
         }
 
 
-
-
         // Getter functions
 
         fn owner(self: @ContractState) -> ContractAddress {
@@ -164,12 +160,13 @@ pub mod Weaver {
             self.task_registry.read(task_id)
         }
 
-        fn get_registered_protocols(self: @ContractState, address: ContractAddress) -> ProtocolInfo {
+        fn get_registered_protocols(
+            self: @ContractState, address: ContractAddress
+        ) -> ProtocolInfo {
             self.protocol_registrations.read(address)
         }
 
 
-
         //Utility functions
 
         fn version(self: @ContractState) -> u16 {
@@ -183,16 +180,12 @@ pub mod Weaver {
             self.version.write(self.version.read() + 1);
             self.emit(Event::Upgraded(Upgraded { implementation: Imp_hash }));
         }
-       
+
 
         fn set_erc721(ref self: ContractState, address: ContractAddress) {
             assert(get_caller_address() == self.owner.read(), 'UNAUTHORIZED');
             assert(address.is_non_zero(), 'INVALID_ADDRESS');
             self.weaver_nft_address.write(address);
         }
-
-
-
-
     }
 }

tests/test_weaver_contract.cairo

@@ -5,16 +5,15 @@ use core::byte_array::ByteArray;
 
 use snforge_std::{
     declare, start_cheat_caller_address, stop_cheat_caller_address, ContractClassTrait,
-    DeclareResultTrait, spy_events, EventSpyAssertionsTrait, get_class_hash
+    DeclareResultTrait, spy_events, EventSpyAssertionsTrait
 };
 
 use starknet::{ContractAddress, get_block_timestamp};
 
 use weaver_contract::interfaces::IWeaverNFT::{IWeaverNFTDispatcher, IWeaverNFTDispatcherTrait};
-use weaver_contract::interfaces::IWeaver::{IWeaverDispatcher, IWeaverDispatcherTrait, User};
+use weaver_contract::interfaces::IWeaver::{IWeaverDispatcher, IWeaverDispatcherTrait};
 use weaver_contract::weaver::Weaver::{Event};
-use weaver_contract::weaver::Weaver::{UserRegistered , ProtocolRegistered , TaskMinted};
-
+use weaver_contract::weaver::Weaver::{UserRegistered, ProtocolRegistered, TaskMinted};
 
 
 const ADMIN: felt252 = 'ADMIN';
@@ -94,14 +93,13 @@ fn test_register_user_emit_event() {
     let is_registered = weaver_contract.get_register_user(user);
     assert!(is_registered.Details == "Test User", "User should be registered");
 
-    let expected_event = Event::UserRegistered(UserRegistered{user: user});
+    let expected_event = Event::UserRegistered(UserRegistered { user: user });
     spy.assert_emitted(@array![(weaver_contract_address, expected_event)]);
 
     stop_cheat_caller_address(weaver_contract_address);
 }
 
 
-
 #[test]
 #[should_panic(expected: 'user already registered')]
 fn test_already_registered_should_panic() {
@@ -142,7 +140,7 @@ fn test_mint_unregistered_user_panics() {
 
 #[test]
 fn test_protocol_register() {
-    let (weaver_contract_address, nft_address) = __setup__();
+    let (weaver_contract_address, _) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
 
     let user: ContractAddress = USER();
@@ -160,7 +158,7 @@ fn test_protocol_register() {
 
 #[test]
 fn test_protocol_register_emit_event() {
-    let (weaver_contract_address, nft_address) = __setup__();
+    let (weaver_contract_address, _) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
 
     let user: ContractAddress = USER();
@@ -173,16 +171,13 @@ fn test_protocol_register_emit_event() {
     let protocol_info = weaver_contract.get_registered_protocols(user);
     assert!(protocol_info.protocol_name == "Weaver Protocol", "Protocol should be registered");
 
-    let expected_event = Event::ProtocolRegistered(ProtocolRegistered{user: user});
+    let expected_event = Event::ProtocolRegistered(ProtocolRegistered { user: user });
     spy.assert_emitted(@array![(weaver_contract_address, expected_event)]);
 
     stop_cheat_caller_address(weaver_contract_address);
 }
 
 
-
-
-
 #[test]
 fn test_nft_minted_on_protocol_register() {
     let (weaver_contract_address, nft_address) = __setup__();
@@ -211,7 +206,7 @@ fn test_nft_minted_on_protocol_register() {
 #[test]
 #[should_panic(expected: 'PROTOCOL_ALREADY_REGISTERED')]
 fn test_protocol_register_already_registered() {
-    let (weaver_contract_address, nft_address) = __setup__();
+    let (weaver_contract_address, _) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
 
     let user: ContractAddress = USER();
@@ -301,7 +296,7 @@ fn test_mint_nft() {
 
     assert!(minted_token_id > 0, "NFT NOT Minted!");
 
-    let expected_event = Event::TaskMinted(TaskMinted{ task_id:task_id, user: user });
+    let expected_event = Event::TaskMinted(TaskMinted { task_id: task_id, user: user });
     spy.assert_emitted(@array![(weaver_contract_address, expected_event)]);
 
     stop_cheat_caller_address(weaver_contract_address);
@@ -400,7 +395,7 @@ fn test_mint_nft_after_task_completed() {
 #[test]
 #[should_panic(expected: 'TASK_ALREADY_EXISTS')]
 fn test_mint_task_already_exists() {
-    let (weaver_contract_address, nft_address) = __setup__();
+    let (weaver_contract_address, _) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
     let user: ContractAddress = USER();
 
@@ -427,7 +422,7 @@ fn test_mint_task_already_exists() {
 
 
 #[test]
-fn test_nft_was_minted_after_user_registers(){
+fn test_nft_was_minted_after_user_registers() {
     let (weaver_contract_address, nft_address) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
     let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
@@ -449,12 +444,11 @@ fn test_nft_was_minted_after_user_registers(){
     assert_eq!(mint_timestamp, current_block_timestamp, "Mint timestamp not matched");
 
     stop_cheat_caller_address(weaver_contract_address);
-
 }
 
 
 #[test]
-fn test_nft_was_minted_after_protocol_registers(){
+fn test_nft_was_minted_after_protocol_registers() {
     let (weaver_contract_address, nft_address) = __setup__();
     let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
     let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
@@ -476,5 +470,4 @@ fn test_nft_was_minted_after_protocol_registers(){
     assert_eq!(mint_timestamp, current_block_timestamp, "Mint timestamp not matched");
 
     stop_cheat_caller_address(weaver_contract_address);
-
 }