clippy

Author: mfahampshire

common/client-core/src/client/inbound_messages.rs

@@ -199,7 +199,7 @@ impl InputMessage {
         self.set_max_retransmissions(max_retransmissions);
         self
     }
-
+    #[allow(clippy::expect_used)]
     pub fn serialized_size(&self) -> u64 {
         bincode::serialized_size(self).expect("failed to get serialized InputMessage size")
             + LENGHT_ENCODING_PREFIX_SIZE as u64
@@ -226,6 +226,7 @@ impl Encoder<InputMessage> for InputMessageCodec {
     type Error = ClientCoreError;
 
     fn encode(&mut self, item: InputMessage, buf: &mut BytesMut) -> Result<(), Self::Error> {
+        #[allow(clippy::expect_used)]
         let encoded = bincode::serialize(&item).expect("failed to serialize InputMessage");
         let encoded_len = encoded.len() as u32;
         let mut encoded_with_len = encoded_len.to_le_bytes().to_vec();
@@ -244,7 +245,7 @@ impl Decoder for InputMessageCodec {
         if buf.len() < LENGHT_ENCODING_PREFIX_SIZE {
             return Ok(None);
         }
-
+        #[allow(clippy::expect_used)]
         let len = u32::from_le_bytes(
             buf[0..LENGHT_ENCODING_PREFIX_SIZE]
                 .try_into()

common/nym-connection-monitor/src/sync_self_ping.rs

@@ -3,7 +3,6 @@
 
 use std::time::Duration;
 
-use futures::StreamExt;
 use nym_sdk::mixnet::{MixnetClient, MixnetMessageSender, Recipient};
 use tracing::{debug, error};
 

mixtcp/examples/cloudflare_ping.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::result_large_err)]
 use mixtcp::{create_device, MixtcpError};
 use rustls::{pki_types::ServerName, ClientConfig, ClientConnection};
 use std::{
@@ -97,7 +98,7 @@ fn inspect_tls_packet(data: &[u8]) {
         return;
     }
     let content_type = data[0];
-    if content_type < 0x14 || content_type > 0x17 {
+    if !(0x14..=0x17).contains(&content_type) {
         return;
     }
     let version = u16::from_be_bytes([data[1], data[2]]);

mixtcp/examples/https_client.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::result_large_err)]
 use mixtcp::{create_device, MixtcpError, NymIprDevice};
 use nym_sdk::stream_wrapper::IpMixStream;
 use reqwest::StatusCode;

mixtcp/examples/tls.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::result_large_err)]
 use mixtcp::{create_device, MixtcpError};
 use rustls::{pki_types::ServerName, ClientConfig, ClientConnection};
 use std::{
@@ -97,7 +98,7 @@ fn inspect_tls_packet(data: &[u8]) {
         return;
     }
     let content_type = data[0];
-    if content_type < 0x14 || content_type > 0x17 {
+    if !(0x14..=0x17).contains(&content_type) {
         return;
     }
     let version = u16::from_be_bytes([data[1], data[2]]);
@@ -199,7 +200,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
         }
 
-        if start.elapsed().as_secs() % 5 == 0 && start.elapsed().as_millis() % 1000 < 100 {
+        if start.elapsed().as_secs().is_multiple_of(5) && start.elapsed().as_millis() % 1000 < 100 {
             info!(
                 "State: TCP={:?}, established={}, can_send={}, can_recv={}",
                 socket.state(),
@@ -224,7 +225,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             let _ = tls_conn.read_tls(socket);
             let _ = tls_conn.write_tls(socket);
 
-            if start.elapsed().as_secs() % 10 == 0 && start.elapsed().as_millis() % 1000 < 100 {
+            if start.elapsed().as_secs().is_multiple_of(10)
+                && start.elapsed().as_millis() % 1000 < 100
+            {
                 info!(
                     "TLS state: handshaking={}, wants_read={}, wants_write={}",
                     tls_conn.conn.is_handshaking(),

mixtcp/src/bridge.rs

@@ -98,7 +98,7 @@ impl NymIprBridge {
                             info!("Incoming packet: {} bytes", packet.len());
 
                             // Forward to device via channel
-                            if let Err(_) = self.rx_sender.send(packet.to_vec()) {
+                            if self.rx_sender.send(packet.to_vec()).is_err() {
                                 error!("Failed to send packet to device - receiver dropped");
                                 return Err(MixtcpError::ChannelClosed);
                             }

mixtcp/src/lib.rs

@@ -31,10 +31,9 @@ pub async fn create_device(
 
     // Get the allocated IPs before moving the stream - need these for proper packet creation
     // further 'up' the flow in the code calling this fn (see examples/tcp_connect.rs).
-    let allocated_ips = ipr_stream
+    let allocated_ips = *ipr_stream
         .allocated_ips()
-        .ok_or(MixtcpError::NotConnected)?
-        .clone();
+        .ok_or(MixtcpError::NotConnected)?;
 
     // Create channels for device <-> bridge communication
     let (tx_to_bridge, tx_from_device) = mpsc::unbounded_channel();

nym-gateway-directory/src/error.rs

@@ -105,6 +105,9 @@ pub enum Error {
 
     #[error("invalid score value: {0}. Valid values are: offline, low, medium, high")]
     InvalidScoreValue(String),
+
+    #[error("ips vec empty")]
+    NoIpsAvailable,
 }
 
 impl Error {

nym-gateway-directory/src/gateway_client.rs

@@ -166,6 +166,7 @@ impl GatewayClient {
             .map_err(Box::new)?;
 
         // Gets around diff version imports compiler issue for the moment
+        #[allow(clippy::expect_used)]
         let network_details_compat = {
             let json = serde_json::to_string(network_details)
                 .expect("Failed to serialize network details");
@@ -292,12 +293,13 @@ impl GatewayClient {
         debug!("found the following ips for {gateway_identity}: {ips:?}");
         if ips.len() == 1 {
             // SAFETY: the vector is not empty, so unwrap is fine
+            #[allow(clippy::unwrap_used)]
             Ok(ips.pop().unwrap())
         } else {
             // chose a random one if there's more than one
             // SAFETY: the vector is not empty, so unwrap is fine
             let mut rng = thread_rng();
-            let ip = ips.choose(&mut rng).unwrap();
+            let ip = ips.choose(&mut rng).ok_or_else(|| Error::NoIpsAvailable)?;
             Ok(*ip)
         }
     }

sdk/rust/nym-sdk/src/lib.rs

@@ -12,9 +12,6 @@ pub mod client_pool;
 pub mod ip_packet_client;
 pub mod mixnet;
 pub mod stream_wrapper;
-#[deprecated(
-    note = "Functionality from this module is mostly superceded by the stream_wrapper::MixSocket and stream_wrapper::MixStreamIPR exports. This module is no longer maintained and will be removed in a future release."
-)]
 pub mod tcp_proxy;
 
 pub use error::{Error, Result};