generate schemas for entry points, cleanup

arkprotocol · Jun 13, 2024 · a5652e2 · a5652e2
1 parent 67522f7
commit a5652e2
Show file tree

Hide file tree

Showing 39 changed files with 2,338 additions and 2,707 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ cw721-base-016  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.16.0"
 cw721-base-017  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.17.0", package = "cw721-base" } # needed for testing legacy migration
 cw721-base-018  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.18.0", package = "cw721-base" } # needed for testing legacy migration
 cw-multi-test   = "^0.20"
-cw-ownable      = { git = "https://github.com/public-awesome/cw-plus-plus.git", branch = "multiple_ownership"} # TODO: switch to official https://github.com/larry0x/cw-plus-plus once merged
+cw-ownable      = { git = "https://github.com/public-awesome/cw-plus-plus.git", rev = "28c1a09bfc6b4f1942fefe3eb0b50faf9d3b1523"} # TODO: switch to official https://github.com/larry0x/cw-plus-plus once merged
 cw-storage-plus = "^1.1"
 cw-utils        = "^1.0"
 schemars        = "^0.8"

diff --git a/contracts/cw2981-royalties/src/msg.rs b/contracts/cw2981-royalties/src/msg.rs
@@ -132,14 +132,6 @@ pub enum QueryMsg {
     Extension { msg: Extension },
 }
 
-// impl Default for Cw2981QueryMsg {
-//     fn default() -> Self {
-//         Cw2981QueryMsg::CheckRoyalties {}
-//     }
-// }
-
-// impl CustomMsg for Cw2981QueryMsg {}
-
 impl From<QueryMsg> for Cw721QueryMsg<Extension> {
     fn from(msg: QueryMsg) -> Cw721QueryMsg<Extension> {
         match msg {

diff --git a/contracts/cw721-base/Cargo.toml b/contracts/cw721-base/Cargo.toml
@@ -24,6 +24,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
 cw-ownable      = { workspace = true }
 cw2             = { workspace = true }

diff --git a/contracts/cw721-base/examples/schema.rs b/contracts/cw721-base/examples/schema.rs
@@ -0,0 +1,23 @@
+use cosmwasm_schema::{export_schema_with_title, remove_schemas, schema_for};
+use cosmwasm_std::Empty;
+use cw721::state::DefaultOptionMetadataExtension;
+use cw721_base::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+fn main() {
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    // entry points - generate always with title for avoiding name suffixes like "..._empty_for_..." due to generics
+    export_schema_with_title(&schema_for!(InstantiateMsg), &out_dir, "InstantiateMsg");
+    export_schema_with_title(
+        &schema_for!(ExecuteMsg::<DefaultOptionMetadataExtension, Empty>),
+        &out_dir,
+        "ExecuteMsg",
+    );
+    export_schema_with_title(&schema_for!(QueryMsg<Empty>), &out_dir, "QueryMsg");
+    export_schema_with_title(&schema_for!(MigrateMsg), &out_dir, "MigrateMsg");
+}
diff --git a/packages/cw721/schema/execute_msg.json → contracts/cw721-base/schema/execute_msg.json b/packages/cw721/schema/execute_msg.json → contracts/cw721-base/schema/execute_msg.json
diff --git a/packages/cw721/schema/instantiate_msg.json → ...ts/cw721-base/schema/instantiate_msg.json b/packages/cw721/schema/instantiate_msg.json → ...ts/cw721-base/schema/instantiate_msg.json
diff --git a/contracts/cw721-base/schema/migrate_msg.json b/contracts/cw721-base/schema/migrate_msg.json
@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "MigrateMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "with_update"
+      ],
+      "properties": {
+        "with_update": {
+          "type": "object",
+          "properties": {
+            "creator": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "minter": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
diff --git a/packages/cw721/schema/query_msg.json → contracts/cw721-base/schema/query_msg.json b/packages/cw721/schema/query_msg.json → contracts/cw721-base/schema/query_msg.json
diff --git a/contracts/cw721-base/src/state.rs b/contracts/cw721-base/src/state.rs
@@ -1,6 +1,8 @@
 use cosmwasm_std::CustomMsg;
+
 // expose to all others using contract, so others dont need to import cw721
 pub use cw721::state::*;
+
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 

diff --git a/contracts/cw721-expiration/examples/schema.rs b/contracts/cw721-expiration/examples/schema.rs
@@ -1,10 +1,23 @@
-use cosmwasm_schema::write_api;
+use cosmwasm_schema::{export_schema_with_title, remove_schemas, schema_for};
 use cosmwasm_std::Empty;
-use cw721_expiration::msg::{InstantiateMsg, QueryMsg};
+use cw721::state::DefaultOptionMetadataExtension;
+use cw721_expiration::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use std::env::current_dir;
+use std::fs::create_dir_all;
 
 fn main() {
-    write_api! {
-        instantiate: InstantiateMsg,
-        query: QueryMsg<Empty>,
-    }
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    // entry points - generate always with title for avoiding name suffixes like "..._empty_for_..." due to generics
+    export_schema_with_title(&schema_for!(InstantiateMsg), &out_dir, "InstantiateMsg");
+    export_schema_with_title(
+        &schema_for!(ExecuteMsg::<DefaultOptionMetadataExtension, Empty>),
+        &out_dir,
+        "ExecuteMsg",
+    );
+    export_schema_with_title(&schema_for!(QueryMsg<Empty>), &out_dir, "QueryMsg");
+    export_schema_with_title(&schema_for!(MigrateMsg), &out_dir, "MigrateMsg");
 }