From 24cbf2a37f57c3ed826227ca87e09c5e8e5eaf2e Mon Sep 17 00:00:00 2001 From: Josue Soto Date: Thu, 14 Nov 2024 17:32:01 -0600 Subject: [PATCH 1/2] [fix] Update contracts variable and function names --- contracts/src/donator.cairo | 20 ++++---- contracts/src/donatorManager.cairo | 22 ++++---- contracts/src/fund.cairo | 60 +++++++++++----------- contracts/src/fundManager.cairo | 20 ++++---- contracts/tests/test_donator.cairo | 26 +++++----- contracts/tests/test_donator_manager.cairo | 12 ++--- contracts/tests/test_fund.cairo | 58 ++++++++++----------- 7 files changed, 109 insertions(+), 109 deletions(-) diff --git a/contracts/src/donator.cairo b/contracts/src/donator.cairo index b83abce..ca807cb 100644 --- a/contracts/src/donator.cairo +++ b/contracts/src/donator.cairo @@ -2,11 +2,11 @@ use starknet::ContractAddress; #[starknet::interface] pub trait IDonator { - fn getOwner(self: @TContractState) -> ContractAddress; - fn getLevel(self: @TContractState) -> u32; - fn getTotalStarkDonations(self: @TContractState) -> u256; - fn getMaxStarkDonationsToNextLevel(self: @TContractState) -> u256; - fn updateDonatorValues(ref self: TContractState, donated_starks: u256); + fn get_owner(self: @TContractState) -> ContractAddress; + fn get_level(self: @TContractState) -> u32; + fn get_total_stark_donations(self: @TContractState) -> u256; + fn get_max_stark_donations_to_next_level(self: @TContractState) -> u256; + fn update_donator_values(ref self: TContractState, donated_starks: u256); } #[starknet::contract] @@ -46,19 +46,19 @@ mod Donator { // ************************************************************************* #[abi(embed_v0)] impl DonatorImpl of super::IDonator { - fn getOwner(self: @ContractState) -> ContractAddress { + fn get_owner(self: @ContractState) -> ContractAddress { return self.owner.read(); } - fn getLevel(self: @ContractState) -> u32 { + fn get_level(self: @ContractState) -> u32 { return self.level.read(); } - fn getTotalStarkDonations(self: @ContractState) -> u256 { + fn get_total_stark_donations(self: @ContractState) -> u256 { return self.total_stark_donations.read(); } - fn getMaxStarkDonationsToNextLevel(self: @ContractState) -> u256 { + fn get_max_stark_donations_to_next_level(self: @ContractState) -> u256 { return self.max_stark_donations_to_next_level.read(); } - fn updateDonatorValues(ref self: ContractState, donated_starks: u256) { + fn update_donator_values(ref self: ContractState, donated_starks: u256) { let total_donator_pod = self.total_stark_donations.read() + donated_starks; self.total_stark_donations.write(total_donator_pod); if (total_donator_pod > self.max_stark_donations_to_next_level.read()) { diff --git a/contracts/src/donatorManager.cairo b/contracts/src/donatorManager.cairo index 2ceea43..48d2cbe 100644 --- a/contracts/src/donatorManager.cairo +++ b/contracts/src/donatorManager.cairo @@ -3,10 +3,10 @@ use starknet::class_hash::ClassHash; #[starknet::interface] pub trait IDonatorManager { - fn newDonator(ref self: TContractState); - fn getOwner(self: @TContractState) -> ContractAddress; - fn getDonatorClassHash(self: @TContractState) -> ClassHash; - fn getDonatorByAddress(self: @TContractState, owner: ContractAddress) -> ContractAddress; + fn new_donator(ref self: TContractState); + fn get_owner(self: @TContractState) -> ContractAddress; + fn get_donator_class_hash(self: @TContractState) -> ClassHash; + fn get_donator_by_address(self: @TContractState, owner: ContractAddress) -> ContractAddress; } #[starknet::contract] @@ -60,12 +60,12 @@ pub mod DonatorManager { // ************************************************************************* #[abi(embed_v0)] impl DonatorManagerImpl of super::IDonatorManager { - fn newDonator(ref self: ContractState) { - let mut calldata = ArrayTrait::::new(); - calldata.append(get_caller_address().try_into().unwrap()); + fn new_donator(ref self: ContractState) { + let mut call_data = ArrayTrait::::new(); + call_data.append(get_caller_address().try_into().unwrap()); let (new_donator_address, _) = deploy_syscall( - self.donator_class_hash.read(), 12345, calldata.span(), false + self.donator_class_hash.read(), 12345,call_data.span(), false ) .unwrap(); self.donators.write(get_caller_address().try_into().unwrap(), new_donator_address); @@ -76,13 +76,13 @@ pub mod DonatorManager { } ) } - fn getOwner(self: @ContractState) -> ContractAddress { + fn get_owner(self: @ContractState) -> ContractAddress { return self.owner.read(); } - fn getDonatorClassHash(self: @ContractState) -> ClassHash { + fn get_donator_class_hash(self: @ContractState) -> ClassHash { return self.donator_class_hash.read(); } - fn getDonatorByAddress(self: @ContractState, owner: ContractAddress) -> ContractAddress { + fn get_donator_by_address(self: @ContractState, owner: ContractAddress) -> ContractAddress { return self.donators.read(owner); } } diff --git a/contracts/src/fund.cairo b/contracts/src/fund.cairo index 33c8fdc..d36a6a3 100644 --- a/contracts/src/fund.cairo +++ b/contracts/src/fund.cairo @@ -2,21 +2,21 @@ use starknet::ContractAddress; #[starknet::interface] pub trait IFund { - fn getId(self: @TContractState) -> u128; - fn getOwner(self: @TContractState) -> ContractAddress; - fn setName(ref self: TContractState, name: ByteArray); - fn getName(self: @TContractState) -> ByteArray; - fn setReason(ref self: TContractState, reason: ByteArray); - fn getReason(self: @TContractState) -> ByteArray; - fn receiveVote(ref self: TContractState); - fn getUpVotes(self: @TContractState) -> u32; - fn setGoal(ref self: TContractState, goal: u256); - fn getGoal(self: @TContractState) -> u256; + fn get_id(self: @TContractState) -> u128; + fn get_owner(self: @TContractState) -> ContractAddress; + fn set_name(ref self: TContractState, name: ByteArray); + fn get_name(self: @TContractState) -> ByteArray; + fn set_reason(ref self: TContractState, reason: ByteArray); + fn get_reason(self: @TContractState) -> ByteArray; + fn receive_vote(ref self: TContractState); + fn get_up_votes(self: @TContractState) -> u32; + fn set_goal(ref self: TContractState, goal: u256); + fn get_goal(self: @TContractState) -> u256; fn update_receive_donation(ref self: TContractState, strks: u256); fn get_current_goal_state(self: @TContractState) -> u256; - fn setState(ref self: TContractState, state: u8); - fn getState(self: @TContractState) -> u8; - fn getVoter(self: @TContractState) -> u32; + fn set_state(ref self: TContractState, state: u8); + fn get_state(self: @TContractState) -> u8; + fn get_voter(self: @TContractState) -> u32; fn withdraw(ref self: TContractState); fn set_evidence_link(ref self: TContractState, evidence: ByteArray); fn get_evidence_link(self: @TContractState) -> ByteArray; @@ -122,29 +122,29 @@ pub mod Fund { // ************************************************************************* #[abi(embed_v0)] impl FundImpl of super::IFund { - fn getId(self: @ContractState) -> u128 { + fn get_id(self: @ContractState) -> u128 { return self.id.read(); } - fn getOwner(self: @ContractState) -> ContractAddress { + fn get_owner(self: @ContractState) -> ContractAddress { return self.owner.read(); } - fn setName(ref self: ContractState, name: ByteArray) { + fn set_name(ref self: ContractState, name: ByteArray) { let caller = get_caller_address(); assert!(self.owner.read() == caller, "You are not the owner"); self.name.write(name); } - fn getName(self: @ContractState) -> ByteArray { + fn get_name(self: @ContractState) -> ByteArray { return self.name.read(); } - fn setReason(ref self: ContractState, reason: ByteArray) { + fn set_reason(ref self: ContractState, reason: ByteArray) { let caller = get_caller_address(); assert!(self.owner.read() == caller, "You are not the owner"); self.reason.write(reason); } - fn getReason(self: @ContractState) -> ByteArray { + fn get_reason(self: @ContractState) -> ByteArray { return self.reason.read(); } - fn receiveVote(ref self: ContractState) { + fn receive_vote(ref self: ContractState) { assert(self.voters.read(get_caller_address()) == 0, 'User already voted!'); assert( self.state.read() == FundStates::RECOLLECTING_VOTES, 'Fund not recollecting votes!' @@ -164,10 +164,10 @@ pub mod Fund { } ); } - fn getUpVotes(self: @ContractState) -> u32 { + fn get_up_votes(self: @ContractState) -> u32 { return self.up_votes.read(); } - fn setGoal(ref self: ContractState, goal: u256) { + fn set_goal(ref self: ContractState, goal: u256) { let caller = get_caller_address(); let fund_manager_address = contract_address_const::< FundManagerConstants::FUND_MANAGER_ADDRESS @@ -175,7 +175,7 @@ pub mod Fund { assert!(fund_manager_address == caller, "You are not the fund manager"); self.goal.write(goal); } - fn getGoal(self: @ContractState) -> u256 { + fn get_goal(self: @ContractState) -> u256 { return self.goal.read(); } fn update_receive_donation(ref self: ContractState, strks: u256) { @@ -196,7 +196,7 @@ pub mod Fund { fn get_current_goal_state(self: @ContractState) -> u256 { self.token_dispatcher().balance_of(get_contract_address()) } - fn setState(ref self: ContractState, state: u8) { + fn set_state(ref self: ContractState, state: u8) { let caller = get_caller_address(); let valid_address_1 = contract_address_const::(); let valid_address_2 = contract_address_const::(); @@ -206,10 +206,10 @@ pub mod Fund { ); self.state.write(state); } - fn getState(self: @ContractState) -> u8 { + fn get_state(self: @ContractState) -> u8 { return self.state.read(); } - fn getVoter(self: @ContractState) -> u32 { + fn get_voter(self: @ContractState) -> u32 { return self.voters.read(get_caller_address()); } fn withdraw(ref self: ContractState) { @@ -217,15 +217,15 @@ pub mod Fund { assert!(self.owner.read() == caller, "You are not the owner"); assert(self.state.read() == FundStates::CLOSED, 'Fund not close goal yet.'); assert( - self.get_current_goal_state() >= self.getGoal(), 'Fund hasnt reached its goal yet' + self.get_current_goal_state() >= self.get_goal(), 'Fund hasnt reached its goal yet' ); let valid_address = contract_address_const::(); let withdrawn_amount = (self.get_current_goal_state() * 95) / 100; let fund_manager_amount = (self.get_current_goal_state() * 5) / 100; - self.token_dispatcher().approve(self.getOwner(), withdrawn_amount); - self.token_dispatcher().transfer(self.getOwner(), withdrawn_amount); + self.token_dispatcher().approve(self.get_owner(), withdrawn_amount); + self.token_dispatcher().transfer(self.get_owner(), withdrawn_amount); self.token_dispatcher().approve(valid_address, fund_manager_amount); self.token_dispatcher().transfer(valid_address, fund_manager_amount); @@ -236,7 +236,7 @@ pub mod Fund { self .emit( DonationWithdraw { - owner_address: self.getOwner(), + owner_address: self.get_owner(), fund_contract_address: get_contract_address(), withdrawn_amount } diff --git a/contracts/src/fundManager.cairo b/contracts/src/fundManager.cairo index ebc2bc7..c1a7202 100755 --- a/contracts/src/fundManager.cairo +++ b/contracts/src/fundManager.cairo @@ -3,7 +3,7 @@ use starknet::class_hash::ClassHash; #[starknet::interface] pub trait IFundManager { - fn newFund( + fn new_fund( ref self: TContractState, name: ByteArray, goal: u256, @@ -11,10 +11,10 @@ pub trait IFundManager { contact_handle: ByteArray, reason: ByteArray ); - fn getCurrentId(self: @TContractState) -> u128; - fn getFund(self: @TContractState, id: u128) -> ContractAddress; - fn getOwner(self: @TContractState) -> ContractAddress; - fn getFundClassHash(self: @TContractState) -> ClassHash; + fn get_current_id(self: @TContractState) -> u128; + fn get_fund(self: @TContractState, id: u128) -> ContractAddress; + fn get_owner(self: @TContractState) -> ContractAddress; + fn get_fund_class_hash(self: @TContractState) -> ClassHash; } #[starknet::contract] @@ -78,7 +78,7 @@ pub mod FundManager { #[abi(embed_v0)] impl FundManagerImpl of super::IFundManager { - fn newFund( + fn new_fund( ref self: ContractState, name: ByteArray, goal: u256, @@ -112,16 +112,16 @@ pub mod FundManager { self.current_id.write(self.current_id.read() + 1); } - fn getCurrentId(self: @ContractState) -> u128 { + fn get_current_id(self: @ContractState) -> u128 { return self.current_id.read(); } - fn getFund(self: @ContractState, id: u128) -> ContractAddress { + fn get_fund(self: @ContractState, id: u128) -> ContractAddress { return self.funds.read(id); } - fn getOwner(self: @ContractState) -> ContractAddress { + fn get_owner(self: @ContractState) -> ContractAddress { return self.owner.read(); } - fn getFundClassHash(self: @ContractState) -> ClassHash { + fn get_fund_class_hash(self: @ContractState) -> ClassHash { return self.fund_class_hash.read(); } } diff --git a/contracts/tests/test_donator.cairo b/contracts/tests/test_donator.cairo index 62d758e..da6803b 100644 --- a/contracts/tests/test_donator.cairo +++ b/contracts/tests/test_donator.cairo @@ -28,7 +28,7 @@ fn __setup__() -> ContractAddress { fn test_get_owner() { let contract_address = __setup__(); let dispatcher = IDonatorDispatcher { contract_address }; - let owner = dispatcher.getOwner(); + let owner = dispatcher.get_owner(); assert(owner == OWNER(), 'Invalid owner'); } @@ -36,7 +36,7 @@ fn test_get_owner() { fn test_get_level() { let contract_address = __setup__(); let dispatcher = IDonatorDispatcher { contract_address }; - let level = dispatcher.getLevel(); + let level = dispatcher.get_level(); assert(level == 1, 'Invalid level'); } @@ -44,7 +44,7 @@ fn test_get_level() { fn test_get_total_stark_donations() { let contract_address = __setup__(); let dispatcher = IDonatorDispatcher { contract_address }; - let total_stark_donations = dispatcher.getTotalStarkDonations(); + let total_stark_donations = dispatcher.get_total_stark_donations(); assert(total_stark_donations == 0, 'Invalid total stark donations'); } @@ -52,7 +52,7 @@ fn test_get_total_stark_donations() { fn test_get_max_stark_donations_to_next_level() { let contract_address = __setup__(); let dispatcher = IDonatorDispatcher { contract_address }; - let max_stark_donations_to_next_level = dispatcher.getMaxStarkDonationsToNextLevel(); + let max_stark_donations_to_next_level = dispatcher.get_max_stark_donations_to_next_level(); assert(max_stark_donations_to_next_level == 10, 'Invalid total stark donations'); } @@ -60,18 +60,18 @@ fn test_get_max_stark_donations_to_next_level() { fn test_update_donator_values() { let contract_address = __setup__(); let dispatcher = IDonatorDispatcher { contract_address }; - dispatcher.updateDonatorValues(5); - let level = dispatcher.getLevel(); - let total_stark_donations = dispatcher.getTotalStarkDonations(); + dispatcher.update_donator_values(5); + let level = dispatcher.get_level(); + let total_stark_donations = dispatcher.get_total_stark_donations(); assert(level == 1, 'Invalid level'); assert(total_stark_donations == 5, 'Invalid total stark donations'); - dispatcher.updateDonatorValues(5); - let level = dispatcher.getLevel(); + dispatcher.update_donator_values(5); + let level = dispatcher.get_level(); assert(level == 1, 'Invalid level'); - dispatcher.updateDonatorValues(1); - let level = dispatcher.getLevel(); - let total_stark_donations = dispatcher.getTotalStarkDonations(); - let max_stark_donations_to_next_level = dispatcher.getMaxStarkDonationsToNextLevel(); + dispatcher.update_donator_values(1); + let level = dispatcher.get_level(); + let total_stark_donations = dispatcher.get_total_stark_donations(); + let max_stark_donations_to_next_level = dispatcher.get_max_stark_donations_to_next_level(); assert(level == 2, 'Invalid level'); assert(total_stark_donations == 11, 'Invalid total stark donations'); assert(max_stark_donations_to_next_level == 20, 'Invalid total stark donations'); diff --git a/contracts/tests/test_donator_manager.cairo b/contracts/tests/test_donator_manager.cairo index 1187b47..78dc4a9 100644 --- a/contracts/tests/test_donator_manager.cairo +++ b/contracts/tests/test_donator_manager.cairo @@ -46,8 +46,8 @@ fn test_constructor() { start_cheat_caller_address_global(OWNER()); let (contract_address, donator_class_hash) = __setup__(); let donator_manager_contract = IDonatorManagerDispatcher { contract_address }; - let expected_donator_address = donator_manager_contract.getDonatorClassHash(); - let owner = donator_manager_contract.getOwner(); + let expected_donator_address = donator_manager_contract.get_donator_class_hash(); + let owner = donator_manager_contract.get_owner(); assert(owner == OWNER(), 'Invalid owner'); assert(donator_class_hash == expected_donator_address, 'Invalid donator class hash'); } @@ -57,9 +57,9 @@ fn test_new_donator() { start_cheat_caller_address_global(OWNER()); let (contract_address, donator_class_hash) = __setup__(); let donator_manager_contract = IDonatorManagerDispatcher { contract_address }; - donator_manager_contract.newDonator(); + donator_manager_contract.new_donator(); let expected_donator_class_hash = get_class_hash( - donator_manager_contract.getDonatorByAddress(OWNER()) + donator_manager_contract.get_donator_by_address(OWNER()) ); assert(expected_donator_class_hash == donator_class_hash, 'Invalid donator address'); } @@ -70,7 +70,7 @@ fn test_emit_event_donator_contract_deployed() { let (contract_address, _) = __setup__(); let donator_manager_contract = IDonatorManagerDispatcher { contract_address }; let mut spy = spy_events(); - donator_manager_contract.newDonator(); + donator_manager_contract.new_donator(); spy .assert_emitted( @@ -79,7 +79,7 @@ fn test_emit_event_donator_contract_deployed() { contract_address, DonatorManager::Event::DonatorContractDeployed( DonatorManager::DonatorContractDeployed { - new_donator: donator_manager_contract.getDonatorByAddress(OWNER()), + new_donator: donator_manager_contract.get_donator_by_address(OWNER()), owner: OWNER() } ) diff --git a/contracts/tests/test_fund.cairo b/contracts/tests/test_fund.cairo index 1a034a1..cf64b8b 100644 --- a/contracts/tests/test_fund.cairo +++ b/contracts/tests/test_fund.cairo @@ -81,14 +81,14 @@ fn _setup_() -> ContractAddress { fn test_constructor() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - let id = dispatcher.getId(); - let owner = dispatcher.getOwner(); - let name = dispatcher.getName(); - let reason = dispatcher.getReason(); - let up_votes = dispatcher.getUpVotes(); - let goal = dispatcher.getGoal(); + let id = dispatcher.get_id(); + let owner = dispatcher.get_owner(); + let name = dispatcher.get_name(); + let reason = dispatcher.get_reason(); + let up_votes = dispatcher.get_up_votes(); + let goal = dispatcher.get_goal(); let current_goal_state = dispatcher.get_current_goal_state(); - let state = dispatcher.getState(); + let state = dispatcher.get_state(); assert(id == ID(), 'Invalid id'); assert(owner == OWNER(), 'Invalid owner'); assert(name == NAME(), 'Invalid name'); @@ -103,11 +103,11 @@ fn test_constructor() { fn test_set_name() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - let name = dispatcher.getName(); + let name = dispatcher.get_name(); assert(name == NAME(), 'Invalid name'); start_cheat_caller_address_global(OWNER()); - dispatcher.setName("NEW_NAME"); - let new_name = dispatcher.getName(); + dispatcher.set_name("NEW_NAME"); + let new_name = dispatcher.get_name(); assert(new_name == "NEW_NAME", 'Set name method not working') } @@ -115,11 +115,11 @@ fn test_set_name() { fn test_set_reason() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - let reason = dispatcher.getReason(); + let reason = dispatcher.get_reason(); assert(reason == REASON_1(), 'Invalid reason'); start_cheat_caller_address_global(OWNER()); - dispatcher.setReason(REASON_2()); - let new_reason = dispatcher.getReason(); + dispatcher.set_reason(REASON_2()); + let new_reason = dispatcher.get_reason(); assert(new_reason == REASON_2(), 'Set reason method not working') } @@ -127,11 +127,11 @@ fn test_set_reason() { fn test_set_goal() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - let goal = dispatcher.getGoal(); + let goal = dispatcher.get_goal(); assert(goal == GOAL(), 'Invalid goal'); start_cheat_caller_address_global(FUND_MANAGER()); - dispatcher.setGoal(123); - let new_goal = dispatcher.getGoal(); + dispatcher.set_goal(123); + let new_goal = dispatcher.get_goal(); assert(new_goal == 123, 'Set goal method not working') } @@ -139,11 +139,11 @@ fn test_set_goal() { fn test_receive_vote_successful() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - dispatcher.receiveVote(); - let me = dispatcher.getVoter(); + dispatcher.receive_vote(); + let me = dispatcher.get_voter(); // Owner vote, fund have one vote assert(me == 1, 'Owner is not in the voters'); - let votes = dispatcher.getUpVotes(); + let votes = dispatcher.get_up_votes(); assert(votes == 1, 'Vote unuseccessful'); } @@ -152,14 +152,14 @@ fn test_receive_vote_successful() { fn test_receive_vote_unsuccessful_double_vote() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; - dispatcher.receiveVote(); - let me = dispatcher.getVoter(); + dispatcher.receive_vote(); + let me = dispatcher.get_voter(); // Owner vote, fund have one vote assert(me == 1, 'Owner is not in the voters'); - let votes = dispatcher.getUpVotes(); + let votes = dispatcher.get_up_votes(); assert(votes == 1, 'Vote unuseccessful'); // Owner vote, second time - dispatcher.receiveVote(); + dispatcher.receive_vote(); } #[test] @@ -170,7 +170,7 @@ fn test_new_vote_received_event_emitted_successful() { let mut spy = spy_events(); start_cheat_caller_address(contract_address, OTHER_USER()); - dispatcher.receiveVote(); + dispatcher.receive_vote(); spy .assert_emitted( @@ -193,7 +193,7 @@ fn test_set_goal_unauthorized() { let contract_address = _setup_(); let dispatcher = IFundDispatcher { contract_address }; // Change the goal without being the fund manager - dispatcher.setGoal(22); + dispatcher.set_goal(22); } @@ -215,7 +215,7 @@ fn test_withdraw_with_non_closed_state() { start_cheat_caller_address_global(FUND_MANAGER()); // set goal - fund_dispatcher.setGoal(500_u256); + fund_dispatcher.set_goal(500_u256); start_cheat_caller_address_global(OWNER()); // withdraw funds @@ -235,11 +235,11 @@ fn test_withdraw() { //Set donation state start_cheat_caller_address(contract_address, VALID_ADDRESS_1()); - dispatcher.setState(2); + dispatcher.set_state(2); stop_cheat_caller_address(contract_address); start_cheat_caller_address(contract_address, FUND_MANAGER()); - dispatcher.setGoal(goal); + dispatcher.set_goal(goal); stop_cheat_caller_address(contract_address); start_cheat_caller_address(token_address, minter_address); @@ -261,7 +261,7 @@ fn test_withdraw() { dispatcher.update_receive_donation(goal); stop_cheat_caller_address(contract_address); - assert(dispatcher.getState() == FundStates::CLOSED, 'state is not closed'); + assert(dispatcher.get_state() == FundStates::CLOSED, 'state is not closed'); assert(dispatcher.get_current_goal_state() == goal, 'goal not reached'); start_cheat_caller_address(contract_address, OWNER()); From ec4345926d2ce6d79201eb8035cdc65300bbd9f4 Mon Sep 17 00:00:00 2001 From: Josue Soto Date: Thu, 14 Nov 2024 18:42:07 -0600 Subject: [PATCH 2/2] [fix] Update contracts variable and function names.. --- contracts/tests/test_fund_manager.cairo | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contracts/tests/test_fund_manager.cairo b/contracts/tests/test_fund_manager.cairo index effffd5..98be44d 100755 --- a/contracts/tests/test_fund_manager.cairo +++ b/contracts/tests/test_fund_manager.cairo @@ -76,8 +76,8 @@ fn test_constructor() { start_cheat_caller_address_global(OWNER()); let (contract_address, fund_class_hash) = _setup_(); let fund_manager_contract = IFundManagerDispatcher { contract_address }; - let expected_fund_address = fund_manager_contract.getFundClassHash(); - let owner = fund_manager_contract.getOwner(); + let expected_fund_address = fund_manager_contract.get_fund_class_hash(); + let owner = fund_manager_contract.get_owner(); assert(owner == OWNER(), 'Invalid owner'); assert(fund_class_hash == expected_fund_address, 'Invalid fund class hash'); } @@ -87,9 +87,9 @@ fn test_new_fund() { start_cheat_caller_address_global(OWNER()); let (contract_address, fund_class_hash) = _setup_(); let fund_manager_contract = IFundManagerDispatcher { contract_address }; - fund_manager_contract.newFund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); - let expected_fund_class_hash = get_class_hash(fund_manager_contract.getFund(1)); - let current_id = fund_manager_contract.getCurrentId(); + fund_manager_contract.new_fund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); + let expected_fund_class_hash = get_class_hash(fund_manager_contract.get_fund(1)); + let current_id = fund_manager_contract.get_current_id(); assert(expected_fund_class_hash == fund_class_hash, 'Invalid fund address'); assert(current_id == 2, 'Invalid current ID'); } @@ -100,7 +100,7 @@ fn test_new_fund_bad_goal() { start_cheat_caller_address_global(OWNER()); let (contract_address, _) = _setup_(); let fund_manager_contract = IFundManagerDispatcher { contract_address }; - fund_manager_contract.newFund(NAME(), BAD_GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); + fund_manager_contract.new_fund(NAME(), BAD_GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); } #[test] @@ -112,10 +112,10 @@ fn test_fund_deployed_event() { let mut spy = spy_events(); - let current_id = fund_manager_contract.getCurrentId(); - fund_manager_contract.newFund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); + let current_id = fund_manager_contract.get_current_id(); + fund_manager_contract.new_fund(NAME(), GOAL(), EVIDENCE_LINK(), CONTACT_HANDLE(), REASON()); - let expected_fund_class_hash = fund_manager_contract.getFund(1); + let expected_fund_class_hash = fund_manager_contract.get_fund(1); spy .assert_emitted(