Remove proposal_id field from Ballot structure

confio · Feb 22, 2022 · 165e7f6 · 165e7f6
1 parent af211cd
commit 165e7f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/voting-contract/src/ballots.rs b/packages/voting-contract/src/ballots.rs
@@ -11,7 +11,6 @@ use crate::ContractError;
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct Ballot {
     pub voter: Addr,
-    pub proposal_id: u64,
     pub points: u64,
     pub vote: Vote,
 }
@@ -58,7 +57,6 @@ impl<'a> Ballots<'a> {
                     Some(_) => Err(ContractError::AlreadyVoted {}),
                     None => Ok(Ballot {
                         voter: addr.clone(),
-                        proposal_id,
                         points,
                         vote,
                     }),

diff --git a/packages/voting-contract/src/lib.rs b/packages/voting-contract/src/lib.rs
@@ -388,9 +388,9 @@ pub fn list_votes_by_voter<Q: CustomQuery>(
         .range(deps.storage, start, None, Order::Ascending)
         .take(limit)
         .map(|item| {
-            let (_, ballot) = item?;
+            let ((proposal_id, _), ballot) = item?;
             Ok(VoteInfo {
-                proposal_id: ballot.proposal_id,
+                proposal_id,
                 voter: ballot.voter.into(),
                 vote: ballot.vote,
                 points: ballot.points,