Skip to content

query shows poll status in progress while cast vote errors with not i… #31

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

query shows poll status in progress while cast vote errors with not i… #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions contracts/gov/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,14 @@ pub fn cast_vote(
}

let mut a_poll: Poll = poll_store(deps.storage).load(&poll_id.to_be_bytes())?;
if a_poll.status != PollStatus::InProgress || env.block.height > a_poll.end_height {
if a_poll.status != PollStatus::InProgress {
return Err(ContractError::PollNotInProgress {});
}

if a_poll.status == PollStatus::InProgress && env.block.height > a_poll.end_height {
return Err(ContractError::PollNotInProgress {}); //We might want to add a new error here when we have this confusing stage
}

// Check the voter already has a vote on the poll
if poll_voter_read(deps.storage, poll_id)
.load(sender_address_raw.as_slice())
Expand Down Expand Up @@ -665,12 +669,12 @@ pub fn cast_vote(
}

#[cfg_attr(not(feature = "library"), entry_point)]
pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
match msg {
QueryMsg::Config {} => Ok(to_binary(&query_config(deps)?)?),
QueryMsg::State {} => Ok(to_binary(&query_state(deps)?)?),
QueryMsg::Staker { address } => Ok(to_binary(&query_staker(deps, address)?)?),
QueryMsg::Poll { poll_id } => Ok(to_binary(&query_poll(deps, poll_id)?)?),
QueryMsg::Poll { poll_id } => Ok(to_binary(&query_poll(deps, env, poll_id)?)?),
QueryMsg::Polls {
filter,
start_after,
Expand Down Expand Up @@ -721,7 +725,7 @@ fn query_state(deps: Deps) -> Result<StateResponse, ContractError> {
})
}

fn query_poll(deps: Deps, poll_id: u64) -> Result<PollResponse, ContractError> {
fn query_poll(deps: Deps, env: Env, poll_id: u64) -> Result<PollResponse, ContractError> {
let poll = match poll_read(deps.storage).may_load(&poll_id.to_be_bytes())? {
Some(poll) => Some(poll),
None => return Err(ContractError::PollNotFound {}),
Expand All @@ -733,7 +737,11 @@ fn query_poll(deps: Deps, poll_id: u64) -> Result<PollResponse, ContractError> {
Ok(PollResponse {
id: poll.id,
creator: deps.api.addr_humanize(&poll.creator)?.to_string(),
status: poll.status,
status: if poll.status == PollStatus::InProgress && env.block.height > poll.end_height {
PollStatus::Expired
} else {
poll.status
},
end_height: poll.end_height,
title: poll.title,
description: poll.description,
Expand Down