Merge pull request #159 from CosmWasm/weight-0-vs-not-member

Weight 0 vs not member
CosmWasm · Dec 7, 2020 · f996203 · f996203
2 parents 5c6a76c + 41e07a5
commit f996203
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 36 deletions.
diff --git a/contracts/cw3-fixed-multisig/schema/query_msg.json b/contracts/cw3-fixed-multisig/schema/query_msg.json
@@ -163,7 +163,7 @@
       }
     },
     {
-      "description": "Returns VoterResponse",
+      "description": "Returns VoterInfo",
       "type": "object",
       "required": [
         "voter"

diff --git a/contracts/cw3-fixed-multisig/src/contract.rs b/contracts/cw3-fixed-multisig/src/contract.rs
@@ -9,7 +9,7 @@ use cw0::{maybe_canonical, Expiration};
 use cw2::set_contract_version;
 use cw3::{
     ProposalListResponse, ProposalResponse, Status, ThresholdResponse, Vote, VoteInfo,
-    VoteListResponse, VoteResponse, VoterListResponse, VoterResponse,
+    VoteListResponse, VoteResponse, VoterInfo, VoterListResponse, VoterResponse,
 };
 use cw_storage_plus::Bound;
 
@@ -400,13 +400,10 @@ fn list_votes(
     Ok(VoteListResponse { votes: votes? })
 }
 
-fn query_voter(deps: Deps, voter: HumanAddr) -> StdResult<VoterResponse> {
+fn query_voter(deps: Deps, voter: HumanAddr) -> StdResult<VoterInfo> {
     let voter_raw = deps.api.canonical_address(&voter)?;
     let weight = VOTERS.may_load(deps.storage, &voter_raw)?;
-    Ok(VoterResponse {
-        addr: voter,
-        weight,
-    })
+    Ok(VoterInfo { weight })
 }
 
 fn list_voters(
@@ -426,7 +423,7 @@ fn list_voters(
             let (key, weight) = item?;
             Ok(VoterResponse {
                 addr: api.human_address(&CanonicalAddr::from(key))?,
-                weight: Some(weight),
+                weight,
             })
         })
         .collect();

diff --git a/contracts/cw3-fixed-multisig/src/msg.rs b/contracts/cw3-fixed-multisig/src/msg.rs
@@ -68,7 +68,7 @@ pub enum QueryMsg {
         start_after: Option<HumanAddr>,
         limit: Option<u32>,
     },
-    /// Returns VoterResponse
+    /// Returns VoterInfo
     Voter { address: HumanAddr },
     /// Returns VoterListResponse
     ListVoters {

diff --git a/contracts/cw3-flex-multisig/schema/query_msg.json b/contracts/cw3-flex-multisig/schema/query_msg.json
@@ -163,7 +163,7 @@
       }
     },
     {
-      "description": "Returns VoterResponse",
+      "description": "Returns VoterInfo",
       "type": "object",
       "required": [
         "voter"

diff --git a/contracts/cw3-flex-multisig/src/contract.rs b/contracts/cw3-flex-multisig/src/contract.rs
@@ -9,7 +9,7 @@ use cw0::{maybe_canonical, Expiration};
 use cw2::set_contract_version;
 use cw3::{
     ProposalListResponse, ProposalResponse, Status, ThresholdResponse, Vote, VoteInfo,
-    VoteListResponse, VoteResponse, VoterListResponse, VoterResponse,
+    VoteListResponse, VoteResponse, VoterInfo, VoterListResponse, VoterResponse,
 };
 use cw4::Cw4Contract;
 use cw_storage_plus::Bound;
@@ -404,15 +404,12 @@ fn list_votes(
     Ok(VoteListResponse { votes: votes? })
 }
 
-fn query_voter(deps: Deps, voter: HumanAddr) -> StdResult<VoterResponse> {
+fn query_voter(deps: Deps, voter: HumanAddr) -> StdResult<VoterInfo> {
     let cfg = CONFIG.load(deps.storage)?;
     let voter_raw = deps.api.canonical_address(&voter)?;
     let weight = cfg.group_addr.is_member(&deps.querier, &voter_raw)?;
 
-    Ok(VoterResponse {
-        addr: voter,
-        weight,
-    })
+    Ok(VoterInfo { weight })
 }
 
 fn list_voters(
@@ -427,7 +424,7 @@ fn list_voters(
         .into_iter()
         .map(|member| VoterResponse {
             addr: member.addr,
-            weight: Some(member.weight),
+            weight: member.weight,
         })
         .collect();
     Ok(VoterListResponse { voters })
@@ -610,7 +607,7 @@ mod tests {
             voters.voters,
             vec![VoterResponse {
                 addr: OWNER.into(),
-                weight: Some(1)
+                weight: 1
             }]
         );
     }

diff --git a/contracts/cw3-flex-multisig/src/msg.rs b/contracts/cw3-flex-multisig/src/msg.rs
@@ -63,7 +63,7 @@ pub enum QueryMsg {
         start_after: Option<HumanAddr>,
         limit: Option<u32>,
     },
-    /// Returns VoterResponse
+    /// Returns VoterInfo
     Voter { address: HumanAddr },
     /// Returns VoterListResponse
     ListVoters {

diff --git a/packages/cw3/examples/schema.rs b/packages/cw3/examples/schema.rs
@@ -5,7 +5,7 @@ use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, s
 
 use cw3::{
     Cw3HandleMsg, Cw3QueryMsg, ProposalListResponse, ProposalResponse, ThresholdResponse,
-    VoteListResponse, VoteResponse, VoterListResponse, VoterResponse,
+    VoteListResponse, VoteResponse, VoterInfo, VoterListResponse, VoterResponse,
 };
 
 fn main() {
@@ -24,6 +24,7 @@ fn main() {
     export_schema(&schema_for!(ProposalListResponse), &out_dir);
     export_schema(&schema_for!(VoteResponse), &out_dir);
     export_schema(&schema_for!(VoteListResponse), &out_dir);
+    export_schema(&schema_for!(VoterInfo), &out_dir);
     export_schema(&schema_for!(VoterResponse), &out_dir);
     export_schema(&schema_for!(VoterListResponse), &out_dir);
     export_schema(&schema_for!(ThresholdResponse), &out_dir);

diff --git a/packages/cw3/schema/query_msg.json b/packages/cw3/schema/query_msg.json
@@ -163,7 +163,7 @@
       }
     },
     {
-      "description": "Voter extension: Returns VoterResponse",
+      "description": "Voter extension: Returns VoterInfo",
       "type": "object",
       "required": [
         "voter"
@@ -183,7 +183,7 @@
       }
     },
     {
-      "description": "Voter extension: Returns VoterListResponse",
+      "description": "ListVoters extension: Returns VoterListResponse",
       "type": "object",
       "required": [
         "list_voters"

diff --git a/packages/cw3/schema/voter_info.json b/packages/cw3/schema/voter_info.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "VoterInfo",
+  "type": "object",
+  "properties": {
+    "weight": {
+      "type": [
+        "integer",
+        "null"
+      ],
+      "format": "uint64",
+      "minimum": 0.0
+    }
+  }
+}
diff --git a/packages/cw3/schema/voter_list_response.json b/packages/cw3/schema/voter_list_response.json
@@ -20,17 +20,15 @@
     "VoterResponse": {
       "type": "object",
       "required": [
-        "addr"
+        "addr",
+        "weight"
       ],
       "properties": {
         "addr": {
           "$ref": "#/definitions/HumanAddr"
         },
         "weight": {
-          "type": [
-            "integer",
-            "null"
-          ],
+          "type": "integer",
           "format": "uint64",
           "minimum": 0.0
         }

diff --git a/packages/cw3/schema/voter_response.json b/packages/cw3/schema/voter_response.json
@@ -3,17 +3,15 @@
   "title": "VoterResponse",
   "type": "object",
   "required": [
-    "addr"
+    "addr",
+    "weight"
   ],
   "properties": {
     "addr": {
       "$ref": "#/definitions/HumanAddr"
     },
     "weight": {
-      "type": [
-        "integer",
-        "null"
-      ],
+      "type": "integer",
       "format": "uint64",
       "minimum": 0.0
     }

diff --git a/packages/cw3/src/lib.rs b/packages/cw3/src/lib.rs
@@ -7,7 +7,7 @@ pub use crate::helpers::{Cw3CanonicalContract, Cw3Contract};
 pub use crate::msg::{Cw3HandleMsg, Vote};
 pub use crate::query::{
     Cw3QueryMsg, ProposalListResponse, ProposalResponse, Status, ThresholdResponse, VoteInfo,
-    VoteListResponse, VoteResponse, VoterListResponse, VoterResponse,
+    VoteListResponse, VoteResponse, VoterInfo, VoterListResponse, VoterResponse,
 };
 
 #[cfg(test)]

diff --git a/packages/cw3/src/query.rs b/packages/cw3/src/query.rs
@@ -32,9 +32,9 @@ pub enum Cw3QueryMsg {
         start_after: Option<HumanAddr>,
         limit: Option<u32>,
     },
-    /// Voter extension: Returns VoterResponse
+    /// Voter extension: Returns VoterInfo
     Voter { address: HumanAddr },
-    /// Voter extension: Returns VoterListResponse
+    /// ListVoters extension: Returns VoterListResponse
     ListVoters {
         start_after: Option<HumanAddr>,
         limit: Option<u32>,
@@ -131,10 +131,15 @@ pub struct VoteResponse {
     pub vote: Option<Vote>,
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+pub struct VoterInfo {
+    pub weight: Option<u64>,
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct VoterResponse {
     pub addr: HumanAddr,
-    pub weight: Option<u64>,
+    pub weight: u64,
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]