Merge pull request #2066 from CosmWasm/aw/fix-warnings

Fix a bunch of warnings across the workspace

Author: aumetra

.circleci/config.yml

@@ -41,7 +41,7 @@ commands:
       # Run clippy after wasm build to ensure target/wasm32-unknown-unknown/release/<contract>.wasm exists
       - run:
           name: Clippy
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Integration tests (singlepass backend)
           command: cargo integration-test --locked --no-default-features
@@ -912,35 +912,35 @@ jobs:
       - run:
           name: Clippy linting on crypto
           working_directory: ~/project/packages/crypto
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Clippy linting on derive
           working_directory: ~/project/packages/derive
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Clippy linting on schema
           working_directory: ~/project/packages/schema
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Clippy linting on schema-derive
           working_directory: ~/project/packages/schema-derive
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Clippy linting on std (no feature flags)
           working_directory: ~/project/packages/std
-          command: cargo clippy --all-targets -- -D warnings
+          command: cargo clippy --all-targets --tests -- -D warnings
       - run:
           name: Clippy linting on std (all feature flags)
           working_directory: ~/project/packages/std
-          command: cargo clippy --all-targets --features abort,iterator,staking,stargate,cosmwasm_2_0 -- -D warnings
+          command: cargo clippy --all-targets --tests --features abort,iterator,staking,stargate,cosmwasm_2_0 -- -D warnings
       - run:
           name: Clippy linting on vm (no feature flags)
           working_directory: ~/project/packages/vm
-          command: cargo clippy --all-targets --no-default-features -- -D warnings
+          command: cargo clippy --all-targets --tests --no-default-features -- -D warnings
       - run:
           name: Clippy linting on vm (all feature flags)
           working_directory: ~/project/packages/vm
-          command: cargo clippy --all-targets --features iterator,staking,stargate -- -D warnings
+          command: cargo clippy --all-targets --tests --features iterator,staking,stargate -- -D warnings
       - save_cache:
           paths:
             - /usr/local/cargo/registry

packages/crypto/src/secp256r1.rs

@@ -4,7 +4,6 @@ use p256::{
     ecdsa::signature::DigestVerifier, // traits
     ecdsa::{Signature, VerifyingKey}, // type aliases
 };
-use std::convert::TryInto;
 
 use crate::ecdsa::{ECDSA_COMPRESSED_PUBKEY_LEN, ECDSA_UNCOMPRESSED_PUBKEY_LEN};
 use crate::errors::{CryptoError, CryptoResult};
@@ -145,8 +144,6 @@ mod tests {
     use std::fs::File;
     use std::io::BufReader;
 
-    use crate::secp256r1_recover_pubkey;
-    use ecdsa::RecoveryId;
     use p256::{
         ecdsa::signature::DigestSigner, ecdsa::SigningKey, elliptic_curve::rand_core::OsRng,
     };

packages/std/src/addresses.rs

@@ -360,7 +360,7 @@ fn hash(ty: &str, key: &[u8]) -> Vec<u8> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{assert_hash_works, HexBinary};
+    use crate::assert_hash_works;
     use hex_literal::hex;
 
     #[test]

packages/std/src/binary.rs

@@ -258,7 +258,6 @@ impl<'de> de::Visitor<'de> for Base64Visitor {
 mod tests {
     use super::*;
     use crate::assert_hash_works;
-    use crate::errors::StdError;
     use crate::serde::{from_json, to_json_vec};
 
     #[test]

packages/std/src/hex_binary.rs

@@ -248,7 +248,7 @@ impl<'de> de::Visitor<'de> for HexVisitor {
 mod tests {
     use super::*;
 
-    use crate::{assert_hash_works, from_json, to_json_vec, StdError};
+    use crate::{assert_hash_works, from_json, to_json_vec};
 
     #[test]
     fn from_hex_works() {

packages/std/src/ibc.rs

@@ -1,7 +1,7 @@
 // The CosmosMsg variants are defined in results/cosmos_msg.rs
 // The rest of the IBC related functionality is defined here
 
-use core::cmp::{Ord, Ordering, PartialOrd};
+use core::cmp::Ordering;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

packages/std/src/math/decimal256.rs

@@ -783,7 +783,6 @@ impl<'de> de::Visitor<'de> for Decimal256Visitor {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::errors::StdError;
     use crate::{from_json, to_json_vec};
 
     fn dec(input: &str) -> Decimal256 {

packages/std/src/math/mod.rs

@@ -80,6 +80,7 @@ mod tests {
     {
     }
 
+    #[allow(dead_code)] // This is used to statically ensure all the integers have a shared set of traits
     trait SignedImpl<'a>: IntImpl<'a> + Neg<Output = Self> {}
 
     impl AllImpl<'_> for Uint64 {}

packages/std/src/query/query_response.rs

@@ -15,4 +15,5 @@ use serde::de::DeserializeOwned;
 /// - multi-test/cw-sdk: create a default instance and mutate the fields
 ///
 /// This trait is crate-internal and can change any time.
+#[allow(dead_code)] // This is used to statically ensure all the types have a shared set of traits
 pub(crate) trait QueryResponseType: DeserializeOwned + Debug + PartialEq + Clone {}

packages/std/src/testing/mock.rs

@@ -521,16 +521,16 @@ impl<C: DeserializeOwned> MockQuerier<C> {
         }
     }
 
-    pub fn update_wasm<WH: 'static>(&mut self, handler: WH)
+    pub fn update_wasm<WH>(&mut self, handler: WH)
     where
-        WH: Fn(&WasmQuery) -> QuerierResult,
+        WH: Fn(&WasmQuery) -> QuerierResult + 'static,
     {
         self.wasm.update_handler(handler)
     }
 
-    pub fn with_custom_handler<CH: 'static>(mut self, handler: CH) -> Self
+    pub fn with_custom_handler<CH>(mut self, handler: CH) -> Self
     where
-        CH: Fn(&C) -> MockQuerierCustomHandlerResult,
+        CH: Fn(&C) -> MockQuerierCustomHandlerResult + 'static,
     {
         self.custom_handler = Box::from(handler);
         self
@@ -598,9 +598,9 @@ impl WasmQuerier {
         Self { handler }
     }
 
-    fn update_handler<WH: 'static>(&mut self, handler: WH)
+    fn update_handler<WH>(&mut self, handler: WH)
     where
-        WH: Fn(&WasmQuery) -> QuerierResult,
+        WH: Fn(&WasmQuery) -> QuerierResult + 'static,
     {
         self.handler = Box::from(handler)
     }
@@ -1116,10 +1116,7 @@ mod tests {
     use super::*;
     #[cfg(feature = "cosmwasm_1_3")]
     use crate::DenomUnit;
-    use crate::{
-        coin, coins, from_json, instantiate2_address, to_json_binary, ContractInfoResponse,
-        HexBinary, Response,
-    };
+    use crate::{coin, coins, instantiate2_address, ContractInfoResponse, HexBinary, Response};
     #[cfg(feature = "staking")]
     use crate::{Decimal, Delegation};
     use hex_literal::hex;