code tidy

client-network/src/message_handling.rs

@@ -10,7 +10,6 @@ use crate::{
 };
 use std::{
     collections::HashMap,
-    default,
     net::{Ipv4Addr, SocketAddr},
 };
 use std::{
@@ -61,7 +60,6 @@ const ID: usize = 4;
 const TYPE: usize = 5;
 const LENGTH: usize = 7;
 const EXTENSIONS: usize = 4;
-const SIGNATURE: usize = 64;
 
 pub const PING: u8 = 0;
 const OK: u8 = 128;
@@ -101,7 +99,6 @@ pub fn handle_recevied_message(
         let length_bytes: [u8; 2] = recevied_message[TYPE..LENGTH]
             .try_into()
             .expect("Taille incorrecte");
-        let msg_length = u16::from_be_bytes(length_bytes) as usize;
         let ilength = u16::from_be_bytes(length_bytes);
         let received_name = &recevied_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
         let name = String::from_utf8(received_name.to_vec()).expect("wrong name");
@@ -126,12 +123,7 @@ pub fn handle_recevied_message(
         None => {}
         Some(resp_msg) => {
             println!("msg_sent:{:?}", resp_msg);
-            senders.send_dispatch(
-                resp_msg,
-                ip.to_string(),
-                is_resp_to_server_handshake,
-                messages_list.clone(),
-            );
+            senders.send_dispatch(resp_msg, ip.to_string(), is_resp_to_server_handshake);
         }
     }
 }
@@ -149,10 +141,6 @@ pub fn parse_message(
 ) -> Option<Vec<u8>> {
     let cmd_tx_clone = cmd_tx.clone();
 
-    let id_bytes: [u8; 4] = received_message[0..ID]
-        .try_into()
-        .expect("Taille incorrecte");
-
     let msgtype = received_message[ID];
 
     messages_received
@@ -269,7 +257,6 @@ pub fn parse_message(
                 natreq2.expect("couldnt construct message nattraversalrequest2"),
                 address,
                 false,
-                messages_list.clone(),
             );
         }
 
@@ -300,14 +287,12 @@ pub fn parse_message(
                 constructed_message.expect("couldnt construct message ping request"),
                 ip.to_string(),
                 false,
-                messages_list.clone(),
             );
 
             senders.send_dispatch(
                 pingreq.expect("couldnt construct message ping request"),
                 address.to_string(),
                 false,
-                messages_list.clone(),
             );
             constructed_message = None;
         }
@@ -408,11 +393,15 @@ pub fn parse_message(
                                         [LENGTH..(32 + LENGTH)]
                                         .try_into()
                                         .expect("incorrect size");
-                                    let res =
-                                        cmd_tx_clone.send(NetworkEvent::FileTreeRootReceived(
-                                            peerinfo.username.clone(),
-                                            received_hash,
-                                        ));
+                                    match cmd_tx_clone.send(NetworkEvent::FileTreeRootReceived(
+                                        peerinfo.username.clone(),
+                                        received_hash,
+                                    )) {
+                                        Ok(_) => {}
+                                        Err(e) => {
+                                            println!("Network Event Error : {}", e.to_string());
+                                        }
+                                    };
                                     println!("file tree sent");
                                     // envoyer un datum
                                     let mut payload = Vec::new();