fix schema

neutron-org · Feb 14, 2024 · 496340a · 496340a
1 parent 8714134
commit 496340a
Show file tree

Hide file tree

Showing 11 changed files with 1,028 additions and 1,643 deletions.
diff --git a/contracts/vesting-lp-pcl/examples/vesting-lp_schema.rs b/contracts/vesting-lp-pcl/examples/vesting-lp_schema.rs
@@ -1,5 +1,5 @@
 use cosmwasm_schema::write_api;
-use vesting_base_pcl::msg::{ExecuteMsg, MigrateMsg, QueryMsg};
+use vesting_base::msg::{ExecuteMsg, MigrateMsg, QueryMsg};
 use vesting_lp_pcl::msg::InstantiateMsg;
 
 fn main() {

diff --git a/contracts/vesting-lp-pcl/schema/raw/instantiate.json b/contracts/vesting-lp-pcl/schema/raw/instantiate.json
@@ -6,7 +6,9 @@
   "required": [
     "owner",
     "token_info_manager",
-    "vesting_managers"
+    "vesting_managers",
+    "vesting_token",
+    "xyk_vesting_lp_contract"
   ],
   "properties": {
     "owner": {
@@ -23,7 +25,68 @@
       "items": {
         "type": "string"
       }
+    },
+    "vesting_token": {
+      "$ref": "#/definitions/AssetInfo"
+    },
+    "xyk_vesting_lp_contract": {
+      "type": "string"
     }
   },
-  "additionalProperties": false
+  "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"
+    },
+    "AssetInfo": {
+      "description": "This enum describes available Token types. ## Examples ``` # use cosmwasm_std::Addr; # use astroport::asset::AssetInfo::{NativeToken, Token}; Token { contract_addr: Addr::unchecked(\"stake...\") }; NativeToken { denom: String::from(\"uluna\") }; ```",
+      "oneOf": [
+        {
+          "description": "Non-native Token",
+          "type": "object",
+          "required": [
+            "token"
+          ],
+          "properties": {
+            "token": {
+              "type": "object",
+              "required": [
+                "contract_addr"
+              ],
+              "properties": {
+                "contract_addr": {
+                  "$ref": "#/definitions/Addr"
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Native token",
+          "type": "object",
+          "required": [
+            "native_token"
+          ],
+          "properties": {
+            "native_token": {
+              "type": "object",
+              "required": [
+                "denom"
+              ],
+              "properties": {
+                "denom": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    }
+  }
 }
diff --git a/...cts/vesting-lp-pcl/schema/vesting-lp.json → ...vesting-lp-pcl/schema/vesting-lp-pcl.json b/...cts/vesting-lp-pcl/schema/vesting-lp.json → ...vesting-lp-pcl/schema/vesting-lp-pcl.json
@@ -1,5 +1,5 @@
 {
-  "contract_name": "vesting-lp",
+  "contract_name": "vesting-lp-pcl",
   "contract_version": "1.1.0",
   "idl_version": "1.0.0",
   "instantiate": {
@@ -10,7 +10,9 @@
     "required": [
       "owner",
       "token_info_manager",
-      "vesting_managers"
+      "vesting_managers",
+      "vesting_token",
+      "xyk_vesting_lp_contract"
     ],
     "properties": {
       "owner": {
@@ -27,9 +29,70 @@
         "items": {
           "type": "string"
         }
+      },
+      "vesting_token": {
+        "$ref": "#/definitions/AssetInfo"
+      },
+      "xyk_vesting_lp_contract": {
+        "type": "string"
       }
     },
-    "additionalProperties": false
+    "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"
+      },
+      "AssetInfo": {
+        "description": "This enum describes available Token types. ## Examples ``` # use cosmwasm_std::Addr; # use astroport::asset::AssetInfo::{NativeToken, Token}; Token { contract_addr: Addr::unchecked(\"stake...\") }; NativeToken { denom: String::from(\"uluna\") }; ```",
+        "oneOf": [
+          {
+            "description": "Non-native Token",
+            "type": "object",
+            "required": [
+              "token"
+            ],
+            "properties": {
+              "token": {
+                "type": "object",
+                "required": [
+                  "contract_addr"
+                ],
+                "properties": {
+                  "contract_addr": {
+                    "$ref": "#/definitions/Addr"
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Native token",
+            "type": "object",
+            "required": [
+              "native_token"
+            ],
+            "properties": {
+              "native_token": {
+                "type": "object",
+                "required": [
+                  "denom"
+                ],
+                "properties": {
+                  "denom": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      }
+    }
   },
   "execute": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/vesting-lp-pcl/src/lib.rs b/contracts/vesting-lp-pcl/src/lib.rs
@@ -1,6 +1,3 @@
 pub mod contract;
 pub mod msg;
 pub mod state;
-
-#[cfg(test)]
-mod tests;