Skip to content
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.

Sign up for GitHub

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

refactored the manual use of erc721 on the contract #44

Merged
merged 1 commit into from
Feb 23, 2025
Merged

refactored the manual use of erc721 on the contract #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions src/weaver.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#[starknet::contract]
pub mod Weaver {
// *************************************************************************
Expand Down Expand Up @@ -76,11 +74,8 @@ pub mod Weaver {


#[constructor]
fn constructor(
ref self: ContractState, owner: ContractAddress, weavernft_address: ContractAddress,
) {
fn constructor(ref self: ContractState, owner: ContractAddress) {
self.owner.write(owner);
self.weaver_nft_address.write(weavernft_address);
}

// *************************************************************************
Expand Down Expand Up @@ -112,7 +107,7 @@ pub mod Weaver {
// Veriy task does not exist
assert(!self.task_registry.read(task_id).is_completed, 'TASK_ALREADY_EXISTS');

let task_info = TaskInfo { task_id, user: caller, is_completed: true, };
let task_info = TaskInfo { task_id, user: caller, is_completed: true };
self.task_registry.write(task_id, task_info);

// Get NFT contract dispatcher
Expand Down Expand Up @@ -161,7 +156,7 @@ pub mod Weaver {
}

fn get_registered_protocols(
self: @ContractState, address: ContractAddress
self: @ContractState, address: ContractAddress,
) -> ProtocolInfo {
self.protocol_registrations.read(address)
}
Expand Down
71 changes: 35 additions & 36 deletions tests/test_weaver_contract.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use core::byte_array::ByteArray;

use snforge_std::{
declare, start_cheat_caller_address, stop_cheat_caller_address, ContractClassTrait,
DeclareResultTrait, spy_events, EventSpyAssertionsTrait
DeclareResultTrait, spy_events, EventSpyAssertionsTrait,
};

use starknet::{ContractAddress, get_block_timestamp};
Expand All @@ -16,8 +16,6 @@ use weaver_contract::weaver::Weaver::{Event};
use weaver_contract::weaver::Weaver::{UserRegistered, ProtocolRegistered, TaskMinted};


const ADMIN: felt252 = 'ADMIN';

fn OWNER() -> ContractAddress {
'owner'.try_into().unwrap()
}
Expand All @@ -26,42 +24,43 @@ fn USER() -> ContractAddress {
'recipient'.try_into().unwrap()
}

fn __setup__() -> (ContractAddress, ContractAddress) {
fn __setup__() -> ContractAddress {
let class_hash = declare("Weaver").unwrap().contract_class();

let nft_address = __deploy_WeaverNFT__();

let mut calldata = array![];
OWNER().serialize(ref calldata);
nft_address.serialize(ref calldata);
let (contract_address, _) = class_hash.deploy(@calldata).unwrap();
let nft_address = __deploy_WeaverNFT__(contract_address);
let weaver_contract = IWeaverDispatcher { contract_address: contract_address };
start_cheat_caller_address(contract_address, OWNER());
weaver_contract.set_erc721(nft_address);
stop_cheat_caller_address(contract_address);

(contract_address, nft_address)
return contract_address;
}

fn __deploy_WeaverNFT__() -> ContractAddress {
fn __deploy_WeaverNFT__(admin: ContractAddress) -> ContractAddress {
let nft_class_hash = declare("WeaverNFT").unwrap().contract_class();
let mut calldata = array![];
admin.serialize(ref calldata);

let mut events_constructor_calldata: Array<felt252> = array![ADMIN];
let (nft_contract_address, _) = nft_class_hash.deploy(@events_constructor_calldata).unwrap();
let (nft_contract_address, _) = nft_class_hash.deploy(@calldata).unwrap();

return (nft_contract_address);
}


#[test]
fn test_weaver_constructor() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

assert_eq!(weaver_contract.owner(), OWNER());
assert!(weaver_contract.erc_721() == nft_address, "wrong erc721 address");
}


#[test]
fn test_register_user() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -79,7 +78,7 @@ fn test_register_user() {

#[test]
fn test_register_user_emit_event() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let mut spy = spy_events();
Expand All @@ -103,7 +102,7 @@ fn test_register_user_emit_event() {
#[test]
#[should_panic(expected: 'user already registered')]
fn test_already_registered_should_panic() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -126,7 +125,7 @@ fn test_already_registered_should_panic() {
#[test]
#[should_panic(expected: 'USER_NOT_REGISTERED')] // Case-sensitive match
fn test_mint_unregistered_user_panics() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let unregistered_user = USER(); // Uses the numeric address now
Expand All @@ -140,7 +139,7 @@ fn test_mint_unregistered_user_panics() {

#[test]
fn test_protocol_register() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -158,7 +157,7 @@ fn test_protocol_register() {

#[test]
fn test_protocol_register_emit_event() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -180,9 +179,9 @@ fn test_protocol_register_emit_event() {

#[test]
fn test_nft_minted_on_protocol_register() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };

let user: ContractAddress = USER();
start_cheat_caller_address(weaver_contract_address, user);
Expand All @@ -206,7 +205,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, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -223,7 +222,7 @@ fn test_protocol_register_already_registered() {
#[test]
#[should_panic(expected: 'INVALID_PROTOCOL_NAME')]
fn test_invalid_protocol_name_should_panic() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };

let user: ContractAddress = USER();
Expand All @@ -238,10 +237,10 @@ fn test_invalid_protocol_name_should_panic() {
#[test]
#[should_panic(expected: 'TASK_ALREADY_EXISTS')]
fn test_mint_nft_duplicate_id_should_panic() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();

let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };
let user: ContractAddress = USER();

start_cheat_caller_address(weaver_contract_address, user);
Expand All @@ -266,10 +265,10 @@ fn test_mint_nft_duplicate_id_should_panic() {

#[test]
fn test_mint_nft() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();

let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };

let mut spy = spy_events();
let user: ContractAddress = USER();
Expand Down Expand Up @@ -305,7 +304,7 @@ fn test_mint_nft() {
#[test]
#[should_panic(expected: "Task should NOT be completed")]
fn test_mint_nft_task_not_completed_should_panic() {
let (weaver_contract_address, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let user: ContractAddress = USER();

Expand Down Expand Up @@ -335,9 +334,9 @@ fn test_mint_nft_task_not_completed_should_panic() {
#[test]
fn test_mint_nft_after_task_completed() {
// Set up the contracts
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };

// Define the user address
let user: ContractAddress = USER();
Expand Down Expand Up @@ -395,7 +394,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, _) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let user: ContractAddress = USER();

Expand Down Expand Up @@ -423,9 +422,9 @@ fn test_mint_task_already_exists() {

#[test]
fn test_nft_was_minted_after_user_registers() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };

let user: ContractAddress = USER();
start_cheat_caller_address(weaver_contract_address, user);
Expand All @@ -449,9 +448,9 @@ fn test_nft_was_minted_after_user_registers() {

#[test]
fn test_nft_was_minted_after_protocol_registers() {
let (weaver_contract_address, nft_address) = __setup__();
let weaver_contract_address = __setup__();
let weaver_contract = IWeaverDispatcher { contract_address: weaver_contract_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: nft_address };
let nft_dispatcher = IWeaverNFTDispatcher { contract_address: weaver_contract.erc_721() };

let user: ContractAddress = USER();
start_cheat_caller_address(weaver_contract_address, user);
Expand Down