fix(p2p): fix clippy warnings

Author: vlad9486

p2p/src/network/noise/p2p_network_noise_effects.rs

@@ -58,7 +58,7 @@ impl P2pNetworkNoiseAction {
                 addr: *self.addr(),
                 error: error.clone().into(),
             });
-            return
+            return;
         }
 
         let middle_initiator =

p2p/src/network/noise/p2p_network_noise_reducer.rs

@@ -5,7 +5,7 @@ use self::p2p_network_noise_state::ResponderConsumeOutput;
 use super::*;
 
 use super::p2p_network_noise_state::{
-    NoiseError, NoiseState, P2pNetworkNoiseState, P2pNetworkNoiseStateInitiator,
+    InitiatorOutput, NoiseError, NoiseState, P2pNetworkNoiseState, P2pNetworkNoiseStateInitiator,
     P2pNetworkNoiseStateInner, P2pNetworkNoiseStateResponder, ResponderOutput,
 };
 
@@ -70,8 +70,7 @@ impl P2pNetworkNoiseState {
                     let buf = &self.buffer[offset..];
                     let len = buf
                         .get(..2)
-                        .map(|buf| Some(u16::from_be_bytes(buf.try_into().ok()?)))
-                        .flatten();
+                        .and_then(|buf| Some(u16::from_be_bytes(buf.try_into().ok()?)));
 
                     if let Some(len) = len {
                         let full_len = 2 + len as usize;
@@ -224,7 +223,14 @@ impl P2pNetworkNoiseState {
                     }
                     P2pNetworkNoiseStateInner::Initiator(i) => {
                         match (i.generate(data), i.remote_pk.clone()) {
-                            (Ok(Some((chunk, (send_key, recv_key)))), Some(remote_pk)) => {
+                            (
+                                Ok(Some(InitiatorOutput {
+                                    send_key,
+                                    recv_key,
+                                    chunk,
+                                })),
+                                Some(remote_pk),
+                            ) => {
                                 self.outgoing_chunks.push_back(vec![chunk.into()]);
                                 let remote_peer_id = remote_pk.peer_id();
 

p2p/src/network/noise/p2p_network_noise_state.rs

@@ -207,8 +207,14 @@ pub struct ResponderOutput {
     pub remote_pk: PublicKey,
 }
 
+pub struct InitiatorOutput {
+    pub send_key: DataSized<32>,
+    pub recv_key: DataSized<32>,
+    pub chunk: Vec<u8>,
+}
+
 impl P2pNetworkNoiseStateInitiator {
-    pub fn generate(&mut self, data: &[u8]) -> Result<Option<(Vec<u8>, (DataSized<32>, DataSized<32>))>, NoiseError> {
+    pub fn generate(&mut self, data: &[u8]) -> Result<Option<InitiatorOutput>, NoiseError> {
         let Self {
             i_spk,
             i_ssk,
@@ -218,9 +224,9 @@ impl P2pNetworkNoiseStateInitiator {
             ..
         } = self;
 
-        let r_epk = match r_epk.as_ref(){
+        let r_epk = match r_epk.as_ref() {
             Some(r_epk) => r_epk,
-            None => return Ok(None)
+            None => return Ok(None),
         };
 
         let mut i_spk_bytes = i_spk.0.to_bytes();
@@ -243,7 +249,13 @@ impl P2pNetworkNoiseStateInitiator {
         let l = (chunk.len() - 2) as u16;
         chunk[..2].clone_from_slice(&l.to_be_bytes());
 
-        Ok(Some((chunk, noise.finish())))
+        let (send_key, recv_key) = noise.finish();
+
+        Ok(Some(InitiatorOutput {
+            send_key,
+            recv_key,
+            chunk,
+        }))
     }
 
     pub fn consume<'a>(

p2p/src/network/pubsub/p2p_network_pubsub_effects.rs

@@ -141,6 +141,7 @@ impl P2pNetworkPubsubAction {
                     {
                         message.key = None;
                         let mut data = vec![];
+                        #[allow(clippy::if_same_then_else)]
                         if prost::Message::encode(&message, &mut data).is_err() {
                             continue;
                         } else if !store