Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unit tests for cw3-fixed-multisig #95

Merged
merged 15 commits into from
Sep 27, 2020
Merged

Unit tests for cw3-fixed-multisig #95

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a08883c
Basic unit tests for init, propose, and vote
maurolacy Sep 24, 2020
5419b0f
Add voter() helper, setup_test_case() refactor
maurolacy Sep 26, 2020
0b4e75e
Add init() consistency / validity checks
maurolacy Sep 26, 2020
dd99863
propose() checks / tests
maurolacy Sep 26, 2020
8b08418
Add response event attributes
maurolacy Sep 26, 2020
62beab9
vote() tests
maurolacy Sep 26, 2020
e4c2abe
execute() tests
maurolacy Sep 26, 2020
a940f54
close() tests
maurolacy Sep 26, 2020
4d2c829
Fail if expiration options not comparable
maurolacy Sep 26, 2020
ebc8c6d
No/Veto votes tests
maurolacy Sep 27, 2020
f979892
non-Open cannot be voted
maurolacy Sep 27, 2020
210f896
Allow zero weights
maurolacy Sep 27, 2020
e664328
Proposal from sender with enough vote power passes
maurolacy Sep 27, 2020
5e948fd
Expired proposals cannot be voted
maurolacy Sep 27, 2020
587c958
Add extra close() tests in passing
maurolacy Sep 27, 2020
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
70 changes: 58 additions & 12 deletions contracts/cw3-fixed-multisig/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::cmp::Ordering;

use cosmwasm_std::{
to_binary, Api, Binary, CanonicalAddr, CosmosMsg, Empty, Env, Extern, HandleResponse,
log, to_binary, Api, Binary, CanonicalAddr, CosmosMsg, Empty, Env, Extern, HandleResponse,
HumanAddr, InitResponse, Order, Querier, StdError, StdResult, Storage,
};

Expand Down Expand Up @@ -133,8 +133,15 @@ pub fn handle_propose<S: Storage, A: Api, Q: Querier>(
};
ballots(&mut deps.storage, id).save(raw_sender.as_slice(), &ballot)?;

// TODO: add some event attributes
Ok(HandleResponse::default())
Ok(HandleResponse {
maurolacy marked this conversation as resolved.
Show resolved Hide resolved
messages: vec![],
log: vec![
log("action", "propose"),
log("sender", env.message.sender),
log("proposal_id", id),
],
data: None,
})
}

pub fn handle_vote<S: Storage, A: Api, Q: Querier>(
Expand Down Expand Up @@ -177,13 +184,20 @@ pub fn handle_vote<S: Storage, A: Api, Q: Querier>(
proposal(&mut deps.storage).save(&proposal_id.to_be_bytes(), &prop)?;
}

// TODO: add event attributes
Ok(HandleResponse::default())
Ok(HandleResponse {
messages: vec![],
log: vec![
log("action", "vote"),
log("sender", env.message.sender),
log("proposal_id", proposal_id),
],
data: None,
})
}

pub fn handle_execute<S: Storage, A: Api, Q: Querier>(
deps: &mut Extern<S, A, Q>,
_env: Env,
env: Env,
proposal_id: u64,
) -> StdResult<HandleResponse<Empty>> {
// anyone can trigger this if the vote passed
Expand All @@ -202,10 +216,13 @@ pub fn handle_execute<S: Storage, A: Api, Q: Querier>(
proposal(&mut deps.storage).save(&proposal_id.to_be_bytes(), &prop)?;

// dispatch all proposed messages
// TODO: add event attributes
Ok(HandleResponse {
messages: prop.msgs,
log: vec![],
log: vec![
log("action", "execute"),
log("sender", env.message.sender),
log("proposal_id", proposal_id),
],
data: None,
})
}
Expand Down Expand Up @@ -236,8 +253,15 @@ pub fn handle_close<S: Storage, A: Api, Q: Querier>(
prop.status = Status::Rejected;
proposal(&mut deps.storage).save(&proposal_id.to_be_bytes(), &prop)?;

// TODO: add event attributes
Ok(HandleResponse::default())
Ok(HandleResponse {
messages: vec![],
log: vec![
log("action", "close"),
log("sender", env.message.sender),
log("proposal_id", proposal_id),
],
data: None,
})
}

pub fn query<S: Storage, A: Api, Q: Querier>(
Expand Down Expand Up @@ -596,7 +620,18 @@ mod tests {
let res = handle(&mut deps, env, proposal).unwrap();

// Verify
assert_eq!(res, HandleResponse::default());
assert_eq!(
res,
HandleResponse {
messages: vec![],
log: vec![
log("action", "propose"),
log("sender", VOTER3),
log("proposal_id", 1),
],
data: None
}
)
}

#[test]
Expand Down Expand Up @@ -653,7 +688,18 @@ mod tests {
let res = handle(&mut deps, env, vote).unwrap();

// Verify
assert_eq!(res, HandleResponse::default());
assert_eq!(
res,
HandleResponse {
messages: vec![],
log: vec![
log("action", "vote"),
log("sender", VOTER1),
log("proposal_id", proposal.id),
],
data: None
}
)
}

/*
Expand Down