Răsfoiți Sursa

clean up & remove warning messages

ghassmo 4 ani în urmă
părinte
comite
aad2caa3df

+ 1 - 5
bin/dao-cli/src/main.rs

@@ -1,6 +1,3 @@
-use async_executor::Executor;
-use std::sync::Arc;
-
 use clap::{IntoApp, Parser, Subcommand};
 use log::{debug, error};
 use serde_json::{json, Value};
@@ -8,7 +5,6 @@ use url::Url;
 
 use darkfi::{
     rpc::{jsonrpc, jsonrpc::JsonResult},
-    util::{async_util, cli::Config},
     Error, Result,
 };
 
@@ -89,7 +85,7 @@ async fn start(options: CliDao) -> Result<()> {
 #[async_std::main]
 async fn main() -> Result<()> {
     let args = CliDao::parse();
-    let matches = CliDao::into_app().get_matches();
+    let _matches = CliDao::into_app().get_matches();
 
     //let config_path = if args.config.is_some() {
     //    expand_path(&args.config.clone().unwrap())?

+ 8 - 8
src/net/channel.rs

@@ -3,22 +3,22 @@ use futures::{
     io::{ReadHalf, WriteHalf},
     AsyncReadExt,
 };
+use std::{
+    net::{SocketAddr, TcpStream},
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+};
+
 use log::*;
 use smol::{Async, Executor};
 
-use std::net::{SocketAddr, TcpStream};
-
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    Arc,
-};
-
 use crate::{
     error::{Error, Result},
     net::{
         message,
         message_subscriber::{MessageSubscription, MessageSubsystem},
-        protocol::{ProtocolBase, ProtocolBasePtr},
     },
     system::{StoppableTask, StoppableTaskPtr, Subscriber, SubscriberPtr, Subscription},
 };

+ 3 - 2
src/net/protocol/protocol_address.rs

@@ -1,7 +1,8 @@
+use std::sync::Arc;
+
 use async_trait::async_trait;
-use log::{debug, error};
+use log::debug;
 use smol::Executor;
-use std::sync::Arc;
 
 use crate::{
     error::Result,

+ 3 - 3
src/net/session/inbound_session.rs

@@ -1,14 +1,14 @@
-use async_executor::Executor;
-use log::*;
 use std::{
     net::SocketAddr,
     sync::{Arc, Weak},
 };
 
+use async_executor::Executor;
+use log::*;
+
 use crate::{
     error::{Error, Result},
     net::{
-        protocol::{ProtocolAddress, ProtocolBase, ProtocolPing},
         session::{Session, SessionBitflag, SESSION_INBOUND},
         Acceptor, AcceptorPtr, ChannelPtr, P2p,
     },

+ 4 - 4
src/net/session/manual_session.rs

@@ -1,17 +1,17 @@
-use async_executor::Executor;
 use async_std::sync::Mutex;
-use log::*;
 use std::{
     net::SocketAddr,
     sync::{Arc, Weak},
 };
 
+use async_executor::Executor;
+use log::*;
+
 use crate::{
     error::{Error, Result},
     net::{
-        protocol::{ProtocolAddress, ProtocolBase, ProtocolPing},
         session::{Session, SessionBitflag, SESSION_MANUAL},
-        ChannelPtr, Connector, P2p,
+        Connector, P2p,
     },
     system::{StoppableTask, StoppableTaskPtr},
     util::sleep,

+ 1 - 2
src/net/session/outbound_session.rs

@@ -9,9 +9,8 @@ use std::{
 use crate::{
     error::{Error, Result},
     net::{
-        protocol::{ProtocolAddress, ProtocolBase, ProtocolPing},
         session::{Session, SessionBitflag, SESSION_OUTBOUND},
-        ChannelPtr, Connector, P2p,
+        Connector, P2p,
     },
     system::{StoppableTask, StoppableTaskPtr},
 };

+ 5 - 5
src/net/session/seed_session.rs

@@ -1,18 +1,18 @@
-use async_executor::Executor;
 use async_std::future::timeout;
-use log::*;
 use std::{
     net::SocketAddr,
     sync::{Arc, Weak},
     time::Duration,
 };
 
+use async_executor::Executor;
+use log::*;
+
 use crate::{
     error::{Error, Result},
     net::{
-        protocol::{ProtocolBase, ProtocolPing, ProtocolSeed},
         session::{Session, SessionBitflag, SESSION_SEED},
-        ChannelPtr, Connector, HostsPtr, P2p, SettingsPtr,
+        Connector, P2p,
     },
 };
 
@@ -88,7 +88,7 @@ impl SeedSession {
         executor: Arc<Executor<'_>>,
     ) -> Result<()> {
         debug!(target: "net", "SeedSession::start_seed(i={}) [START]", seed_index);
-        let (hosts, settings) = {
+        let (_hosts, settings) = {
             let p2p = self.p2p.upgrade().unwrap();
             (p2p.hosts(), p2p.settings())
         };