Update CI config & address linter issues

MightOfOaks · MightOfOaks · commit 70fa93e55fee · 2025-12-19T16:09:07.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,8 +3,7 @@ workflows:
   version: 2
   test:
     jobs:
-      - contract_sg721_base
-      - contract_sg721_nt
+      - contract_cw721_migration
       - contract_base_factory
       - contract_base_minter
       - contract_vending_factory
@@ -28,10 +27,10 @@ workflows:
               ignore: /.*/
 
 jobs:
-  contract_sg721_base:
+  contract_cw721_migration:
     docker:
       - image: rust:1.81.0
-    working_directory: ~/project/contracts/collections/sg721-base
+    working_directory: ~/project/contracts/collections/cw721-migration
     steps:
       - checkout:
           path: ~/project
@@ -40,65 +39,17 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-sg721-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw721-migration-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
             RUST_BACKTRACE: 1
           command: cargo unit-test --locked
-      - run:
-          name: Build and run schema generator
-          command: cargo schema --locked
-      - run:
-          name: Ensure checked-in schemas are up-to-date
-          command: |
-            CHANGES_IN_REPO=$(git status --porcelain)
-            if [[ -n "$CHANGES_IN_REPO" ]]; then
-              echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
-              git status && git --no-pager diff
-              exit 1
-            fi
-      - save_cache:
-          paths:
-            - /usr/local/cargo/registry
-            - target
-          key: cargocache-sg721-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
-
-  contract_sg721_nt:
-    docker:
-      - image: rust:1.81.0
-    working_directory: ~/project/contracts/collections/sg721-nt
-    steps:
-      - checkout:
-          path: ~/project
-      - run:
-          name: Version information
-          command: rustc --version; cargo --version; rustup --version
-      - restore_cache:
-          keys:
-            - cargocache-sg721-nt-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
-      - run:
-          name: Unit Tests
-          environment:
-            RUST_BACKTRACE: 1
-          command: cargo unit-test --locked
-      - run:
-          name: Build and run schema generator
-          command: cargo schema --locked
-      - run:
-          name: Ensure checked-in schemas are up-to-date
-          command: |
-            CHANGES_IN_REPO=$(git status --porcelain)
-            if [[ -n "$CHANGES_IN_REPO" ]]; then
-              echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
-              git status && git --no-pager diff
-              exit 1
-            fi
       - save_cache:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-sg721-nt-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw721-migration-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_base_factory:
     docker:
@@ -378,7 +329,7 @@ jobs:
   package_sg_utils:
     docker:
       - image: rust:1.81.0
-    working_directory: ~/project/package/sg-utils
+    working_directory: ~/project/packages/sg-utils
     steps:
       - checkout:
           path: ~/project
