Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion contracts/contracts/dispute/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ impl DisputeContract {

pub fn create_dispute(
env: Env,
caller:Address,
title: String,
description: String,
duration: u64,
disputed_amount: i128,
winner_address: Address,
loser_address: Address,
) -> Result<u32, Error> {
let caller = env.caller();
caller.require_auth();

if !env.storage().instance().has(&DataKey::Token) {
Expand Down
29 changes: 17 additions & 12 deletions contracts/contracts/dispute/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ fn test_create_dispute() {

env.ledger().set_timestamp(1000);

let dispute_id = client.create_dispute(&title, &description, &duration, &disputed_amount, &winner, &loser);
let dispute_id = client.create_dispute(&caller, &title, &description,
&duration, &disputed_amount, &winner, &loser);

assert_eq!(dispute_id, 0);
assert_eq!(client.get_dispute_count(), 1);
Expand Down Expand Up @@ -94,7 +95,8 @@ fn test_voting_and_resolving() {
let desc = String::from_str(&env, "Desc");

env.ledger().set_timestamp(1000);
let dispute_id = client.create_dispute(&title, &desc, &100, &disputed_amount, &winner, &loser);
let dispute_id = client.create_dispute(&caller, &title, &desc, &100,
&disputed_amount, &winner, &loser);

client.vote(&voter1, &dispute_id, &1000, &true);
client.vote(&voter2, &dispute_id, &500, &false);
Expand Down Expand Up @@ -130,9 +132,10 @@ fn test_voting_and_resolving() {
fn test_vote_after_deadline() {
let env = Env::default();
env.mock_all_auths();

let contract_id = env.register_contract(None, DisputeContract);
let client = DisputeContractClient::new(&env, &contract_id);

let token_admin = Address::generate(&env);
let token = create_token_contract(&env, &token_admin);

Expand All @@ -143,16 +146,18 @@ fn test_vote_after_deadline() {
token_admin_client.mint(&voter, &100);

env.ledger().set_timestamp(1000);

let dispute_id = client.create_dispute(
&String::from_str(&env, "title"),
&String::from_str(&env, "desc"),
&100,
&0,
&Address::generate(&env),
&Address::generate(&env)
&voter,
&String::from_str(&env, "title"),
&String::from_str(&env, "desc"),
&100,
&100,
&Address::generate(&env),
&Address::generate(&env),
);

env.ledger().set_timestamp(1101); // Past deadline
client.vote(&voter, &dispute_id, &100, &true); // Should panic with VotingEnded (6)
env.ledger().set_timestamp(1101);

client.vote(&voter, &dispute_id, &100, &true);
}
Loading
Loading