cw721-base: Try to use new schema

Author: ueco-jb

contracts/cw721-base/.cargo/config

@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/cw721-base/examples/schema.rs

@@ -0,0 +1,11 @@
+use cosmwasm_schema::write_api;
+
+use cw721_base::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}

contracts/cw721-base/src/bin/schema.rs

@@ -1,4 +1,4 @@
-use cosmwasm_schema::cw_serde;
+use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::Binary;
 use cw721::Expiration;
 
@@ -72,29 +72,30 @@ pub struct MintMsg<T> {
 }
 
 #[cw_serde]
+#[derive(QueryResponses)]
 pub enum QueryMsg<Q> {
     /// Return the owner of the given token, error if token does not exist
-    /// Return type: OwnerOfResponse
+    #[returns(cw721::OwnerOfResponse)]
     OwnerOf {
         token_id: String,
         /// unset or false will filter out expired approvals, you must set to true to see them
         include_expired: Option<bool>,
     },
     /// Return operator that can access all of the owner's tokens.
-    /// Return type: `ApprovalResponse`
+    #[returns(cw721::ApprovalResponse)]
     Approval {
         token_id: String,
         spender: String,
         include_expired: Option<bool>,
     },
     /// Return approvals that a token has
-    /// Return type: `ApprovalsResponse`
+    #[returns(cw721::ApprovalsResponse)]
     Approvals {
         token_id: String,
         include_expired: Option<bool>,
     },
     /// List all operators that can access all of the owner's tokens
-    /// Return type: `OperatorsResponse`
+    #[returns(cw721::OperatorsResponse)]
     AllOperators {
         owner: String,
         /// unset or false will filter out expired items, you must set to true to see them
@@ -103,20 +104,21 @@ pub enum QueryMsg<Q> {
         limit: Option<u32>,
     },
     /// Total number of tokens issued
+    #[returns(cw721::NumTokensResponse)]
     NumTokens {},
 
     /// With MetaData Extension.
-    /// Returns top-level metadata about the contract: `ContractInfoResponse`
+    #[returns(cw721::ContractInfoResponse)]
     ContractInfo {},
     /// With MetaData Extension.
     /// Returns metadata about one particular token, based on *ERC721 Metadata JSON Schema*
-    /// but directly from the contract: `NftInfoResponse`
-    NftInfo {
-        token_id: String,
-    },
+    /// but directly from the contract
+    #[returns(cw721::NftInfoResponse)]
+    NftInfo { token_id: String },
     /// With MetaData Extension.
     /// Returns the result of both `NftInfo` and `OwnerOf` as one query as an optimization
-    /// for clients: `AllNftInfo`
+    /// for clients
+    #[returns(cw721::AllNftInfoResponse)]
     AllNftInfo {
         token_id: String,
         /// unset or false will filter out expired approvals, you must set to true to see them
@@ -125,27 +127,26 @@ pub enum QueryMsg<Q> {
 
     /// With Enumerable extension.
     /// Returns all tokens owned by the given address, [] if unset.
-    /// Return type: TokensResponse.
+    #[returns(cw721::TokensResponse)]
     Tokens {
         owner: String,
         start_after: Option<String>,
         limit: Option<u32>,
     },
     /// With Enumerable extension.
     /// Requires pagination. Lists all token_ids controlled by the contract.
-    /// Return type: TokensResponse.
+    #[returns(cw721::TokensResponse)]
     AllTokens {
         start_after: Option<String>,
         limit: Option<u32>,
     },
 
-    // Return the minter
+    #[returns(crate::msg::MinterResponse)]
     Minter {},
 
     /// Extension query
-    Extension {
-        msg: Q,
-    },
+    #[returns(())]
+    Extension { msg: Q },
 }
 
 /// Shows who can mint these tokens