From 0d39ea71c7477e6fe2e1b9331afe089f65f8fb3e Mon Sep 17 00:00:00 2001
From: "Federico Pasqua (eisterman)" <federico.pasqua.96@gmail.com>
Date: Fri, 23 Feb 2024 13:24:37 +0100
Subject: [PATCH] Remove some unused code and imports

---
 bonknet_broker/src/dataconnmanager.rs   |  8 ++------
 bonknet_broker/src/pendingdataconndb.rs |  4 ++--
 bonknet_broker/src/servermanager.rs     | 16 +++++-----------
 bonknet_server/src/bin/server.rs        |  2 --
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/bonknet_broker/src/dataconnmanager.rs b/bonknet_broker/src/dataconnmanager.rs
index 9c276e4..7737add 100644
--- a/bonknet_broker/src/dataconnmanager.rs
+++ b/bonknet_broker/src/dataconnmanager.rs
@@ -1,17 +1,13 @@
 use actix::prelude::*;
 use uuid::Uuid;
 use std::collections::HashMap;
-use std::io::Error;
-use actix_tls::accept::rustls_0_22::{TlsStream};
-use actix_rt::net::TcpStream;
 use futures::SinkExt;
 use thiserror::Error;
-use tracing::{info, error, warn, debug};
+use tracing::{info, error, warn};
 use libbonknet::ToPeerDataStream;
 use crate::TransportStream;
 
-type RawStream = TlsStream<TcpStream>;
-
+#[allow(dead_code)]
 #[derive(Error, Debug)]
 pub enum DataConnManagerError {
     #[error("Generic Failure")]
diff --git a/bonknet_broker/src/pendingdataconndb.rs b/bonknet_broker/src/pendingdataconndb.rs
index d4125eb..3ca2b62 100644
--- a/bonknet_broker/src/pendingdataconndb.rs
+++ b/bonknet_broker/src/pendingdataconndb.rs
@@ -160,8 +160,8 @@ impl Handler<TryStartDataStream> for PendingDataConnManager {
     fn handle(&mut self, msg: TryStartDataStream, _ctx: &mut Self::Context) -> Self::Result {
         use RegisterKind::*;
         let idx = match msg.kind {
-            Server => self.db.iter().enumerate().find(|(i, x)| x.server.conn_id == msg.conn_id),
-            Client => self.db.iter().enumerate().find(|(i, x)| x.client.conn_id == msg.conn_id),
+            Server => self.db.iter().enumerate().find(|(_i, x)| x.server.conn_id == msg.conn_id),
+            Client => self.db.iter().enumerate().find(|(_i, x)| x.client.conn_id == msg.conn_id),
         };
         if let Some((idx, record)) = idx {
             if record.client.transport.is_some() && record.server.transport.is_some() {
diff --git a/bonknet_broker/src/servermanager.rs b/bonknet_broker/src/servermanager.rs
index 5d4e39c..85ee1d5 100644
--- a/bonknet_broker/src/servermanager.rs
+++ b/bonknet_broker/src/servermanager.rs
@@ -15,12 +15,6 @@ use crate::{TransportStream, TransportStreamRx, TransportStreamTx};
 use uuid::Uuid;
 use crate::pendingdataconndb::*;
 
-#[derive(MessageResponse)]
-enum SendMsgResult {
-    Accepted,
-    Rejected,
-}
-
 #[derive(Error, Debug)]
 pub enum SendMsgError {
     #[error("Generic Failure")]
@@ -35,7 +29,7 @@ struct SendMsg {
 
 struct ServerTransporter {
     rx: Option<TransportStreamRx>,
-    tx: Arc<tokio::sync::Mutex<TransportStreamTx>>,
+    tx: Arc<Mutex<TransportStreamTx>>,
     timeout: Option<SpawnHandle>,
     reply_channels: HashMap<u64, oneshot::Sender<FromServerReplyBody>>,
 }
@@ -49,7 +43,7 @@ impl ServerTransporter {
         let tx = FramedWrite::new(stx, codec.clone());
         ServerTransporter {
             rx: Some(rx),
-            tx: Arc::new(tokio::sync::Mutex::new(tx)),
+            tx: Arc::new(Mutex::new(tx)),
             timeout: None,
             reply_channels: HashMap::new(),
         }
@@ -78,7 +72,7 @@ impl Actor for ServerTransporter {
             let arc_tx = Arc::clone(&s.tx);
             c.spawn(async move {
                 arc_tx.lock().await.send(payload).await
-            }.into_actor(s).map(|res, a, ctx| {
+            }.into_actor(s).map(|res, _a, ctx| {
                 match res {
                     Ok(_) => {
                         info!("Ping sent!");
@@ -115,7 +109,7 @@ impl Handler<SendMsg> for ServerTransporter {
         let payload: Bytes = rmp_serde::to_vec(&msg).unwrap().into();
         let arc_tx = self.tx.clone();
         Box::pin(async move {
-            arc_tx.lock().await.send(payload).await.map_err(|e| SendMsgError::GenericFailure)?;
+            arc_tx.lock().await.send(payload).await.map_err(|_e| SendMsgError::GenericFailure)?;
             info!("msg sent");
             let r = reply_channel_rx.await.unwrap();
             info!("reply received");
@@ -226,7 +220,7 @@ impl Handler<StartTransporter> for ServerManager {
     type Result = ResponseFuture<Result<(), ServerManagerError>>;
 
     fn handle(&mut self, msg: StartTransporter, _ctx: &mut Self::Context) -> Self::Result {
-        let mut entries = Arc::clone(&self.entries);
+        let entries = Arc::clone(&self.entries);
         Box::pin(async move {
             let mut entries_mg = entries.lock().await;
             if entries_mg.contains_key(&msg.name) {
diff --git a/bonknet_server/src/bin/server.rs b/bonknet_server/src/bin/server.rs
index 06fac18..5391bbd 100644
--- a/bonknet_server/src/bin/server.rs
+++ b/bonknet_server/src/bin/server.rs
@@ -5,12 +5,10 @@ use tokio::net::TcpStream;
 use tokio_rustls::rustls::{ClientConfig, RootCertStore};
 use tokio_rustls::rustls::pki_types::{ServerName, CertificateDer, PrivatePkcs8KeyDer};
 use tokio_rustls::TlsConnector;
-use tokio_util::bytes::BytesMut;
 use tokio_util::codec::{Framed, LengthDelimitedCodec};
 use libbonknet::*;
 use uuid::Uuid;
 use tracing::{info, error};
-use libbonknet::ToPeerDataStream::{OkDataStreamOpen, OkDataStreamRequestAccepted, Refused, Revoked};
 
 
 async fn datastream(tlsconfig: Arc<ClientConfig>, conn_id: Uuid) -> std::io::Result<()> {