diff --git a/contract/Cargo.toml b/contract/Cargo.toml index 8a70700..7b31f8d 100755 --- a/contract/Cargo.toml +++ b/contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bright_disputes" version = "0.1.0" -authors = ["Michal Gralinski michal.gralinski@brightinventions.pl"] +authors = ["Bright Inventions"] edition = "2021" license = "MIT" publish = false diff --git a/contract/src/contract.rs b/contract/src/contract.rs index 9b1f265..c79b3c3 100755 --- a/contract/src/contract.rs +++ b/contract/src/contract.rs @@ -10,7 +10,7 @@ pub mod bright_disputes { dispute::{Dispute, DisputeResult}, dispute_round::DisputeRound, error::BrightDisputesError, - jure::{Jure, JuriesMap}, + juror::{Juror, JuriesMap}, types::{DisputeId, Result, VoteValue}, vote::Vote, }; @@ -45,15 +45,15 @@ pub mod bright_disputes { pub struct BrightDisputes { last_dispute_id: DisputeId, juries_pool: Vec, - juries: Mapping, + juries: Mapping, disputes: Mapping, } impl JuriesMap for BrightDisputes { - fn get_jure_or_assert(&self, jure_id: AccountId) -> Result { + fn get_juror_or_assert(&self, juror_id: AccountId) -> Result { self.juries - .get(jure_id) - .ok_or(BrightDisputesError::JureNotExist) + .get(juror_id) + .ok_or(BrightDisputesError::JurorNotExist) } fn remove_random_juries_from_pool_or_assert( @@ -63,14 +63,14 @@ pub mod bright_disputes { ) -> Result> { let juries_ids = self.get_random_juries_from_pool(&except, number, 123 as u64)?; for id in &juries_ids { - self.remove_jure_from_pool_or_assert(*id)?; + self.remove_juror_from_pool_or_assert(*id)?; } Ok(juries_ids) } - /// Update jure - fn update_jure(&mut self, jure: Jure) { - self.juries.insert(jure.id(), &jure); + /// Update juror + fn update_juror(&mut self, juror: Juror) { + self.juries.insert(juror.id(), &juror); } } @@ -190,46 +190,46 @@ pub mod bright_disputes { Ok(()) } - /// Voting, only jure can do it. + /// Voting, only juror can do it. #[ink(message)] pub fn vote(&mut self, dispute_id: DisputeId, vote: VoteValue) -> Result<()> { let caller = ink::env::caller::(); let mut dispute = self.get_dispute_or_assert(dispute_id)?; - let mut jure = self.get_jure_or_assert(caller)?; + let mut juror = self.get_juror_or_assert(caller)?; dispute.vote(Vote::create(caller, vote))?; - jure.action_done(dispute.id())?; - self.update_jure(jure); + juror.action_done(dispute.id())?; + self.update_juror(juror); self.update_dispute(dispute); Ok(()) } - /// Register as an active jure. Juries are picked + /// Register as an active juror. Juries are picked /// from this pool to participate in disputes. #[ink(message)] - pub fn register_as_an_active_jure(&mut self) -> Result<()> { + pub fn register_as_an_active_juror(&mut self) -> Result<()> { let caller = ink::env::caller::(); - self.assert_jure_not_in_pool(caller)?; + self.assert_juror_not_in_pool(caller)?; - let jure = self + let juror = self .juries .get(caller) - .unwrap_or_else(|| Jure::create(caller)); - self.juries_pool.push(jure.id()); - self.update_jure(jure); + .unwrap_or_else(|| Juror::create(caller)); + self.juries_pool.push(juror.id()); + self.update_juror(juror); Ok(()) } - /// Unregister jure from the active juries pool. + /// Unregister juror from the active juries pool. #[ink(message)] - pub fn unregister_as_an_active_jure(&mut self) -> Result<()> { + pub fn unregister_as_an_active_juror(&mut self) -> Result<()> { let caller = ink::env::caller::(); - self.remove_jure_from_pool_or_assert(caller)?; + self.remove_juror_from_pool_or_assert(caller)?; Ok(()) } - /// Assigned jure can confirm his participation in dispute + /// Assigned juror can confirm his participation in dispute #[ink(message, payable)] - pub fn confirm_jure_participation_in_dispute( + pub fn confirm_juror_participation_in_dispute( &mut self, dispute_id: DisputeId, ) -> Result<()> { @@ -237,9 +237,9 @@ pub mod bright_disputes { self.assert_transferred(dispute.escrow())?; let caller = ink::env::caller::(); - let mut jure = self.get_jure_or_assert(caller)?; - jure.confirm_participation_in_dispute(dispute_id)?; - self.update_jure(jure); + let mut juror = self.get_juror_or_assert(caller)?; + juror.confirm_participation_in_dispute(dispute_id)?; + self.update_juror(juror); dispute.increment_deposit(); self.update_dispute(dispute); @@ -256,16 +256,16 @@ pub mod bright_disputes { self.assert_transferred(dispute.escrow())?; let caller = ink::env::caller::(); - let mut jure = self.get_jure_or_assert(caller)?; - jure.confirm_participation_in_dispute(dispute_id)?; - self.update_jure(jure); + let mut juror = self.get_juror_or_assert(caller)?; + juror.confirm_participation_in_dispute(dispute_id)?; + self.update_juror(juror); dispute.increment_deposit(); self.update_dispute(dispute); Ok(()) } - /// Unregister jure from the active juries pool. + /// Unregister juror from the active juries pool. #[ink(message)] pub fn process_dispute_round(&mut self, dispute_id: DisputeId) -> Result<()> { let timestamp = self.env().block_timestamp(); @@ -275,17 +275,17 @@ pub mod bright_disputes { BrightDisputesError::DisputeRoundDeadlineReached => { // Check if judge counted the votes. if let Some(judge_id) = dispute.judge() { - let judge = self.get_jure_or_assert(judge_id)?; + let judge = self.get_juror_or_assert(judge_id)?; if judge.is_requested_for_action(dispute_id) { dispute.move_to_banned(judge_id)?; } } // Check if juries votes - for jure_id in dispute.juries() { - let jure = self.get_jure_or_assert(jure_id)?; - if jure.is_requested_for_action(dispute_id) { - dispute.move_to_banned(jure_id)?; + for juror_id in dispute.juries() { + let juror = self.get_juror_or_assert(juror_id)?; + if juror.is_requested_for_action(dispute_id) { + dispute.move_to_banned(juror_id)?; } } @@ -295,10 +295,10 @@ pub mod bright_disputes { BrightDisputesError::MajorityOfVotesNotReached => { // Check if juries votes - for jure_id in dispute.juries() { - let jure = self.get_jure_or_assert(jure_id)?; - if jure.is_requested_for_action(dispute_id) { - dispute.move_to_banned(jure_id)?; + for juror_id in dispute.juries() { + let juror = self.get_juror_or_assert(juror_id)?; + if juror.is_requested_for_action(dispute_id) { + dispute.move_to_banned(juror_id)?; } } @@ -345,8 +345,8 @@ pub mod bright_disputes { } // Add juries, who were not banned. - for jure_id in dispute.juries() { - accounts.push(jure_id); + for juror_id in dispute.juries() { + accounts.push(juror_id); } // Split deposit and transfer founds. @@ -376,12 +376,12 @@ pub mod bright_disputes { .ok_or(BrightDisputesError::DisputeNotExist) } - fn remove_jure_from_pool_or_assert(&mut self, jure_id: AccountId) -> Result<()> { - if let Some(index) = self.juries_pool.iter().position(|&j| j == jure_id) { + fn remove_juror_from_pool_or_assert(&mut self, juror_id: AccountId) -> Result<()> { + if let Some(index) = self.juries_pool.iter().position(|&j| j == juror_id) { self.juries_pool.remove(index); return Ok(()); } - return Err(BrightDisputesError::NotRegisteredAsJure); + return Err(BrightDisputesError::NotRegisteredAsJuror); } fn get_random_juries_from_pool( @@ -393,8 +393,8 @@ pub mod bright_disputes { let filtered_pool: Vec = self .juries_pool .iter() - .filter(|jure_id| !except_juries.contains(&jure_id)) - .map(|&jure_id| jure_id) + .filter(|juror_id| !except_juries.contains(&juror_id)) + .map(|&juror_id| juror_id) .collect(); let pool_len: u64 = filtered_pool.len().try_into().unwrap(); @@ -416,10 +416,10 @@ pub mod bright_disputes { random + seed } - fn assert_jure_not_in_pool(&self, jure_id: AccountId) -> Result<()> { + fn assert_juror_not_in_pool(&self, juror_id: AccountId) -> Result<()> { for j in &self.juries_pool { - if *j == jure_id { - return Err(BrightDisputesError::JureAlreadyRegistered); + if *j == juror_id { + return Err(BrightDisputesError::JurorAlreadyRegistered); } } return Ok(()); @@ -466,20 +466,20 @@ pub mod bright_disputes { let accounts = ink::env::test::default_accounts::(); set_caller::(accounts.charlie); bright_disputes - .register_as_an_active_jure() - .expect("Failed to register charlie as a jure!"); + .register_as_an_active_juror() + .expect("Failed to register charlie as a juror!"); set_caller::(accounts.eve); bright_disputes - .register_as_an_active_jure() - .expect("Failed to register eve as a jure!"); + .register_as_an_active_juror() + .expect("Failed to register eve as a juror!"); set_caller::(accounts.frank); bright_disputes - .register_as_an_active_jure() - .expect("Failed to register frank as a jure!"); + .register_as_an_active_juror() + .expect("Failed to register frank as a juror!"); set_caller::(accounts.django); bright_disputes - .register_as_an_active_jure() - .expect("Failed to register django as a jure!"); + .register_as_an_active_juror() + .expect("Failed to register django as a juror!"); assert_eq!(bright_disputes.juries_pool.len(), 4); assert!(bright_disputes.juries.contains(accounts.charlie)); @@ -719,9 +719,9 @@ pub mod bright_disputes { assert_eq!(result, Ok(())); } - /// Test jure registration + /// Test juror registration #[ink::test] - fn jure_register() { + fn juror_register() { let accounts = ink::env::test::default_accounts::(); set_caller::(accounts.alice); @@ -730,50 +730,50 @@ pub mod bright_disputes { assert!(!bright_disputes.juries.contains(accounts.alice)); // Success - let result = bright_disputes.register_as_an_active_jure(); + let result = bright_disputes.register_as_an_active_juror(); assert_eq!(result, Ok(())); assert_eq!(bright_disputes.juries_pool.len(), 1); assert!(bright_disputes.juries.contains(accounts.alice)); - // Failed to register already registered jure - let result = bright_disputes.register_as_an_active_jure(); - assert_eq!(result, Err(BrightDisputesError::JureAlreadyRegistered)); + // Failed to register already registered juror + let result = bright_disputes.register_as_an_active_juror(); + assert_eq!(result, Err(BrightDisputesError::JurorAlreadyRegistered)); assert_eq!(bright_disputes.juries_pool.len(), 1); assert!(bright_disputes.juries.contains(accounts.alice)); } - /// Test jure unregistration + /// Test juror unregistration #[ink::test] - fn jure_unregister() { + fn juror_unregister() { let accounts = ink::env::test::default_accounts::(); set_caller::(accounts.alice); let mut bright_disputes = BrightDisputes::new(); - // Failed to unregister jure, no jure in the pool - let result = bright_disputes.unregister_as_an_active_jure(); - assert_eq!(result, Err(BrightDisputesError::NotRegisteredAsJure)); + // Failed to unregister juror, no juror in the pool + let result = bright_disputes.unregister_as_an_active_juror(); + assert_eq!(result, Err(BrightDisputesError::NotRegisteredAsJuror)); assert_eq!(bright_disputes.juries_pool.len(), 0); assert!(!bright_disputes.juries.contains(accounts.alice)); bright_disputes - .register_as_an_active_jure() - .expect("Failed to register a jure!"); + .register_as_an_active_juror() + .expect("Failed to register a juror!"); // Success - let result = bright_disputes.unregister_as_an_active_jure(); + let result = bright_disputes.unregister_as_an_active_juror(); assert_eq!(result, Ok(())); assert_eq!(bright_disputes.juries_pool.len(), 0); assert!(bright_disputes.juries.contains(accounts.alice)); - // Failed to unregister jure, jure already unregistered - let result = bright_disputes.unregister_as_an_active_jure(); - assert_eq!(result, Err(BrightDisputesError::NotRegisteredAsJure)); + // Failed to unregister juror, juror already unregistered + let result = bright_disputes.unregister_as_an_active_juror(); + assert_eq!(result, Err(BrightDisputesError::NotRegisteredAsJuror)); } // Test juries confirmation to the dispute case. #[ink::test] - fn confirm_judge_and_jure_participation_in_dispute() { + fn confirm_judge_and_juror_participation_in_dispute() { let accounts = ink::env::test::default_accounts::(); set_caller::(accounts.alice); @@ -783,10 +783,10 @@ pub mod bright_disputes { // Register charlie, django, eve and frank as a juries. register_valid_juries(&mut bright_disputes); - // Fail to confirm jure, when he is not assigned. + // Fail to confirm juror, when he is not assigned. set_caller::(accounts.charlie); - let result = bright_disputes.confirm_jure_participation_in_dispute(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureIsNotAssignedToDispute)); + let result = bright_disputes.confirm_juror_participation_in_dispute(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorIsNotAssignedToDispute)); // Switch to "PickingJuriesAndJudge" state. set_caller::(accounts.alice); @@ -814,29 +814,29 @@ pub mod bright_disputes { assert_eq!(result, Ok(())); // Confirm juries - for jure in &dispute.juries() { - set_caller::(*jure); + for juror in &dispute.juries() { + set_caller::(*juror); - // Fail to confirm jure, invalid escrow + // Fail to confirm juror, invalid escrow set_value_transferred::(5); assert_eq!( - bright_disputes.confirm_jure_participation_in_dispute(dispute_id), + bright_disputes.confirm_juror_participation_in_dispute(dispute_id), Err(BrightDisputesError::InvalidEscrowAmount) ); // Success set_value_transferred::(10); assert_eq!( - bright_disputes.confirm_jure_participation_in_dispute(dispute_id), + bright_disputes.confirm_juror_participation_in_dispute(dispute_id), Ok(()) ); } // Failed to confirm twice - let result = bright_disputes.confirm_jure_participation_in_dispute(dispute_id); + let result = bright_disputes.confirm_juror_participation_in_dispute(dispute_id); assert_eq!( result, - Err(BrightDisputesError::JureAlreadyConfirmedDispute) + Err(BrightDisputesError::JurorAlreadyConfirmedDispute) ); // Switch to "Voting" state. @@ -871,32 +871,32 @@ pub mod bright_disputes { // Assign all juries let assigned_juries = dispute.juries(); - let mut jure_not_assigned = vec![ + let mut juror_not_assigned = vec![ accounts.charlie, accounts.eve, accounts.frank, accounts.django, ]; - jure_not_assigned.retain(|id| !assigned_juries.contains(id)); + juror_not_assigned.retain(|id| !assigned_juries.contains(id)); - // Confirm jure participation + // Confirm juror participation set_caller::(assigned_juries[0]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[1]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[2]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); // Assign judge - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); bright_disputes .confirm_judge_participation_in_dispute(dispute_id) .expect("Failed to confirm judge participation!"); @@ -968,32 +968,32 @@ pub mod bright_disputes { // Assign all juries let assigned_juries = dispute.juries(); - let mut jure_not_assigned = vec![ + let mut juror_not_assigned = vec![ accounts.charlie, accounts.eve, accounts.frank, accounts.django, ]; - jure_not_assigned.retain(|id| !assigned_juries.contains(id)); + juror_not_assigned.retain(|id| !assigned_juries.contains(id)); - // Confirm jure participation + // Confirm juror participation set_caller::(assigned_juries[0]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[1]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[2]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); // Assign judge - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); bright_disputes .confirm_judge_participation_in_dispute(dispute_id) .expect("Failed to confirm judge participation!"); @@ -1022,7 +1022,7 @@ pub mod bright_disputes { assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); // Count the votes, dispute ends - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); let result = bright_disputes.process_dispute_round(dispute_id); assert_eq!(result, Ok(())); } @@ -1052,32 +1052,32 @@ pub mod bright_disputes { // Assign all juries let assigned_juries = dispute.juries(); - let mut jure_not_assigned = vec![ + let mut juror_not_assigned = vec![ accounts.charlie, accounts.eve, accounts.frank, accounts.django, ]; - jure_not_assigned.retain(|id| !assigned_juries.contains(id)); + juror_not_assigned.retain(|id| !assigned_juries.contains(id)); - // Confirm jure participation + // Confirm juror participation set_caller::(assigned_juries[0]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[1]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[2]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); // Assign judge - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); bright_disputes .confirm_judge_participation_in_dispute(dispute_id) .expect("Failed to confirm judge participation!"); @@ -1102,7 +1102,7 @@ pub mod bright_disputes { assert_eq!(result, Ok(())); // Majority of votes not reached, new round. - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); let result = bright_disputes.process_dispute_round(dispute_id); assert_eq!(result, Ok(())); @@ -1137,32 +1137,32 @@ pub mod bright_disputes { // Assign all juries let assigned_juries = dispute.juries(); - let mut jure_not_assigned = vec![ + let mut juror_not_assigned = vec![ accounts.charlie, accounts.eve, accounts.frank, accounts.django, ]; - jure_not_assigned.retain(|id| !assigned_juries.contains(id)); + juror_not_assigned.retain(|id| !assigned_juries.contains(id)); - // Confirm jure participation + // Confirm juror participation set_caller::(assigned_juries[0]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[1]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); set_caller::(assigned_juries[2]); bright_disputes - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .expect("Failed confirm juries participation!"); // Assign judge - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); bright_disputes .confirm_judge_participation_in_dispute(dispute_id) .expect("Failed to confirm judge participation!"); @@ -1188,7 +1188,7 @@ pub mod bright_disputes { .expect("Failed process dispute round!"); // Count the votes, dispute ends - set_caller::(jure_not_assigned[0]); + set_caller::(juror_not_assigned[0]); bright_disputes .process_dispute_round(dispute_id) .expect("Failed process dispute round!"); diff --git a/contract/src/dispute.rs b/contract/src/dispute.rs index 192cf3f..3adcfd7 100644 --- a/contract/src/dispute.rs +++ b/contract/src/dispute.rs @@ -8,7 +8,7 @@ use ink::{ use crate::{ dispute_round::DisputeRound, error::BrightDisputesError, - jure::{Jure, JuriesMap}, + juror::{Juror, JuriesMap}, types::{Balance, DisputeId, Result, Timestamp}, vote::Vote, }; @@ -198,9 +198,9 @@ impl Dispute { // Move juries who wrongly voted to banned list let juries_to_ban = self.get_juries_voted_against(result.opposite()); - for jure in juries_to_ban { - self.move_to_banned(jure) - .expect("Jure is not assigned to the dispute!"); + for juror in juries_to_ban { + self.move_to_banned(juror) + .expect("Juror is not assigned to the dispute!"); } Ok(()) } @@ -225,8 +225,8 @@ impl Dispute { pub fn vote(&mut self, vote: Vote) -> Result<()> { self.assert_state(DisputeState::Running)?; self.assert_can_vote()?; - self.assert_jure(vote.jure())?; - self.assert_not_voted(vote.jure())?; + self.assert_juror(vote.juror())?; + self.assert_not_voted(vote.juror())?; self.votes.push(vote); Ok(()) } @@ -258,19 +258,19 @@ impl Dispute { Err(BrightDisputesError::MajorityOfVotesNotReached) } - /// Assign jure to the dispute - pub fn assign_jure(&mut self, jure: &mut Jure) -> Result<()> { + /// Assign juror to the dispute + pub fn assign_juror(&mut self, juror: &mut Juror) -> Result<()> { self.assert_state(DisputeState::Running)?; - self.assert_not_jure(jure.id())?; - self.assert_not_owner_call(jure.id())?; - self.assert_not_defendant_call(jure.id())?; - jure.assign_to_dispute(self.id)?; - self.juries.push(jure.id()); + self.assert_not_juror(juror.id())?; + self.assert_not_owner_call(juror.id())?; + self.assert_not_defendant_call(juror.id())?; + juror.assign_to_dispute(self.id)?; + self.juries.push(juror.id()); Ok(()) } /// Assign judge to the dispute - pub fn assign_judge(&mut self, judge: &mut Jure) -> Result<()> { + pub fn assign_judge(&mut self, judge: &mut Juror) -> Result<()> { self.assert_state(DisputeState::Running)?; self.assert_not_owner_call(judge.id())?; self.assert_not_defendant_call(judge.id())?; @@ -278,14 +278,14 @@ impl Dispute { return Err(BrightDisputesError::JudgeAlreadyAssignedToDispute); } if self.juries().contains(&judge.id()) { - return Err(BrightDisputesError::JureAlreadyAssignedToDispute); + return Err(BrightDisputesError::JurorAlreadyAssignedToDispute); } judge.assign_to_dispute(self.id)?; self.judge = Some(judge.id()); Ok(()) } - /// Move jure / judge to banned list + /// Move juror / judge to banned list pub fn move_to_banned(&mut self, account_id: AccountId) -> Result<()> { if self.judge.is_some() && (self.judge.unwrap() == account_id) { self.judge = None; @@ -350,7 +350,7 @@ impl Dispute { pub fn get_not_voted_juries(&self) -> Vec { self.juries() .iter() - .filter(|&id| self.votes().iter().position(|v| v.jure() == *id).is_none()) + .filter(|&id| self.votes().iter().position(|v| v.juror() == *id).is_none()) .map(|&id| id) .collect() } @@ -363,7 +363,7 @@ impl Dispute { (dispute_result == DisputeResult::Owner && vote.is_vote_against_owner()) || (dispute_result == DisputeResult::Defendant && !vote.is_vote_against_owner()) }) - .map(|vote| vote.jure()) + .map(|vote| vote.juror()) .collect() } @@ -431,28 +431,28 @@ impl Dispute { Ok(()) } - fn assert_jure(&self, jure: AccountId) -> Result<()> { + fn assert_juror(&self, juror: AccountId) -> Result<()> { for j in &self.juries { - if *j == jure { + if *j == juror { return Ok(()); } } return Err(BrightDisputesError::NotAuthorized); } - fn assert_not_jure(&self, jure: AccountId) -> Result<()> { + fn assert_not_juror(&self, juror: AccountId) -> Result<()> { for j in &self.juries { - if *j == jure { - return Err(BrightDisputesError::JureAlreadyAdded); + if *j == juror { + return Err(BrightDisputesError::JurorAlreadyAdded); } } return Ok(()); } - fn assert_not_voted(&self, jure: AccountId) -> Result<()> { + fn assert_not_voted(&self, juror: AccountId) -> Result<()> { for v in &self.votes { - if v.jure() == jure { - return Err(BrightDisputesError::JureAlreadyVoted); + if v.juror() == juror { + return Err(BrightDisputesError::JurorAlreadyVoted); } } return Ok(()); @@ -472,7 +472,7 @@ mod tests { use ink::env::{test::set_caller, DefaultEnvironment}; use super::*; - use crate::{dispute_round::mock::DisputeRoundFake, jure::mock::JuriesMapMock}; + use crate::{dispute_round::mock::DisputeRoundFake, juror::mock::JuriesMapMock}; fn default_test_running_dispute() -> Dispute { let escrow_amount: Balance = 15; @@ -524,13 +524,13 @@ mod tests { let accounts = ink::env::test::default_accounts::(); let mut dispute = default_test_running_dispute(); - let mut jure = Jure::create(accounts.charlie); - dispute.assign_jure(&mut jure).expect("Unable to add jure!"); + let mut juror = Juror::create(accounts.charlie); + dispute.assign_juror(&mut juror).expect("Unable to add juror!"); // Force "Voting" state dispute.dispute_round = Some(DisputeRoundFake::voting(0u64)); - // Only jure can vote + // Only juror can vote let result = dispute.vote(Vote::create(accounts.bob, 1)); assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); @@ -538,9 +538,9 @@ mod tests { let result = dispute.vote(Vote::create(accounts.charlie, 1)); assert_eq!(result, Ok(())); - // Jure can vote only once + // Juror can vote only once let result = dispute.vote(Vote::create(accounts.charlie, 0)); - assert_eq!(result, Err(BrightDisputesError::JureAlreadyVoted)); + assert_eq!(result, Err(BrightDisputesError::JurorAlreadyVoted)); } #[ink::test] @@ -551,23 +551,23 @@ mod tests { // Force "Voting" state dispute.dispute_round = Some(DisputeRoundFake::voting(0u64)); - let mut charlie = Jure::create(accounts.charlie); + let mut charlie = Juror::create(accounts.charlie); dispute - .assign_jure(&mut charlie) - .expect("Unable to add jure!"); + .assign_juror(&mut charlie) + .expect("Unable to add juror!"); - let mut eve = Jure::create(accounts.eve); - dispute.assign_jure(&mut eve).expect("Unable to add jure!"); + let mut eve = Juror::create(accounts.eve); + dispute.assign_juror(&mut eve).expect("Unable to add juror!"); - let mut frank = Jure::create(accounts.frank); + let mut frank = Juror::create(accounts.frank); dispute - .assign_jure(&mut frank) - .expect("Unable to add jure!"); + .assign_juror(&mut frank) + .expect("Unable to add juror!"); - let mut django = Jure::create(accounts.django); + let mut django = Juror::create(accounts.django); dispute .assign_judge(&mut django) - .expect("Unable to add jure!"); + .expect("Unable to add juror!"); // Test, only judge can count the votes. set_caller::(accounts.alice); @@ -609,30 +609,30 @@ mod tests { } #[ink::test] - fn assign_jure() { + fn assign_juror() { let accounts = ink::env::test::default_accounts::(); let mut dispute = default_test_running_dispute(); - // Failed, owner can't assign as a jure to dispute - let mut alice = Jure::create(accounts.alice); - let result = dispute.assign_jure(&mut alice); + // Failed, owner can't assign as a juror to dispute + let mut alice = Juror::create(accounts.alice); + let result = dispute.assign_juror(&mut alice); assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); - // Failed, defendant can't assign as a jure to dispute - let mut bob = Jure::create(accounts.bob); - let result = dispute.assign_jure(&mut bob); + // Failed, defendant can't assign as a juror to dispute + let mut bob = Juror::create(accounts.bob); + let result = dispute.assign_juror(&mut bob); assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); // Success - let mut jure = Jure::create(accounts.charlie); - let result = dispute.assign_jure(&mut jure); + let mut juror = Juror::create(accounts.charlie); + let result = dispute.assign_juror(&mut juror); assert_eq!(result, Ok(())); - assert_eq!(jure.assigned_dispute(), Some(1)); + assert_eq!(juror.assigned_dispute(), Some(1)); - // Jure already added - let result = dispute.assign_jure(&mut jure); - assert_eq!(result, Err(BrightDisputesError::JureAlreadyAdded)); - assert_eq!(jure.assigned_dispute(), Some(1)); + // Juror already added + let result = dispute.assign_juror(&mut juror); + assert_eq!(result, Err(BrightDisputesError::JurorAlreadyAdded)); + assert_eq!(juror.assigned_dispute(), Some(1)); } #[ink::test] @@ -640,36 +640,36 @@ mod tests { let accounts = ink::env::test::default_accounts::(); let mut dispute = default_test_running_dispute(); - let mut charlie = Jure::create(accounts.charlie); + let mut charlie = Juror::create(accounts.charlie); dispute - .assign_jure(&mut charlie) - .expect("Unable to assign \"charlie\" as a jure!"); + .assign_juror(&mut charlie) + .expect("Unable to assign \"charlie\" as a juror!"); - // Unable to assign jure as a judge + // Unable to assign juror as a judge let result = dispute.assign_judge(&mut charlie); assert_eq!( result, - Err(BrightDisputesError::JureAlreadyAssignedToDispute) + Err(BrightDisputesError::JurorAlreadyAssignedToDispute) ); // Failed, owner can't assign as a judge to dispute - let mut alice = Jure::create(accounts.alice); + let mut alice = Juror::create(accounts.alice); let result = dispute.assign_judge(&mut alice); assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); // Failed, defendant can't assign as a judge to dispute - let mut bob = Jure::create(accounts.bob); + let mut bob = Juror::create(accounts.bob); let result = dispute.assign_judge(&mut bob); assert_eq!(result, Err(BrightDisputesError::NotAuthorized)); - let mut eve = Jure::create(accounts.eve); + let mut eve = Juror::create(accounts.eve); // Success let result = dispute.assign_judge(&mut eve); assert_eq!(result, Ok(())); assert_eq!(eve.assigned_dispute(), Some(1)); - // Jure already added + // Juror already added let result = dispute.assign_judge(&mut eve); assert_eq!( result, @@ -683,15 +683,15 @@ mod tests { let accounts = ink::env::test::default_accounts::(); let mut dispute = default_test_running_dispute(); - let mut jure = Jure::create(accounts.charlie); - dispute.assign_jure(&mut jure).expect("Unable to add jure!"); + let mut juror = Juror::create(accounts.charlie); + dispute.assign_juror(&mut juror).expect("Unable to add juror!"); - let mut judge = Jure::create(accounts.django); + let mut judge = Juror::create(accounts.django); dispute .assign_judge(&mut judge) .expect("Unable to add judge!"); - // Failed to moved unassigned jure or judge. + // Failed to moved unassigned juror or judge. assert_eq!( dispute.move_to_banned(accounts.frank), Err(BrightDisputesError::InvalidAction) @@ -712,7 +712,7 @@ mod tests { ); assert_eq!(dispute.banned.len(), 0); - // Success, moved jure. + // Success, moved juror. let result = dispute.move_to_banned(accounts.charlie); assert_eq!(result, Ok(())); assert_eq!(dispute.juries.len(), 0); @@ -752,7 +752,7 @@ mod tests { 20, ); - let mut juries = JuriesMapMock::create(Jure::create(accounts.charlie)); + let mut juries = JuriesMapMock::create(Juror::create(accounts.charlie)); // Failed, dispute round not started let result = dispute.process_dispute_round(&mut juries, 0u64); @@ -868,13 +868,13 @@ mod tests { let mut dispute = default_test_running_dispute(); let accounts = ink::env::test::default_accounts::(); - let mut charlie = Jure::create(accounts.charlie); + let mut charlie = Juror::create(accounts.charlie); dispute - .assign_jure(&mut charlie) - .expect("Unable to add jure!"); + .assign_juror(&mut charlie) + .expect("Unable to add juror!"); - let mut eve = Jure::create(accounts.eve); - dispute.assign_jure(&mut eve).expect("Unable to add jure!"); + let mut eve = Juror::create(accounts.eve); + dispute.assign_juror(&mut eve).expect("Unable to add juror!"); // Force "Voting" state dispute.dispute_round = Some(DisputeRoundFake::voting(0u64)); @@ -911,16 +911,16 @@ mod tests { // Force "Voting" state dispute.dispute_round = Some(DisputeRoundFake::voting(0u64)); - let mut charlie = Jure::create(accounts.charlie); + let mut charlie = Juror::create(accounts.charlie); dispute - .assign_jure(&mut charlie) - .expect("Unable to add jure!"); + .assign_juror(&mut charlie) + .expect("Unable to add juror!"); dispute .vote(Vote::create(accounts.charlie, 1)) .expect("Failed to vote!"); - let mut eve = Jure::create(accounts.eve); - dispute.assign_jure(&mut eve).expect("Unable to add jure!"); + let mut eve = Juror::create(accounts.eve); + dispute.assign_juror(&mut eve).expect("Unable to add juror!"); assert_eq!(dispute.votes().len(), 1); assert_eq!(dispute.juries().len(), 2); @@ -958,17 +958,17 @@ mod tests { dispute.state = DisputeState::Running; // Charlie vote against Owner - let mut charlie = Jure::create(accounts.charlie); + let mut charlie = Juror::create(accounts.charlie); dispute - .assign_jure(&mut charlie) - .expect("Unable to add jure!"); + .assign_juror(&mut charlie) + .expect("Unable to add juror!"); dispute .vote(Vote::create(accounts.charlie, 1)) .expect("Failed to vote!"); // Eve vote against Defendant - let mut eve = Jure::create(accounts.eve); - dispute.assign_jure(&mut eve).expect("Unable to add jure!"); + let mut eve = Juror::create(accounts.eve); + dispute.assign_juror(&mut eve).expect("Unable to add juror!"); dispute .vote(Vote::create(accounts.eve, 0)) .expect("Failed to vote!"); diff --git a/contract/src/dispute_round.rs b/contract/src/dispute_round.rs index 5cb1cd0..b80fbfd 100644 --- a/contract/src/dispute_round.rs +++ b/contract/src/dispute_round.rs @@ -3,7 +3,7 @@ use ink::{prelude::vec::Vec, primitives::AccountId}; use crate::{ dispute::Dispute, error::BrightDisputesError, - jure::JuriesMap, + juror::JuriesMap, types::{Result, Timestamp}, }; @@ -91,10 +91,10 @@ impl DisputeRound { self.handle_picking_the_judge(contract, dispute)?; // Request juries to vote - for jure_id in dispute.juries() { - let mut jure = contract.get_jure_or_assert(jure_id)?; - jure.request_for_action(dispute.id())?; - contract.update_jure(jure); + for juror_id in dispute.juries() { + let mut juror = contract.get_juror_or_assert(juror_id)?; + juror.request_for_action(dispute.id())?; + contract.update_juror(juror); } self.state = RoundState::Voting; @@ -122,10 +122,10 @@ impl DisputeRound { let juries_ids = contract .remove_random_juries_from_pool_or_assert(&banned_accounts, extend_juries_by)?; - for jure_id in juries_ids { - let mut jure = contract.get_jure_or_assert(jure_id)?; - dispute.assign_jure(&mut jure)?; - contract.update_jure(jure); + for juror_id in juries_ids { + let mut juror = contract.get_juror_or_assert(juror_id)?; + dispute.assign_juror(&mut juror)?; + contract.update_juror(juror); } Ok(()) @@ -145,9 +145,9 @@ impl DisputeRound { let judge_id = contract.remove_random_juries_from_pool_or_assert(&banned_accounts, 1)?; - let mut jure = contract.get_jure_or_assert(judge_id[0])?; - dispute.assign_judge(&mut jure)?; - contract.update_jure(jure); + let mut juror = contract.get_juror_or_assert(judge_id[0])?; + dispute.assign_judge(&mut juror)?; + contract.update_juror(juror); } Ok(()) } @@ -165,9 +165,9 @@ impl DisputeRound { } let dispute_id = dispute.id(); - for jure_id in dispute.juries() { - let jure = contract.get_jure_or_assert(jure_id)?; - if !jure.is_confirmed(dispute_id) { + for juror_id in dispute.juries() { + let juror = contract.get_juror_or_assert(juror_id)?; + if !juror.is_confirmed(dispute_id) { return Err(BrightDisputesError::CanNotSwitchDisputeRound); } } @@ -186,7 +186,7 @@ impl DisputeRound { return Err(BrightDisputesError::CanNotSwitchDisputeRound); } - let judge = contract.get_jure_or_assert(dispute.judge().unwrap())?; + let judge = contract.get_juror_or_assert(dispute.judge().unwrap())?; if !judge.is_confirmed(dispute.id()) { return Err(BrightDisputesError::CanNotSwitchDisputeRound); } @@ -213,9 +213,9 @@ impl DisputeRound { // Request judge to count the votes. let judge_id = dispute.judge().unwrap(); - let mut judge = contract.get_jure_or_assert(judge_id)?; + let mut judge = contract.get_juror_or_assert(judge_id)?; judge.request_for_action(dispute.id())?; - contract.update_jure(judge); + contract.update_juror(judge); self.state = RoundState::CountingTheVotes; self.state_deadline = Self::deadline(timestamp, Self::VOTING_COUNTING); @@ -235,9 +235,9 @@ impl DisputeRound { // Mark judge work as done. let judge_id = dispute.judge().unwrap(); - let mut judge = contract.get_jure_or_assert(judge_id)?; + let mut judge = contract.get_juror_or_assert(judge_id)?; judge.action_done(dispute.id())?; - contract.update_jure(judge); + contract.update_juror(judge); let result = dispute.count_votes()?; dispute.end_dispute(result)?; @@ -275,7 +275,7 @@ mod tests { use super::*; use crate::{ dispute::DisputeResult, - jure::{mock::JuriesMapMock, Jure}, + juror::{mock::JuriesMapMock, Juror}, vote::Vote, }; @@ -311,8 +311,8 @@ mod tests { let mut round = DisputeRound::create(start_timestamp, None); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), ]); // Failed to switch, deadline reached! @@ -324,10 +324,10 @@ mod tests { ); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), - Jure::create(accounts.frank), - Jure::create(accounts.django), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), + Juror::create(accounts.frank), + Juror::create(accounts.django), ]); // Failed, only owner can switch the state @@ -366,10 +366,10 @@ mod tests { let mut round = DisputeRound::create(start_timestamp, None); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), - Jure::create(accounts.frank), - Jure::create(accounts.django), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), + Juror::create(accounts.frank), + Juror::create(accounts.django), ]); // Assign juries and judge to dispute @@ -378,9 +378,9 @@ mod tests { .process_dispute_round(&mut juries, &mut dispute, start_timestamp) .expect("Failed to assign juries and judge!"); - for jure in juries.iter_mut() { - jure.confirm_participation_in_dispute(1) - .expect("Unable confirm jure participation in dispute!"); + for juror in juries.iter_mut() { + juror.confirm_participation_in_dispute(1) + .expect("Unable confirm juror participation in dispute!"); } // Failed, only owner can switch the state @@ -418,10 +418,10 @@ mod tests { let mut round = DisputeRound::create(start_timestamp, None); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), - Jure::create(accounts.frank), - Jure::create(accounts.django), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), + Juror::create(accounts.frank), + Juror::create(accounts.django), ]); set_caller::(accounts.alice); @@ -431,9 +431,9 @@ mod tests { .process_dispute_round(&mut juries, &mut dispute, start_timestamp) .expect("Failed to assign juries and judge!"); - for jure in juries.iter_mut() { - jure.confirm_participation_in_dispute(1) - .expect("Unable confirm jure participation in dispute!"); + for juror in juries.iter_mut() { + juror.confirm_participation_in_dispute(1) + .expect("Unable confirm juror participation in dispute!"); } // Move to voting state @@ -458,10 +458,10 @@ mod tests { // Before voting, we need to update dispute round dispute.set_dispute_round(round.clone()); - for jure_id in dispute.juries() { - set_caller::(jure_id); + for juror_id in dispute.juries() { + set_caller::(juror_id); dispute - .vote(Vote::create(jure_id, 1)) + .vote(Vote::create(juror_id, 1)) .expect("Failed make a vote!"); } @@ -495,10 +495,10 @@ mod tests { let mut round = DisputeRound::create(start_timestamp, None); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), - Jure::create(accounts.frank), - Jure::create(accounts.django), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), + Juror::create(accounts.frank), + Juror::create(accounts.django), ]); set_caller::(accounts.alice); @@ -508,9 +508,9 @@ mod tests { .process_dispute_round(&mut juries, &mut dispute, start_timestamp) .expect("Failed to assign juries and judge!"); - for jure in juries.iter_mut() { - jure.confirm_participation_in_dispute(1) - .expect("Unable confirm jure participation in dispute!"); + for juror in juries.iter_mut() { + juror.confirm_participation_in_dispute(1) + .expect("Unable confirm juror participation in dispute!"); } // Move to voting state @@ -573,10 +573,10 @@ mod tests { let mut round = DisputeRound::create(start_timestamp, None); let mut juries = JuriesMapMock::create_vec(vec![ - Jure::create(accounts.charlie), - Jure::create(accounts.eve), - Jure::create(accounts.frank), - Jure::create(accounts.django), + Juror::create(accounts.charlie), + Juror::create(accounts.eve), + Juror::create(accounts.frank), + Juror::create(accounts.django), ]); set_caller::(accounts.alice); @@ -586,9 +586,9 @@ mod tests { .process_dispute_round(&mut juries, &mut dispute, start_timestamp) .expect("Failed to assign juries and judge!"); - for jure in juries.iter_mut() { - jure.confirm_participation_in_dispute(1) - .expect("Unable confirm jure participation in dispute!"); + for juror in juries.iter_mut() { + juror.confirm_participation_in_dispute(1) + .expect("Unable confirm juror participation in dispute!"); } // Move to voting state diff --git a/contract/src/error.rs b/contract/src/error.rs index 9ed9600..b31d062 100644 --- a/contract/src/error.rs +++ b/contract/src/error.rs @@ -11,14 +11,14 @@ pub enum BrightDisputesError { InvalidAction, InvalidEscrowAmount, - JureAlreadyVoted, - JureAlreadyAdded, - JureAlreadyRegistered, - JureAlreadyAssignedToDispute, - JureIsNotAssignedToDispute, - JureAlreadyConfirmedDispute, - JureInvalidState, - JureNotExist, + JurorAlreadyVoted, + JurorAlreadyAdded, + JurorAlreadyRegistered, + JurorAlreadyAssignedToDispute, + JurorIsNotAssignedToDispute, + JurorAlreadyConfirmedDispute, + JurorInvalidState, + JurorNotExist, JuriesPoolIsToSmall, JuriesNotVoted(Vec), JudgeAlreadyAssignedToDispute, @@ -31,7 +31,7 @@ pub enum BrightDisputesError { MajorityOfVotesNotReached, - NotRegisteredAsJure, + NotRegisteredAsJuror, /// Pallet returned an error (through chain extension). InkError, diff --git a/contract/src/jure.rs b/contract/src/juror.rs similarity index 61% rename from contract/src/jure.rs rename to contract/src/juror.rs index c28514f..9a3f3c3 100644 --- a/contract/src/jure.rs +++ b/contract/src/juror.rs @@ -6,13 +6,13 @@ use crate::{ }; pub trait JuriesMap { - fn get_jure_or_assert(&self, jure_id: AccountId) -> Result; + fn get_juror_or_assert(&self, juror_id: AccountId) -> Result; fn remove_random_juries_from_pool_or_assert( &mut self, except: &Vec, number: u8, ) -> Result>; - fn update_jure(&mut self, jure: Jure); + fn update_juror(&mut self, juror: Juror); } #[derive(Clone, Debug, PartialEq, scale::Decode, scale::Encode)] @@ -33,16 +33,16 @@ pub enum State { feature = "std", derive(ink::storage::traits::StorageLayout, scale_info::TypeInfo) )] -pub struct Jure { +pub struct Juror { id: AccountId, state: State, dispute_id: Option, } -impl Jure { +impl Juror { #[allow(dead_code)] pub fn create(id: AccountId) -> Self { - Jure { + Juror { id, state: State::Pending, dispute_id: None, @@ -75,7 +75,7 @@ impl Jure { return Ok(()); } } - Err(BrightDisputesError::JureInvalidState) + Err(BrightDisputesError::JurorInvalidState) } pub fn action_done(&mut self, dispute_id: DisputeId) -> Result<()> { @@ -85,7 +85,7 @@ impl Jure { return Ok(()); } } - Err(BrightDisputesError::JureInvalidState) + Err(BrightDisputesError::JurorInvalidState) } pub fn assigned_dispute(&self) -> Option { @@ -94,7 +94,7 @@ impl Jure { pub fn assign_to_dispute(&mut self, dispute_id: DisputeId) -> Result<()> { if self.state != State::Pending { - return Err(BrightDisputesError::JureAlreadyAssignedToDispute); + return Err(BrightDisputesError::JurorAlreadyAssignedToDispute); } self.state = State::Assigned; self.dispute_id = Some(dispute_id); @@ -103,9 +103,9 @@ impl Jure { pub fn confirm_participation_in_dispute(&mut self, dispute_id: DisputeId) -> Result<()> { if self.dispute_id.is_none() || self.dispute_id.unwrap() != dispute_id { - return Err(BrightDisputesError::JureIsNotAssignedToDispute); + return Err(BrightDisputesError::JurorIsNotAssignedToDispute); } else if self.state != State::Assigned { - return Err(BrightDisputesError::JureAlreadyConfirmedDispute); + return Err(BrightDisputesError::JurorAlreadyConfirmedDispute); } self.state = State::Confirmed; Ok(()) @@ -119,21 +119,21 @@ pub mod mock { use super::*; pub struct JuriesMapMock { juries_pool: Vec, - juries: Vec, + juries: Vec, } impl JuriesMapMock { - pub fn create(jure: Jure) -> Self { - let juries_pool: Vec = vec![jure.id()]; - let juries: Vec = vec![jure]; + pub fn create(juror: Juror) -> Self { + let juries_pool: Vec = vec![juror.id()]; + let juries: Vec = vec![juror]; JuriesMapMock { juries_pool, juries, } } - pub fn create_vec(juries: Vec) -> Self { - let juries_pool: Vec = juries.iter().map(|jure| jure.id()).collect(); + pub fn create_vec(juries: Vec) -> Self { + let juries_pool: Vec = juries.iter().map(|juror| juror.id()).collect(); JuriesMapMock { juries_pool, juries, @@ -142,7 +142,7 @@ pub mod mock { } impl Deref for JuriesMapMock { - type Target = Vec; + type Target = Vec; fn deref(&self) -> &Self::Target { &self.juries @@ -156,12 +156,12 @@ pub mod mock { } impl JuriesMap for JuriesMapMock { - fn get_jure_or_assert(&self, jure_id: AccountId) -> Result { - let jure = self.juries.iter().find(|j| j.id() == jure_id); - if jure.is_none() { - return Err(BrightDisputesError::JureNotExist); + fn get_juror_or_assert(&self, juror_id: AccountId) -> Result { + let juror = self.juries.iter().find(|j| j.id() == juror_id); + if juror.is_none() { + return Err(BrightDisputesError::JurorNotExist); } - Ok(jure.unwrap().clone()) + Ok(juror.unwrap().clone()) } fn remove_random_juries_from_pool_or_assert( @@ -179,12 +179,12 @@ pub mod mock { Ok(juries) } - fn update_jure(&mut self, jure: Jure) { - let index = self.juries.iter().position(|j| j.id() == jure.id()); + fn update_juror(&mut self, juror: Juror) { + let index = self.juries.iter().position(|j| j.id() == juror.id()); if index.is_some() { - self.juries[index.unwrap()] = jure; + self.juries[index.unwrap()] = juror; } else { - self.juries.push(jure); + self.juries.push(juror); } } } @@ -197,98 +197,98 @@ mod tests { use super::*; #[ink::test] - fn jure_created() { + fn juror_created() { let accounts = ink::env::test::default_accounts::(); - let jure = Jure::create(accounts.bob); - assert_eq!(jure.id, accounts.bob); - assert_eq!(jure.dispute_id, None); + let juror = Juror::create(accounts.bob); + assert_eq!(juror.id, accounts.bob); + assert_eq!(juror.dispute_id, None); } #[ink::test] fn action_done() { let accounts = ink::env::test::default_accounts::(); - let mut jure = Jure::create(accounts.bob); + let mut juror = Juror::create(accounts.bob); let dispute_id: DisputeId = 1; // Failed, no dispute assigned - let result = jure.request_for_action(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureInvalidState)); + let result = juror.request_for_action(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorInvalidState)); // Failed, no dispute assigned - let result = jure.action_done(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureInvalidState)); + let result = juror.action_done(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorInvalidState)); - jure.assign_to_dispute(dispute_id) - .expect("Failed to assign jure to dispute!"); + juror.assign_to_dispute(dispute_id) + .expect("Failed to assign juror to dispute!"); // Failed, no action assigned - let result = jure.action_done(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureInvalidState)); + let result = juror.action_done(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorInvalidState)); - // Failed, jure not Confirmed - let result = jure.request_for_action(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureInvalidState)); + // Failed, juror not Confirmed + let result = juror.request_for_action(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorInvalidState)); - jure.confirm_participation_in_dispute(dispute_id) - .expect("Failed to confirm jure participation in dispute!"); + juror.confirm_participation_in_dispute(dispute_id) + .expect("Failed to confirm juror participation in dispute!"); // Success - let result = jure.request_for_action(dispute_id); + let result = juror.request_for_action(dispute_id); assert_eq!(result, Ok(())); // Success - let result = jure.action_done(dispute_id); + let result = juror.action_done(dispute_id); assert_eq!(result, Ok(())); // Failed, already done - let result = jure.action_done(dispute_id); - assert_eq!(result, Err(BrightDisputesError::JureInvalidState)); + let result = juror.action_done(dispute_id); + assert_eq!(result, Err(BrightDisputesError::JurorInvalidState)); // Success - let result = jure.request_for_action(dispute_id); + let result = juror.request_for_action(dispute_id); assert_eq!(result, Ok(())); } #[ink::test] fn assign_to_dispute() { let accounts = ink::env::test::default_accounts::(); - let mut jure = Jure::create(accounts.alice); + let mut juror = Juror::create(accounts.alice); // Success - let result = jure.assign_to_dispute(2); + let result = juror.assign_to_dispute(2); assert_eq!(result, Ok(())); - assert_eq!(jure.dispute_id, Some(2)); + assert_eq!(juror.dispute_id, Some(2)); // Failed to assign, already assigned - let result = jure.assign_to_dispute(2); + let result = juror.assign_to_dispute(2); assert_eq!( result, - Err(BrightDisputesError::JureAlreadyAssignedToDispute) + Err(BrightDisputesError::JurorAlreadyAssignedToDispute) ); } #[ink::test] fn confirm_participation_in_dispute() { let accounts = ink::env::test::default_accounts::(); - let mut jure = Jure::create(accounts.alice); + let mut juror = Juror::create(accounts.alice); - // Failed to confirm participation in dispute, when jure is not assigned. - let result = jure.confirm_participation_in_dispute(1); - assert_eq!(result, Err(BrightDisputesError::JureIsNotAssignedToDispute)); + // Failed to confirm participation in dispute, when juror is not assigned. + let result = juror.confirm_participation_in_dispute(1); + assert_eq!(result, Err(BrightDisputesError::JurorIsNotAssignedToDispute)); - // Assign jure to dispute. - jure.assign_to_dispute(1).expect("Unable to add jure!"); + // Assign juror to dispute. + juror.assign_to_dispute(1).expect("Unable to add juror!"); // Success - let result = jure.confirm_participation_in_dispute(1); + let result = juror.confirm_participation_in_dispute(1); assert_eq!(result, Ok(())); - // Failed to confirm participation in dispute, jure already confirmed. - let result = jure.confirm_participation_in_dispute(1); + // Failed to confirm participation in dispute, juror already confirmed. + let result = juror.confirm_participation_in_dispute(1); assert_eq!( result, - Err(BrightDisputesError::JureAlreadyConfirmedDispute) + Err(BrightDisputesError::JurorAlreadyConfirmedDispute) ); } } diff --git a/contract/src/lib.rs b/contract/src/lib.rs index 8ad9573..192f9bd 100755 --- a/contract/src/lib.rs +++ b/contract/src/lib.rs @@ -4,6 +4,6 @@ mod contract; mod dispute; mod dispute_round; mod error; -mod jure; +mod juror; mod types; mod vote; diff --git a/contract/src/vote.rs b/contract/src/vote.rs index ac75a33..9ac6661 100644 --- a/contract/src/vote.rs +++ b/contract/src/vote.rs @@ -7,17 +7,17 @@ use crate::types::VoteValue; derive(ink::storage::traits::StorageLayout, scale_info::TypeInfo) )] pub struct Vote { - jure: AccountId, + juror: AccountId, vote: VoteValue, } impl Vote { #[allow(dead_code)] - pub fn create(jure: AccountId, vote: VoteValue) -> Self { - Vote { jure, vote } + pub fn create(juror: AccountId, vote: VoteValue) -> Self { + Vote { juror, vote } } - pub fn jure(&self) -> AccountId { - self.jure + pub fn juror(&self) -> AccountId { + self.juror } pub fn vote(&self) -> VoteValue { self.vote diff --git a/doc/README.md b/doc/README.md index 98dcd71..7072622 100644 --- a/doc/README.md +++ b/doc/README.md @@ -2,7 +2,7 @@ This document present a showcase for the Bright Disputes. We are going to use a [Substrate Contract UI](https://contracts-ui.substrate.io/) for interaction with our dApp. Before starting interaction with smart contract, we will need first to build and deploy it on our local node. To do this please fallow the instruction from the [README](https://github.com/bright/bright-disputes/blob/main/README.md) file. We have provide a set of testing accounts: -[Owner](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5ChhBGUJJLxPk2EJzDN6aeuA7yx7bBBGxgZx5iSr9rMhegrM.json), [Defendant](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5Fhhzf8ZNH2mkP5YddoJ6kj6PfsnB49BxReRopc6CRvqVNrQ.json), [Jure1](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json), [Jure2](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json), [Jure3](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json), [Jure4](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json), [Jure5](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json), [Jure6](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json), [Jure7](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json), which are pre founded with some tokens. Password for all accounts is the same and it is: `123456` :) +[Owner](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5ChhBGUJJLxPk2EJzDN6aeuA7yx7bBBGxgZx5iSr9rMhegrM.json), [Defendant](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5Fhhzf8ZNH2mkP5YddoJ6kj6PfsnB49BxReRopc6CRvqVNrQ.json), [Juror1](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json), [Juror2](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json), [Juror3](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json), [Juror4](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json), [Juror5](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json), [Juror6](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json), [Juror7](https://github.com/bright/bright-disputes/blob/main/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json), which are pre founded with some tokens. Password for all accounts is the same and it is: `123456` :) ### Create a dispute When contract was successfully deployed to the aleph-node, we can create a dispute, by selecting `createDispute` extrinsic. We are going to use `Owner` account as a caller, and point `Defendant` account in the `defendantId`. We should also provide a link for the dispute description (`ownerLink`). Owner should also define an escrow amount, which will need to be deposit by all participates of the dispute. In our case we select `50`, and we also place the same amount in the `Value` filed. Those tokens are going to be transferred from our `Owner` account to the smart contract. @@ -22,12 +22,12 @@ Second step in the dispute process is confirmation of the defendant. We are goin -### Jure / Judge registration -We are going to register accounts `Jure1`, `Jure2`, `Jure3`, `Jure4`, `Jure5`, `Jure6`, `Jure7` as an juries for the Bright Disputes. Some of them are going to be picked as Juries and one as Judge for our dispute case. First they need to register as an active Jure. We can do it by selecting their accounts as a Callers and picking a `registerAsAnActiveJure` extrinsic. +### Juror / Judge registration +We are going to register accounts `Juror1`, `Juror2`, `Juror3`, `Juror4`, `Juror5`, `Juror6`, `Juror7` as an juries for the Bright Disputes. Some of them are going to be picked as Juries and one as Judge for our dispute case. First they need to register as an active Juror. We can do it by selecting their accounts as a Callers and picking a `registerAsAnActiveJuror` extrinsic.
-![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/register_jure.png) +![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/register_juror.png)
@@ -48,14 +48,14 @@ Now we can check if Juries and Judge where truly assigned to the dispute. We can -From what we see accounts of `Jure1`, `Jure2`, `Jure3` are assigned as jure role, and the `Jure4` is a judge. +From what we see accounts of `Juror1`, `Juror2`, `Juror3` are assigned as juror role, and the `Juror4` is a judge. ### Juries / Judge confirmation -Next step is to confirm participation of the juries and judge in the dispute. Juries need to call `confirmJureParticipationInDispute` +Next step is to confirm participation of the juries and judge in the dispute. Juries need to call `confirmJurorParticipationInDispute`
-![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/confirm_jure.png) +![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/confirm_juror.png)
@@ -82,7 +82,7 @@ where juries are requested to vote. They can do it by calling `vote` extrinsic,
-![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/jure_vote.png) +![Extrinsics](https://github.com/bright/bright-disputes/blob/main/doc/images/juror_vote.png)
@@ -103,7 +103,7 @@ At this stage once again `Owner` of the dispute will call `processDisputeRound` -Now is the judge role to count the votes. In our case judge, who is `Jure4`, will call `processDisputeRound` extrinsic. +Now is the judge role to count the votes. In our case judge, who is `Juror4`, will call `processDisputeRound` extrinsic.
diff --git a/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json b/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json index d585f8b..0a16918 100644 --- a/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json +++ b/doc/accounts/5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9.json @@ -13,7 +13,7 @@ }, "address": "5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9", "meta": { - "name": "Jure1", + "name": "Juror1", "tags": [], "whenCreated": 1688624542924 } diff --git a/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json b/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json index 8f71a15..2a6fafd 100644 --- a/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json +++ b/doc/accounts/5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP.json @@ -13,7 +13,7 @@ }, "address": "5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP", "meta": { - "name": "Jure6", + "name": "Juror6", "tags": [], "whenCreated": 1688629403803 } diff --git a/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json b/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json index 814fe30..026dc45 100644 --- a/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json +++ b/doc/accounts/5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj.json @@ -13,7 +13,7 @@ }, "address": "5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj", "meta": { - "name": "Jure3", + "name": "Juror3", "tags": [], "whenCreated": 1688628965613 } diff --git a/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json b/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json index 288db11..5374e86 100644 --- a/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json +++ b/doc/accounts/5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1.json @@ -13,7 +13,7 @@ }, "address": "5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1", "meta": { - "name": "Jure7", + "name": "Juror7", "tags": [], "whenCreated": 1688628993493 } diff --git a/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json b/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json index acbbdeb..575d248 100644 --- a/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json +++ b/doc/accounts/5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK.json @@ -13,7 +13,7 @@ }, "address": "5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK", "meta": { - "name": "Jure4", + "name": "Juror4", "tags": [], "whenCreated": 1688629013135 } diff --git a/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json b/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json index fd82325..24bae64 100644 --- a/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json +++ b/doc/accounts/5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b.json @@ -13,7 +13,7 @@ }, "address": "5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b", "meta": { - "name": "Jure5", + "name": "Juror5", "tags": [], "whenCreated": 1688629387296 } diff --git a/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json b/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json index da24e52..cb33912 100644 --- a/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json +++ b/doc/accounts/5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ.json @@ -13,7 +13,7 @@ }, "address": "5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ", "meta": { - "name": "Jure2", + "name": "Juror2", "tags": [], "whenCreated": 1688628924438 } diff --git a/doc/images/confirm_jure.png b/doc/images/confirm_juror.png similarity index 100% rename from doc/images/confirm_jure.png rename to doc/images/confirm_juror.png diff --git a/doc/images/jure_vote.png b/doc/images/juror_vote.png similarity index 100% rename from doc/images/jure_vote.png rename to doc/images/juror_vote.png diff --git a/doc/images/register_jure.png b/doc/images/register_juror.png similarity index 100% rename from doc/images/register_jure.png rename to doc/images/register_juror.png diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 005b949..3179c85 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -21,12 +21,12 @@ ADMIN=//Alice ADMIN_PUBKEY=5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY OWNER_PUBKEY=5ChhBGUJJLxPk2EJzDN6aeuA7yx7bBBGxgZx5iSr9rMhegrM DEFENDAT_PUBKEY=5Fhhzf8ZNH2mkP5YddoJ6kj6PfsnB49BxReRopc6CRvqVNrQ -JURE_1_PUBKEY=5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9 -JURE_2_PUBKEY=5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ -JURE_3_PUBKEY=5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj -JURE_4_PUBKEY=5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK -JURE_5_PUBKEY=5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b -JURE_6_PUBKEY=5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP +JUROR_1_PUBKEY=5CFysjxm4tWyePnpELf4xG2o3ZvQV5WVdfvcETn552rYA8h9 +JUROR_2_PUBKEY=5DfNSomECQZkpJJPi8CnBt3aFSAcbDJHy48xaqBkkAc5vVYJ +JUROR_3_PUBKEY=5CS8L2eS3sbYUcR6b5cvH93DZWiwCGXH4WJzSwTcHmAZekUj +JUROR_4_PUBKEY=5CSdvQ1mG1j6tsyMib46kFHpwdUqizvWs1NTHGLzQWpNRbrK +JUROR_5_PUBKEY=5CSvSo9vt1eu4d93EobfA6au8bheGLbkTdvATLb9RPVKgu9b +JUROR_6_PUBKEY=5CS1o2oMdptJ2owGABQd8Q2TJXSYnLiQjKMWRGnRnSw36RwP JUDGE_PUBKEY=5CSdKZuEYAbaH1nB8rbxqJU5PDtgTtCB5pj4abqQAhimdLU1 # tokenomics @@ -150,8 +150,8 @@ transfer() { } prefund_users() { - for recipient in "${DAMIAN_PUBKEY}" "${HANS_PUBKEY}" "${MICHAL_PUBKEY}" "${OWNER_PUBKEY}" "${DEFENDAT_PUBKEY}" "${JURE_1_PUBKEY}" \ - "${JURE_2_PUBKEY}" "${JURE_3_PUBKEY}" "${JURE_4_PUBKEY}" "${JURE_5_PUBKEY}" "${JURE_6_PUBKEY}" "${JUDGE_PUBKEY}"; do + for recipient in "${DAMIAN_PUBKEY}" "${HANS_PUBKEY}" "${MICHAL_PUBKEY}" "${OWNER_PUBKEY}" "${DEFENDAT_PUBKEY}" "${JUROR_1_PUBKEY}" \ + "${JUROR_2_PUBKEY}" "${JUROR_3_PUBKEY}" "${JUROR_4_PUBKEY}" "${JUROR_5_PUBKEY}" "${JUROR_6_PUBKEY}" "${JUDGE_PUBKEY}"; do transfer ${recipient} done } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index c8f0db7..4a09ff9 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bright_disputes" version = "0.1.0" -authors = ["Michal Gralinski michal.gralinski@brightinventions.pl"] +authors = ["Bright Inventions"] edition = "2021" license = "MIT" diff --git a/tests/bright_disputes_test.rs b/tests/bright_disputes_test.rs index 1f45cd9..b0516f8 100644 --- a/tests/bright_disputes_test.rs +++ b/tests/bright_disputes_test.rs @@ -57,9 +57,9 @@ async fn test_dispute_success() -> Result<()> { // Create juries let all_juries_conn: Vec = create_new_connections(4).await?; - // Register as a jure + // Register as a juror for conn in &all_juries_conn { - conn.exec(contract.register_as_an_active_jure()).await?; + conn.exec(contract.register_as_an_active_juror()).await?; } // Process dispute round, assign juries and judge to dispute @@ -89,7 +89,7 @@ async fn test_dispute_success() -> Result<()> { for conn in &juries_conn { conn.exec( contract - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .with_value(escrow), ) .await?; @@ -171,9 +171,9 @@ async fn test_dispute_rounds() -> Result<()> { // Create juries let all_juries_conn: Vec = create_new_connections(10).await?; - // Register as a jure + // Register as a juror for conn in &all_juries_conn { - conn.exec(contract.register_as_an_active_jure()).await?; + conn.exec(contract.register_as_an_active_juror()).await?; } // Process dispute round, assign juries and judge to dispute @@ -205,7 +205,7 @@ async fn test_dispute_rounds() -> Result<()> { for conn in &juries_conn { conn.exec( contract - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .with_value(escrow), ) .await?; @@ -302,7 +302,7 @@ async fn test_dispute_rounds() -> Result<()> { for conn in &diff_juries_conn { conn.exec( contract - .confirm_jure_participation_in_dispute(dispute_id) + .confirm_juror_participation_in_dispute(dispute_id) .with_value(escrow), ) .await?;