From a2e7532a58eb9575a5f10ccaf63cf3668b2d51e0 Mon Sep 17 00:00:00 2001
From: mr-t <mr-t@arkprotocol.io>
Date: Tue, 19 Mar 2024 15:55:42 +0100
Subject: [PATCH] cleanup

---
 .../v3_0_0_ownable_and_collection_metadata.rs         |  1 +
 .../src/upgrades/v3_1_0_royalty_timestamp.rs          | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/contracts/collections/sg721-base/src/upgrades/v3_0_0_ownable_and_collection_metadata.rs b/contracts/collections/sg721-base/src/upgrades/v3_0_0_ownable_and_collection_metadata.rs
index bb5c968de..eb4315775 100644
--- a/contracts/collections/sg721-base/src/upgrades/v3_0_0_ownable_and_collection_metadata.rs
+++ b/contracts/collections/sg721-base/src/upgrades/v3_0_0_ownable_and_collection_metadata.rs
@@ -18,6 +18,7 @@ use cw721_base::execute::Cw721Execute;
 /// (2) legacy contract info migration -> collection metadata
 /// - before v0.19 there was only contract info
 /// - now we have collection metadata with optional extension
+/// - here it is migrated to the new format with empty extension
 /// (3) optional creator and minter reset (as passed in Cw721MigrateMsg::WithUpdate)
 /// (4) contract name and version
 ///
diff --git a/contracts/collections/sg721-base/src/upgrades/v3_1_0_royalty_timestamp.rs b/contracts/collections/sg721-base/src/upgrades/v3_1_0_royalty_timestamp.rs
index faccb7eed..878740ea7 100644
--- a/contracts/collections/sg721-base/src/upgrades/v3_1_0_royalty_timestamp.rs
+++ b/contracts/collections/sg721-base/src/upgrades/v3_1_0_royalty_timestamp.rs
@@ -1,14 +1,9 @@
-use crate::{
-    entry::{CONTRACT_NAME, CONTRACT_VERSION},
-    ContractError, Sg721Contract,
-};
-use cw721_base::execute::Cw721Execute;
+use crate::{ContractError, Sg721Contract};
 
 use cosmwasm_std::{DepsMut, Empty, Env, Event, Response};
 use cw721::{
-    msg::Cw721MigrateMsg, DefaultOptionCollectionMetadataExtension,
-    DefaultOptionCollectionMetadataExtensionMsg, DefaultOptionNftMetadataExtension,
-    DefaultOptionNftMetadataExtensionMsg,
+    DefaultOptionCollectionMetadataExtension, DefaultOptionCollectionMetadataExtensionMsg,
+    DefaultOptionNftMetadataExtension, DefaultOptionNftMetadataExtensionMsg,
 };
 
 pub fn upgrade(deps: DepsMut, env: &Env, response: Response) -> Result<Response, ContractError> {