diff --git a/contracts/minters/open-edition-minter-merkle-wl/src/contract.rs b/contracts/minters/open-edition-minter-merkle-wl/src/contract.rs
@@ -1,3 +1,6 @@
+// Allow deprecated SubMsgResponse::data until chains migrate to msg_responses
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use crate::helpers::mint_nft_msg;
 use crate::msg::{
diff --git a/contracts/minters/open-edition-minter-wl-flex/src/contract.rs b/contracts/minters/open-edition-minter-wl-flex/src/contract.rs
@@ -1,3 +1,6 @@
+// Allow deprecated SubMsgResponse::data until chains migrate to msg_responses
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use crate::helpers::mint_nft_msg;
 use crate::msg::{
diff --git a/contracts/minters/open-edition-minter/src/contract.rs b/contracts/minters/open-edition-minter/src/contract.rs
@@ -1,3 +1,6 @@
+// Allow deprecated SubMsgResponse::data until chains migrate to msg_responses
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use crate::helpers::mint_nft_msg;
 use crate::msg::{
diff --git a/contracts/minters/vending-minter-featured/src/contract.rs b/contracts/minters/vending-minter-featured/src/contract.rs
@@ -21,10 +21,7 @@ use cw2::set_contract_version;
 use cw_utils::{may_pay, maybe_addr, nonpayable, parse_instantiate_response_data};
 
 use cw721::msg::{CollectionExtensionMsg, CollectionInfoMsg, RoyaltyInfoResponse};
-use cw721::Ownership;
-use cw721_base::msg::{
-    ExecuteMsg as Cw721ExecuteMsg, InstantiateMsg as Cw721InstantiateMsg, QueryMsg as Cw721QueryMsg,
-};
+use cw721_base::msg::{ExecuteMsg as Cw721ExecuteMsg, InstantiateMsg as Cw721InstantiateMsg};
 use semver::Version;
 use sg1::{distribute_mint_fees, transfer_funds_to_launchpad_dao};
 use sg2::query::Sg2QueryMsg;
diff --git a/contracts/minters/vending-minter-merkle-wl/src/contract.rs b/contracts/minters/vending-minter-merkle-wl/src/contract.rs
@@ -1,3 +1,6 @@
+// Allow deprecated SubMsgResponse::data until chains migrate to msg_responses
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use crate::msg::{
     ConfigResponse, ExecuteMsg, MintCountResponse, MintPriceResponse, MintableNumTokensResponse,
@@ -14,8 +17,8 @@ use crate::validation::{check_dynamic_per_address_limit, get_three_percent_of_to
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
     coin, ensure, to_json_binary, Addr, BankMsg, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut,
-    Empty, Env, Event, MessageInfo, Order, Reply, ReplyOn, Response, StdError, StdResult, SubMsg,
-    Timestamp, Uint128, WasmMsg,
+    Empty, Env, Event, MessageInfo, Order, Reply, Response, StdError, StdResult, SubMsg, Timestamp,
+    Uint128, WasmMsg,
 };
 use cw2::set_contract_version;
 use cw721::msg::{CollectionExtensionMsg, CollectionInfoMsg, RoyaltyInfoResponse};
diff --git a/contracts/minters/vending-minter-wl-flex-featured/src/contract.rs b/contracts/minters/vending-minter-wl-flex-featured/src/contract.rs
@@ -1,3 +1,8 @@
+// Allow deprecated SubMsgResponse::data until chains migrate to msg_responses
+#![allow(deprecated)]
+// Allow too many arguments for execute_update_collection_info
+#![allow(clippy::too_many_arguments)]
+
 use crate::error::ContractError;
 use crate::msg::{
     ConfigResponse, ExecuteMsg, MintCountResponse, MintPriceResponse, MintableNumTokensResponse,
diff --git a/contracts/minters/vending-minter/src/contract.rs b/contracts/minters/vending-minter/src/contract.rs
@@ -14,15 +14,12 @@ use crate::validation::{check_dynamic_per_address_limit, get_three_percent_of_to
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
     coin, ensure, to_json_binary, Addr, BankMsg, Binary, Coin, CosmosMsg, Decimal, Deps, DepsMut,
-    Empty, Env, Event, MessageInfo, Order, Reply, ReplyOn, Response, StdError, StdResult, SubMsg,
-    Timestamp, Uint128, WasmMsg,
+    Empty, Env, Event, MessageInfo, Order, Reply, Response, StdError, StdResult, SubMsg, Timestamp,
+    Uint128, WasmMsg,
 };
 use cw2::set_contract_version;
 use cw721::msg::{CollectionExtensionMsg, RoyaltyInfoResponse};
-use cw721::Ownership;
-use cw721_base::msg::{
-    ExecuteMsg as Cw721ExecuteMsg, InstantiateMsg as Cw721InstantiateMsg, QueryMsg as Cw721QueryMsg,
-};
+use cw721_base::msg::{ExecuteMsg as Cw721ExecuteMsg, InstantiateMsg as Cw721InstantiateMsg};
 use cw_utils::{may_pay, maybe_addr, nonpayable, parse_instantiate_response_data};
 use nois::{int_in_range, shuffle};
 
diff --git a/contracts/splits/src/contract.rs b/contracts/splits/src/contract.rs
@@ -1,3 +1,6 @@
+// Allow deprecated query_all_balances until migrated to paginated queries
+#![allow(deprecated)]
+
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
diff --git a/e2e/src/lib.rs b/e2e/src/lib.rs
@@ -1,3 +1,6 @@
+// Allow large error variants in e2e tests
+#![allow(clippy::result_large_err)]
+
 #[cfg(not(target_arch = "wasm32"))]
 mod tests;
 
diff --git a/packages/controllers/src/hooks.rs b/packages/controllers/src/hooks.rs
@@ -37,7 +37,7 @@ impl Hooks {
         if hooks.len() >= 5 {
             return Err(HookError::HookTooMany {});
         }
-        if !hooks.iter().any(|h| h == addr) {
+        if !hooks.contains(&addr) {
             hooks.push(addr);
         } else {
             return Err(HookError::HookAlreadyRegistered {});
diff --git a/test-suite/src/lib.rs b/test-suite/src/lib.rs
@@ -1,3 +1,15 @@
+// Allow deprecated APIs used in tests (mock_info, query_all_balances)
+#![allow(deprecated)]
+// Allow length comparison to one
+#![allow(clippy::len_zero)]
+// Allow dead code in test modules
+#![allow(dead_code)]
+// Allow clippy style warnings in tests
+#![allow(clippy::redundant_clone)]
+#![allow(clippy::unnecessary_to_owned)]
+#![allow(clippy::useless_vec)]
+#![allow(clippy::cloned_ref_to_slice_refs)]
+
 pub mod common_setup;
 
 #[cfg(test)]
diff --git a/test-suite/src/open_edition_minter/tests/ibc_asset_mint.rs b/test-suite/src/open_edition_minter/tests/ibc_asset_mint.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{coin, Addr, Coin, Decimal, Timestamp, Uint128};
+use cosmwasm_std::{coin, Coin, Decimal, Timestamp, Uint128};
 use cw_multi_test::{BankSudo, Executor, SudoMsg};
 use open_edition_factory::state::{OpenEditionMinterParams, ParamsExtension};
 use open_edition_minter::msg::ExecuteMsg;
diff --git a/test-suite/src/vending_minter/tests/happy_unhappy.rs b/test-suite/src/vending_minter/tests/happy_unhappy.rs
@@ -6,7 +6,7 @@ use crate::common_setup::{
 use cosmwasm_std::{
     coin, coins,
     testing::{mock_dependencies_with_balance, mock_env, mock_info},
-    Api, Coin, Timestamp, Uint128,
+    Coin, Timestamp, Uint128,
 };
 use cw721::msg::{OwnerOfResponse, TokensResponse};
 use cw721_base::msg::QueryMsg as Cw721QueryMsg;
diff --git a/test-suite/src/vending_minter/tests/whitelist.rs b/test-suite/src/vending_minter/tests/whitelist.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{coin, coins, Addr, Empty, Timestamp};
+use cosmwasm_std::{coin, coins, Addr, Timestamp};
 use cw721::msg::TokensResponse;
 use cw721_base::msg::ExecuteMsg as Cw721ExecuteMsg;
 use cw721_base::msg::QueryMsg as Cw721QueryMsg;
