Merge pull request #3811 from nymtech/jon/clippy

Fix clippy for latest rustc

common/client-libs/validator-client/Cargo.toml

@@ -65,7 +65,7 @@ features = ["tokio"]
 [dev-dependencies]
 bip39 = { workspace = true }
 cosmrs = { workspace = true, features = ["bip32"] }
-ts-rs = "6.1.2"
+ts-rs = { workspace = true }
 
 [[example]]
 name = "offline_signing"

common/client-libs/validator-client/src/signing/direct_wallet.rs

@@ -199,16 +199,14 @@ mod tests {
     #[test]
     fn generating_account_addresses() {
         // test vectors produced from our js wallet
-        let mnemonics = vec![
-            "crush minute paddle tobacco message debate cabin peace bar jacket execute twenty winner view sure mask popular couch penalty fragile demise fresh pizza stove",
+        let mnemonics = ["crush minute paddle tobacco message debate cabin peace bar jacket execute twenty winner view sure mask popular couch penalty fragile demise fresh pizza stove",
             "acquire rebel spot skin gun such erupt pull swear must define ill chief turtle today flower chunk truth battle claw rigid detail gym feel",
-            "step income throw wheat mobile ship wave drink pool sudden upset jaguar bar globe rifle spice frost bless glimpse size regular carry aspect ball"
-        ];
+            "step income throw wheat mobile ship wave drink pool sudden upset jaguar bar globe rifle spice frost bless glimpse size regular carry aspect ball"];
         let prefix = NymNetworkDetails::new_mainnet()
             .chain_details
             .bech32_account_prefix;
 
-        let addrs = vec![
+        let addrs = [
             "n1jw6mp7d5xqc7w6xm79lha27glmd0vdt3l9artf",
             "n1h5hgn94nsq4kh99rjj794hr5h5q6yfm2lr52es",
             "n17n9flp6jflljg6fp05dsy07wcprf2uuu8g40rf",

common/coconut-interface/src/lib.rs

@@ -8,7 +8,14 @@ use serde::{Deserialize, Serialize};
 
 use error::CoconutInterfaceError;
 
-pub use nym_coconut::*;
+// We list these explicity instead of glob export due to shadowing warnings with the pub tests
+// module.
+pub use nym_coconut::{
+    aggregate_signature_shares, aggregate_verification_keys, blind_sign, hash_to_scalar,
+    prepare_blind_sign, prove_bandwidth_credential, Attribute, Base58, BlindSignRequest,
+    BlindedSignature, Bytable, CoconutError, KeyPair, Parameters, PrivateAttribute,
+    PublicAttribute, Signature, SignatureShare, Theta, VerificationKey,
+};
 
 #[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq, Eq)]
 pub struct Credential {
@@ -57,7 +64,7 @@ impl Credential {
 
     pub fn verify(&self, verification_key: &VerificationKey) -> bool {
         let params = Parameters::new(self.n_params).unwrap();
-        let public_attributes = vec![
+        let public_attributes = [
             self.voucher_value.to_string().as_bytes(),
             self.voucher_info.as_bytes(),
         ]
@@ -138,6 +145,8 @@ impl Base58 for Credential {}
 
 #[cfg(test)]
 mod tests {
+    use nym_coconut::{prove_bandwidth_credential, Signature};
+
     use super::*;
 
     #[test]

common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml

@@ -26,7 +26,7 @@ humantime-serde = "1.1.1"
 # TO CHECK WHETHER STILL NEEDED:
 log = { workspace = true }
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
-ts-rs = { version = "6.1.2", optional = true }
+ts-rs = { workspace = true, optional = true }
 
 [dev-dependencies]
 rand_chacha = "0.3"

common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml

@@ -15,7 +15,7 @@ mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-co
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-ts-rs = {version = "6.1.2", optional = true}
+ts-rs = { workspace = true, optional = true}
 
 [features]
 schema = ["cw2"]

common/nymcoconut/src/proofs/mod.rs

@@ -354,7 +354,7 @@ impl ProofKappaZeta {
         let witness_blinder = params.random_scalar();
         let witness_serial_number = params.random_scalar();
         let witness_binding_number = params.random_scalar();
-        let witness_attributes = vec![witness_serial_number, witness_binding_number];
+        let witness_attributes = [witness_serial_number, witness_binding_number];
 
         let beta_bytes = verification_key
             .beta_g2
@@ -417,7 +417,7 @@ impl ProofKappaZeta {
             .map(|beta_i| beta_i.to_bytes())
             .collect::<Vec<_>>();
 
-        let response_attributes = vec![self.response_serial_number, self.response_binding_number];
+        let response_attributes = [self.response_serial_number, self.response_binding_number];
         // re-compute witnesses commitments
         // Aw = (c * kappa) + (rt * g2) + ((1 - c) * alpha) + (rm[0] * beta[0]) + ... + (rm[i] * beta[i])
         let commitment_kappa = kappa * self.challenge

common/nymsphinx/acknowledgements/src/identifier.rs

@@ -17,7 +17,7 @@ pub fn prepare_identifier<R: RngCore + CryptoRng>(
     let id_ciphertext = encrypt::<AckEncryptionAlgorithm>(key.inner(), &iv, &serialized_id);
 
     // IV || ID_CIPHERTEXT
-    iv.into_iter().chain(id_ciphertext.into_iter()).collect()
+    iv.into_iter().chain(id_ciphertext).collect()
 }
 
 pub fn recover_identifier(

common/nymsphinx/acknowledgements/src/surb_ack.rs

@@ -122,7 +122,7 @@ impl SurbAck {
             .first_hop_address
             .as_zero_padded_bytes(MAX_NODE_ADDRESS_UNPADDED_LEN)
             .into_iter()
-            .chain(self.surb_ack_packet.to_bytes()?.into_iter())
+            .chain(self.surb_ack_packet.to_bytes()?)
             .collect();
         Ok((self.expected_total_delay, surb_bytes))
     }

common/nymsphinx/anonymous-replies/src/reply_surb.rs

@@ -130,7 +130,7 @@ impl ReplySurb {
         self.encryption_key
             .to_bytes()
             .into_iter()
-            .chain(self.surb.to_bytes().into_iter())
+            .chain(self.surb.to_bytes())
             .collect()
     }
 

common/nymsphinx/anonymous-replies/src/requests.rs

@@ -275,7 +275,7 @@ impl RepliableMessageContent {
                     .to_be_bytes()
                     .into_iter()
                     .chain(reply_surbs.into_iter().flat_map(|s| s.to_bytes()))
-                    .chain(message.into_iter())
+                    .chain(message)
                     .collect()
             }
             RepliableMessageContent::AdditionalSurbs { reply_surbs } => {
@@ -465,7 +465,7 @@ impl ReplyMessageContent {
             ReplyMessageContent::SurbRequest { recipient, amount } => recipient
                 .to_bytes()
                 .into_iter()
-                .chain(amount.to_be_bytes().into_iter())
+                .chain(amount.to_be_bytes())
                 .collect(),
         }
     }

common/nymsphinx/chunking/src/fragment.rs

@@ -204,7 +204,7 @@ impl Fragment {
         self.header
             .to_bytes()
             .into_iter()
-            .chain(self.payload.into_iter())
+            .chain(self.payload)
             .collect()
     }
 

common/nymsphinx/cover/src/lib.rs

@@ -115,7 +115,7 @@ where
     let packet_payload: Vec<_> = ack_bytes
         .into_iter()
         .chain(ephemeral_keypair.public_key().to_bytes().iter().cloned())
-        .chain(cover_content.into_iter())
+        .chain(cover_content)
         .collect();
 
     let route =

common/nymsphinx/forwarding/src/packet.rs

@@ -106,8 +106,8 @@ impl MixPacket {
 
     pub fn into_bytes(self) -> Result<Vec<u8>, MixPacketFormattingError> {
         Ok(std::iter::once(self.packet_type as u8)
-            .chain(self.next_hop.as_bytes().into_iter())
-            .chain(self.packet.to_bytes()?.into_iter())
+            .chain(self.next_hop.as_bytes())
+            .chain(self.packet.to_bytes()?)
             .collect())
     }
 }

common/nymsphinx/src/preparer/payload.rs

@@ -50,8 +50,8 @@ impl NymPayloadBuilder {
         Ok(NymPayload(
             surb_ack_bytes
                 .into_iter()
-                .chain(variant_data.into_iter())
-                .chain(fragment_data.into_iter())
+                .chain(variant_data)
+                .chain(fragment_data)
                 .collect(),
         ))
     }
@@ -61,10 +61,7 @@ impl NymPayloadBuilder {
         packet_encryption_key: &SurbEncryptionKey,
     ) -> Result<NymPayload, SurbAckRecoveryError> {
         let key_digest = packet_encryption_key.compute_digest();
-        self.build::<ReplySurbEncryptionAlgorithm>(
-            packet_encryption_key.inner(),
-            key_digest.into_iter(),
-        )
+        self.build::<ReplySurbEncryptionAlgorithm>(packet_encryption_key.inner(), key_digest)
     }
 
     pub fn build_regular<R>(

common/socks5/requests/src/lib.rs

@@ -73,7 +73,7 @@ impl SocketDataHeader {
             .to_be_bytes()
             .into_iter()
             .chain(std::iter::once(self.local_socket_closed as u8))
-            .chain(self.seq.to_be_bytes().into_iter())
+            .chain(self.seq.to_be_bytes())
     }
 
     pub fn try_from_response_bytes(
@@ -107,8 +107,8 @@ impl SocketDataHeader {
 
     pub fn into_response_bytes_iter(self) -> impl Iterator<Item = u8> {
         std::iter::once(self.local_socket_closed as u8)
-            .chain(self.connection_id.to_be_bytes().into_iter())
-            .chain(self.seq.to_be_bytes().into_iter())
+            .chain(self.connection_id.to_be_bytes())
+            .chain(self.seq.to_be_bytes())
     }
 }
 
@@ -170,9 +170,7 @@ impl SocketData {
     }
 
     pub fn into_request_bytes_iter(self) -> impl Iterator<Item = u8> {
-        self.header
-            .into_request_bytes_iter()
-            .chain(self.data.into_iter())
+        self.header.into_request_bytes_iter().chain(self.data)
     }
 
     pub fn try_from_response_bytes(b: &[u8]) -> Result<SocketData, InsufficientSocketDataError> {
@@ -190,9 +188,7 @@ impl SocketData {
     }
 
     pub fn into_response_bytes_iter(self) -> impl Iterator<Item = u8> {
-        self.header
-            .into_response_bytes_iter()
-            .chain(self.data.into_iter())
+        self.header.into_response_bytes_iter().chain(self.data)
     }
 }
 

common/socks5/requests/src/request.rs

@@ -113,7 +113,7 @@ impl Serializable for Socks5Request {
     fn into_bytes(self) -> Vec<u8> {
         if let Some(version) = self.protocol_version.as_u8() {
             std::iter::once(version)
-                .chain(self.content.into_bytes().into_iter())
+                .chain(self.content.into_bytes())
                 .collect()
         } else {
             std::iter::once(Self::LEGACY_TYPE_TAG)
@@ -335,12 +335,12 @@ impl Socks5RequestContent {
                 let remote_address_bytes_len = remote_address_bytes.len() as u16;
 
                 let iter = std::iter::once(RequestFlag::Connect as u8)
-                    .chain(req.conn_id.to_be_bytes().into_iter())
-                    .chain(remote_address_bytes_len.to_be_bytes().into_iter())
-                    .chain(remote_address_bytes.into_iter());
+                    .chain(req.conn_id.to_be_bytes())
+                    .chain(remote_address_bytes_len.to_be_bytes())
+                    .chain(remote_address_bytes);
 
                 if let Some(return_address) = req.return_address {
-                    iter.chain(return_address.to_bytes().into_iter()).collect()
+                    iter.chain(return_address.to_bytes()).collect()
                 } else {
                     iter.collect()
                 }
@@ -358,7 +358,7 @@ impl Socks5RequestContent {
                     })
                     .unwrap_or_default();
                 std::iter::once(RequestFlag::Query as u8)
-                    .chain(query_bytes.into_iter())
+                    .chain(query_bytes)
                     .collect()
             }
         }
@@ -495,7 +495,7 @@ mod request_deserialization_tests {
             let request_bytes: Vec<_> = request_bytes_prefix
                 .iter()
                 .cloned()
-                .chain(recipient_bytes.into_iter())
+                .chain(recipient_bytes)
                 .collect();
             assert!(Socks5RequestContent::try_from_bytes(&request_bytes)
                 .unwrap_err()
@@ -530,10 +530,7 @@ mod request_deserialization_tests {
             let recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
             let recipient_bytes = recipient.to_bytes();
 
-            let request_bytes: Vec<_> = request_bytes
-                .into_iter()
-                .chain(recipient_bytes.into_iter())
-                .collect();
+            let request_bytes: Vec<_> = request_bytes.into_iter().chain(recipient_bytes).collect();
 
             let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {
@@ -577,10 +574,7 @@ mod request_deserialization_tests {
             let recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
             let recipient_bytes = recipient.to_bytes();
 
-            let request_bytes: Vec<_> = request_bytes
-                .into_iter()
-                .chain(recipient_bytes.into_iter())
-                .collect();
+            let request_bytes: Vec<_> = request_bytes.into_iter().chain(recipient_bytes).collect();
 
             let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {

common/socks5/requests/src/response.rs

@@ -84,7 +84,7 @@ impl Serializable for Socks5Response {
     fn into_bytes(self) -> Vec<u8> {
         if let Some(version) = self.protocol_version.as_u8() {
             std::iter::once(version)
-                .chain(self.content.into_bytes().into_iter())
+                .chain(self.content.into_bytes())
                 .collect()
         } else {
             self.content.into_bytes()
@@ -192,7 +192,7 @@ impl Socks5ResponseContent {
             }
             Socks5ResponseContent::ConnectionError(res) => {
                 std::iter::once(ResponseFlag::ConnectionError as u8)
-                    .chain(res.into_bytes().into_iter())
+                    .chain(res.into_bytes())
                     .collect()
             }
             Socks5ResponseContent::Query(query) => {
@@ -204,7 +204,7 @@ impl Socks5ResponseContent {
                     })
                     .unwrap_or_default();
                 std::iter::once(ResponseFlag::Query as u8)
-                    .chain(query_bytes.into_iter())
+                    .chain(query_bytes)
                     .collect()
             }
         }
@@ -290,7 +290,7 @@ impl ConnectionError {
             .to_be_bytes()
             .iter()
             .copied()
-            .chain(self.network_requester_error.into_bytes().into_iter())
+            .chain(self.network_requester_error.into_bytes())
             .collect()
     }
 }
@@ -339,7 +339,7 @@ mod tests {
             let bytes: Vec<u8> = 42u64
                 .to_be_bytes()
                 .into_iter()
-                .chain([0, 159, 146, 150].into_iter())
+                .chain([0, 159, 146, 150])
                 .collect();
             let err = ConnectionError::try_from_bytes(&bytes).err().unwrap();
             assert!(matches!(

common/topology/src/lib.rs

@@ -131,7 +131,7 @@ impl NymTopology {
     }
 
     pub fn mixes_in_layer(&self, layer: MixLayer) -> Vec<mix::Node> {
-        assert!(vec![1, 2, 3].contains(&layer));
+        assert!([1, 2, 3].contains(&layer));
         self.mixes.get(&layer).unwrap().to_owned()
     }
 

common/types/Cargo.toml

@@ -17,7 +17,7 @@ serde_json = { workspace = true }
 strum = { version = "0.23", features = ["derive"] }
 thiserror = { workspace = true }
 url = { workspace = true }
-ts-rs = "6.1.2"
+ts-rs = { workspace = true }
 
 cosmwasm-std = { workspace = true }
 cosmrs = { workspace = true }

common/wasm-utils/src/storage/mod.rs

@@ -5,7 +5,6 @@ use crate::console_log;
 use crate::storage::cipher_export::StoredExportedStoreCipher;
 use crate::storage::error::StorageError;
 use futures::TryFutureExt;
-use indexed_db_futures::IdbDatabase;
 use nym_store_cipher::{
     Aes256Gcm, Algorithm, EncryptedData, KdfInfo, KeySizeUser, Params, StoreCipher, Unsigned,
     Version,