final cleanup, docs, renamings, update libs

public-awesome · Mar 24, 2024 · 60d6e2a · 60d6e2a
1 parent 09a6680
commit 60d6e2a
Show file tree

Hide file tree

Showing 36 changed files with 606 additions and 506 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/collections/sg721-base/examples/schema.rs b/contracts/collections/sg721-base/examples/schema.rs
@@ -3,15 +3,14 @@ use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
 
-use cw721::CollectionMetadataAndExtension;
+use cosmwasm_std::Empty;
 use cw721_base::{
  msg::{
- AllNftInfoResponse, ApprovalResponse, ApprovalsResponse, MinterResponse, NftInfoResponse,
- NumTokensResponse, OperatorsResponse, OwnerOfResponse, TokensResponse,
+ AllNftInfoResponse, ApprovalResponse, ApprovalsResponse,
+ CollectionInfoAndExtensionResponse, MinterResponse, NftInfoResponse, NumTokensResponse,
+ OperatorsResponse, OwnerOfResponse, TokensResponse,
  },
- state::CollectionMetadata,
- CollectionMetadataExtensionWrapper, DefaultOptionCollectionMetadataExtension,
- DefaultOptionNftMetadataExtension, RoyaltyInfo,
+ DefaultOptionalCollectionExtension, DefaultOptionalNftExtension,
 };
 use sg721::InstantiateMsg;
 #[allow(deprecated)]
@@ -25,19 +24,17 @@ fn main() {
 
  export_schema(&schema_for!(InstantiateMsg), &out_dir);
  export_schema(
- &schema_for!(QueryMsg<DefaultOptionNftMetadataExtension, DefaultOptionCollectionMetadataExtension>),
+ &schema_for!(QueryMsg<DefaultOptionalNftExtension, DefaultOptionalCollectionExtension, Empty>),
  &out_dir,
  );
  #[allow(deprecated)]
  export_schema(&schema_for!(CollectionInfoResponse), &out_dir);
  export_schema(
- &schema_for!(
- CollectionMetadataAndExtension<CollectionMetadataExtensionWrapper<RoyaltyInfo>>
- ),
+ &schema_for!(CollectionInfoAndExtensionResponse<DefaultOptionalCollectionExtension>),
  &out_dir,
  );
  export_schema_with_title(
- &schema_for!(AllNftInfoResponse<DefaultOptionNftMetadataExtension>),
+ &schema_for!(AllNftInfoResponse<DefaultOptionalNftExtension>),
  &out_dir,
  "AllNftInfoResponse",
  );
@@ -52,11 +49,11 @@ fn main() {
  export_schema(&schema_for!(ApprovalsResponse), &out_dir);
  export_schema(&schema_for!(OperatorsResponse), &out_dir);
  export_schema(
- &schema_for!(CollectionMetadataAndExtension<DefaultOptionCollectionMetadataExtension>),
+ &schema_for!(CollectionInfoAndExtensionResponse<DefaultOptionalCollectionExtension>),
  &out_dir,
  );
  export_schema_with_title(
- &schema_for!(NftInfoResponse<DefaultOptionNftMetadataExtension>),
+ &schema_for!(NftInfoResponse<DefaultOptionalNftExtension>),
  &out_dir,
  "NftInfoResponse",
  );