Schemas and clippy fixes

Arena-DAO · May 8, 2024 · a76127f · a76127f
1 parent a86f0dc
commit a76127f
Show file tree

Hide file tree

Showing 14 changed files with 239 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/bootstrap-env/src/main.rs b/ci/bootstrap-env/src/main.rs
@@ -183,7 +183,8 @@ fn main() -> Result<()> {
     );
 
     // Persist contract code_ids in local.yaml so we can use SKIP_CONTRACT_STORE locally to avoid having to re-store them again
-    cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+    cfg.contract_deploy_info
+        .clone_from(orc.contract_map.deploy_info());
     fs::write(
         "ci/configs/cosm-orc/local.yaml",
         serde_yaml::to_string(&cfg)?,

diff --git a/ci/integration-tests/src/helpers/chain.rs b/ci/integration-tests/src/helpers/chain.rs
@@ -99,7 +99,8 @@ fn global_setup() -> Cfg {
             .unwrap();
         save_gas_report(&orc, &gas_report_dir);
         // persist stored code_ids in CONFIG, so we can reuse for all tests
-        cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+        cfg.contract_deploy_info
+            .clone_from(orc.contract_map.deploy_info());
     }
 
     Cfg {

diff --git a/contracts/dao-dao-core/schema/dao-dao-core.json b/contracts/dao-dao-core/schema/dao-dao-core.json
@@ -1796,6 +1796,27 @@
         },
         "additionalProperties": false
       },
+      {
+        "type": "object",
+        "required": [
+          "proposal_module"
+        ],
+        "properties": {
+          "proposal_module": {
+            "type": "object",
+            "required": [
+              "address"
+            ],
+            "properties": {
+              "address": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "description": "Gets the active proposal modules associated with the contract.",
         "type": "object",
@@ -3033,6 +3054,54 @@
         }
       }
     },
+    "proposal_module": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ProposalModule",
+      "description": "Top level type describing a proposal module.",
+      "type": "object",
+      "required": [
+        "address",
+        "prefix",
+        "status"
+      ],
+      "properties": {
+        "address": {
+          "description": "The address of the proposal module.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Addr"
+            }
+          ]
+        },
+        "prefix": {
+          "description": "The URL prefix of this proposal module as derived from the module ID. Prefixes are mapped to letters, e.g. 0 is 'A', and 26 is 'AA'.",
+          "type": "string"
+        },
+        "status": {
+          "description": "The status of the proposal module, e.g. 'Enabled' or 'Disabled.'",
+          "allOf": [
+            {
+              "$ref": "#/definitions/ProposalModuleStatus"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "ProposalModuleStatus": {
+          "description": "The status of a proposal module.",
+          "type": "string",
+          "enum": [
+            "enabled",
+            "disabled"
+          ]
+        }
+      }
+    },
     "proposal_module_count": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "ProposalModuleCountResponse",

diff --git a/contracts/external/cw721-roles/src/contract.rs b/contracts/external/cw721-roles/src/contract.rs
@@ -319,7 +319,7 @@ pub fn execute_update_token_role(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Update role with new value
-    token.extension.role = role.clone();
+    token.extension.role.clone_from(&role);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::default()
@@ -341,7 +341,7 @@ pub fn execute_update_token_uri(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Set new token URI
-    token.token_uri = token_uri.clone();
+    token.token_uri.clone_from(&token_uri);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::new()

diff --git a/contracts/external/dao-proposal-incentives/Cargo.toml b/contracts/external/dao-proposal-incentives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name ="dao-proposal-incentives"
-authors = ["Jake Hartnell <[email protected]>", "ismellike"]
+authors = ["Jake Hartnell <[email protected]>", "Gabe Lopez <ismellike@users.noreply.github.com>"]
 description = "A contract that implements incentives for voting in a DAO."
 edition = { workspace = true }
 license = { workspace = true }

diff --git a/contracts/external/dao-proposal-incentives/schema/dao-proposal-incentives.json b/contracts/external/dao-proposal-incentives/schema/dao-proposal-incentives.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "dao-proposal-incentives",
-  "contract_version": "2.4.0",
+  "contract_version": "2.4.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/external/dao-proposal-incentives/src/tests.rs b/contracts/external/dao-proposal-incentives/src/tests.rs
@@ -357,6 +357,7 @@ pub fn test_hook() {
                 funds: vec![],
             })],
             proposer: None,
+            vote: None,
         }),
         &[],
     );
@@ -390,6 +391,7 @@ pub fn test_hook() {
                 description: "Testing".to_string(),
                 msgs: vec![],
                 proposer: None,
+                vote: None,
             }),
             &[],
         )
@@ -418,6 +420,7 @@ pub fn test_hook() {
                 description: "Testing".to_string(),
                 msgs: vec![],
                 proposer: None,
+                vote: None,
             }),
             &[],
         )

diff --git a/contracts/external/dao-voting-incentives/Cargo.toml b/contracts/external/dao-voting-incentives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name ="dao-voting-incentives"
-authors = ["Jake Hartnell <[email protected]>", "ismellike"]
+authors = ["Jake Hartnell <[email protected]>", "Gabe Lopez <ismellike@users.noreply.github.com>"]
 description = "A contract that implements incentives for voting in a DAO."
 edition = { workspace = true }
 license = { workspace = true }

diff --git a/contracts/external/dao-voting-incentives/schema/dao-voting-incentives.json b/contracts/external/dao-voting-incentives/schema/dao-voting-incentives.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "dao-voting-incentives",
-  "contract_version": "2.4.0",
+  "contract_version": "2.4.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/external/dao-voting-incentives/src/tests.rs b/contracts/external/dao-voting-incentives/src/tests.rs
@@ -319,6 +319,7 @@ pub fn test_hooks() {
                 }),
             ],
             proposer: None,
+            vote: None,
         }),
         &[],
     );
@@ -358,6 +359,7 @@ pub fn test_hooks() {
                 description: "Testing".to_string(),
                 msgs: vec![],
                 proposer: None,
+                vote: None,
             }),
             &[],
         )
@@ -435,6 +437,7 @@ pub fn test_hooks() {
                 description: "Testing".to_string(),
                 msgs: vec![],
                 proposer: None,
+                vote: None,
             }),
             &[],
         )

diff --git a/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json b/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json
@@ -1140,6 +1140,30 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "Returns generic proposal information",
+        "type": "object",
+        "required": [
+          "generic_proposal_info"
+        ],
+        "properties": {
+          "generic_proposal_info": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ]
   },
@@ -1256,6 +1280,32 @@
       "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
       "type": "string"
     },
+    "generic_proposal_info": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "GenericProposalInfo",
+      "type": "object",
+      "required": [
+        "proposer",
+        "start_height"
+      ],
+      "properties": {
+        "proposer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "start_height": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
+      }
+    },
     "info": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "InfoResponse",

diff --git a/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json b/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json
@@ -2078,6 +2078,30 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "Returns generic proposal information",
+        "type": "object",
+        "required": [
+          "generic_proposal_info"
+        ],
+        "properties": {
+          "generic_proposal_info": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ]
   },
@@ -2580,6 +2604,32 @@
       "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
       "type": "string"
     },
+    "generic_proposal_info": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "GenericProposalInfo",
+      "type": "object",
+      "required": [
+        "proposer",
+        "start_height"
+      ],
+      "properties": {
+        "proposer": {
+          "$ref": "#/definitions/Addr"
+        },
+        "start_height": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
+      }
+    },
     "get_vote": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "VoteResponse",