Merge pull request #137 from DA0-DA0/update-multisig-with-empty-struct

Add code for muilti-sig contract to have empty bracket
DA0-DA0 · Jan 13, 2022 · 9b005dd · 9b005dd
2 parents 92f4f24 + 434ef2a
commit 9b005dd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/contracts/cw3-multisig/schema/query_msg.json b/contracts/cw3-multisig/schema/query_msg.json
@@ -2,12 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "QueryMsg",
   "oneOf": [
-    {
-      "type": "string",
-      "enum": [
-        "get_config"
-      ]
-    },
     {
       "description": "Return ThresholdResponse",
       "type": "object",
@@ -256,6 +250,19 @@
       },
       "additionalProperties": false
     },
+    {
+      "description": "Get the multisig's current config. Returns type `ConfigResponse`.",
+      "type": "object",
+      "required": [
+        "get_config"
+      ],
+      "properties": {
+        "get_config": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
     {
       "description": "Returns All DAO Cw20 Balances",
       "type": "object",

diff --git a/contracts/cw3-multisig/src/contract.rs b/contracts/cw3-multisig/src/contract.rs
@@ -399,7 +399,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::ListVoters { start_after, limit } => {
             to_binary(&query_list_voters(deps, start_after, limit)?)
         }
-        QueryMsg::GetConfig => to_binary(&query_config(deps)?),
+        QueryMsg::GetConfig {} => to_binary(&query_config(deps)?),
         QueryMsg::Tally { proposal_id } => {
             to_binary(&query_proposal_tally(deps, env, proposal_id)?)
         }

diff --git a/contracts/cw3-multisig/src/msg.rs b/contracts/cw3-multisig/src/msg.rs
@@ -200,7 +200,7 @@ pub enum QueryMsg {
     Tally { proposal_id: u64 },
     /// Get the multisig's current config. Returns type
     /// `ConfigResponse`.
-    GetConfig,
+    GetConfig {},
     /// Returns All DAO Cw20 Balances
     Cw20Balances {
         start_after: Option<String>,

diff --git a/contracts/cw3-multisig/src/tests.rs b/contracts/cw3-multisig/src/tests.rs
@@ -307,7 +307,7 @@ fn test_instantiate_works() {
     // Verify contract config set properly.
     let config: ConfigResponse = app
         .wrap()
-        .query_wasm_smart(&multisig_addr, &QueryMsg::GetConfig)
+        .query_wasm_smart(&multisig_addr, &QueryMsg::GetConfig {})
         .unwrap();
 
     assert_eq!(
@@ -488,7 +488,7 @@ fn test_update_config() {
     // Verify contract config set properly.
     let config: ConfigResponse = app
         .wrap()
-        .query_wasm_smart(&multisig_addr, &QueryMsg::GetConfig)
+        .query_wasm_smart(&multisig_addr, &QueryMsg::GetConfig {})
         .unwrap();
 
     assert_eq!(