Review fixes

Author: deniszagumennov

Cargo.toml

@@ -50,7 +50,6 @@ cosmwasm-schema = { version = "2.1.0", default-features = false }
 cw-storage-plus = { version = "2.0.0", default-features = false }
 cw2 = { version = "2.0.0", default-features = false }
 cw721 = { package = "cw721", git = "https://github.com/public-awesome/cw-nfts", branch = "main", default-features = false }
-cw721-base = { package = "cw721-base", git = "https://github.com/public-awesome/cw-nfts", branch = "main", default-features = false }
 cw-multi-test = { version = "2.1.0", default-features = false }
 cw-utils = { version = "2.0.0", default-features = false }
 time = "0.3.37"

contracts/puppeteer/src/contract.rs

@@ -576,9 +576,6 @@ fn execute_setup_protocol(
         "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
     )?);
 
-    deps.api
-        .debug(&format!("WASMDEBUG: {rewards_withdraw_address:?}",));
-
     let submsg = compose_submsg(
         deps.branch(),
         config.clone(),
@@ -591,8 +588,6 @@ fn execute_setup_protocol(
         ReplyMsg::SudoPayload.to_reply_id(),
     )?;
 
-    deps.api.debug(&format!("WASMDEBUG: SUBMSG {submsg:?}",));
-
     Ok(Response::default().add_submessages(vec![submsg]))
 }
 
@@ -1075,9 +1070,6 @@ fn sudo_response(
         .ok_or_else(|| StdError::generic_err("IBC client state latest_height not found"))?
         .revision_height;
 
-    deps.api
-        .debug(&format!("WASMDEBUG: remote height: {:?}", remote_height));
-
     deps.api.debug(&format!(
         "WASMDEBUG: json: {request:?}",
         request = to_json_binary(&ReceiverExecuteMsg::PeripheralHook(

contracts/withdrawal-voucher/Cargo.toml

@@ -25,6 +25,5 @@ cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 cw2 = { workspace = true }
 cw721 = { workspace = true }
-cw721-base = { workspace = true }
 drop-staking-base = { workspace = true }
 semver = { workspace = true }

contracts/withdrawal-voucher/src/contract.rs

@@ -1,7 +1,7 @@
 use cosmwasm_std::Empty;
 pub use cw721::msg::MinterResponse;
 pub use cw721::traits::{Cw721Execute, Cw721Query};
-pub use cw721_base::error::ContractError;
+pub use cw721::error::Cw721ContractError;
 pub use drop_staking_base::msg::withdrawal_voucher::{
     ExecuteMsg, Extension, ExtensionMsg, InstantiateMsg, MigrateMsg, QueryMsg,
 };
@@ -34,7 +34,7 @@ pub mod entry {
         env: Env,
         info: MessageInfo,
         msg: InstantiateMsg,
-    ) -> Result<Response, ContractError> {
+    ) -> Result<Response, Cw721ContractError> {
         cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
         Cw721VoucherContract::default().instantiate(deps.branch(), &env, &info, msg)
     }
@@ -45,24 +45,17 @@ pub mod entry {
         env: Env,
         info: MessageInfo,
         msg: ExecuteMsg,
-    ) -> Result<Response, ContractError> {
+    ) -> Result<Response, Cw721ContractError> {
         Cw721VoucherContract::default().execute(deps, &env, &info, msg)
     }
 
     #[cosmwasm_std::entry_point]
-    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
-        deps.api
-            .debug(format!("WASMDEBUG: Received QueryMsg: {:?}", msg).as_str());
-
-        let result = Cw721VoucherContract::default().query(deps, &env, msg);
-
-        deps.api
-            .debug(format!("WASMDEBUG: Exiting query with result: {:?}", result).as_str());
-        result
+    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, Cw721ContractError> {
+        Cw721VoucherContract::default().query(deps, &env, msg);
     }
 
     #[cosmwasm_std::entry_point]
-    pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, Cw721ContractError> {
         let contract_version_metadata = cw2::get_contract_version(deps.storage)?;
         let storage_contract_name = contract_version_metadata.contract.as_str();
         if storage_contract_name != CONTRACT_NAME {

packages/base/Cargo.toml

@@ -30,7 +30,6 @@ drop-puppeteer-base = { workspace = true }
 drop-helpers = { workspace = true }
 drop-macros = { workspace = true }
 drop-proto = { workspace = true }
-cw721-base = { workspace = true }
 cw721 = { workspace = true }
 thiserror = { workspace = true }
 cw-ownable = { workspace = true }

packages/base/src/msg/withdrawal_voucher.rs

@@ -2,7 +2,6 @@ use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Empty;
 pub use cw721::msg::Cw721InstantiateMsg as CW721InstantiateMsg;
 pub use cw721::msg::MinterResponse;
-pub use cw721_base::error::ContractError;
 
 use crate::state::withdrawal_voucher::{NftExtension, NftExtensionMsg};