src/net: keep importing dependencies in order

src/net/acceptor.rs

@@ -1,17 +1,18 @@
-use log::*;
-use smol::{Async, Executor};
 use std::{
     net::{SocketAddr, TcpListener},
     sync::Arc,
 };
 
-use crate::error::{Error, Result};
-//use crate::net::error::{, Result};
+use log::*;
+use smol::{Async, Executor};
+
 use crate::{
-    net::{Channel, ChannelPtr},
     system::{StoppableTask, StoppableTaskPtr, Subscriber, SubscriberPtr, Subscription},
+    Error, Result,
 };
 
+use super::{Channel, ChannelPtr};
+
 /// Atomic pointer to Acceptor class.
 pub type AcceptorPtr = Arc<Acceptor>;
 

src/net/channel.rs

@@ -1,9 +1,4 @@
 use async_std::sync::Mutex;
-use futures::{
-    io::{ReadHalf, WriteHalf},
-    AsyncReadExt,
-};
-use serde_json::json;
 use std::{
     net::{SocketAddr, TcpStream},
     sync::{
@@ -12,16 +7,22 @@ use std::{
     },
 };
 
+use futures::{
+    io::{ReadHalf, WriteHalf},
+    AsyncReadExt,
+};
 use log::{debug, error, info};
+use serde_json::json;
 use smol::{Async, Executor};
 
 use crate::{
-    error::{Error, Result},
-    net::{
-        message,
-        message_subscriber::{MessageSubscription, MessageSubsystem},
-    },
     system::{StoppableTask, StoppableTaskPtr, Subscriber, SubscriberPtr, Subscription},
+    Error, Result,
+};
+
+use super::{
+    message,
+    message_subscriber::{MessageSubscription, MessageSubsystem},
 };
 
 /// Atomic pointer to async channel.

src/net/connector.rs

@@ -1,14 +1,14 @@
 use async_std::future::timeout;
-use smol::Async;
 use std::{
     net::{SocketAddr, TcpStream},
     time::Duration,
 };
 
-use crate::{
-    error::{Error, Result},
-    net::{Channel, ChannelPtr, SettingsPtr},
-};
+use smol::Async;
+
+use crate::{Error, Result};
+
+use super::{Channel, ChannelPtr, SettingsPtr};
 
 /// Create outbound socket connections.
 pub struct Connector {

src/net/message.rs

@@ -1,6 +1,7 @@
+use std::{io, net::SocketAddr};
+
 use futures::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use log::debug;
-use std::{io, net::SocketAddr};
 
 use crate::{
     util::serial::{Decodable, Encodable, VarInt},

src/net/message_subscriber.rs

@@ -7,11 +7,12 @@ use log::{debug, error, warn};
 use rand::Rng;
 
 use crate::{
-    net::message::Message,
     util::serial::{Decodable, Encodable},
     Error, Result,
 };
 
+use super::message::Message;
+
 /// 64bit identifier for message subscription.
 pub type MessageSubscriptionId = u64;
 type MessageResult<M> = Result<Arc<M>>;

src/net/p2p.rs

@@ -7,14 +7,15 @@ use log::debug;
 use serde_json::json;
 
 use crate::{
-    error::{Error, Result},
-    net::{
-        message::Message,
-        protocol::{register_default_protocols, ProtocolRegistry},
-        session::{InboundSession, ManualSession, OutboundSession, SeedSession, Session},
-        Channel, ChannelPtr, Hosts, HostsPtr, Settings, SettingsPtr,
-    },
     system::{Subscriber, SubscriberPtr, Subscription},
+    Error, Result,
+};
+
+use super::{
+    message::Message,
+    protocol::{register_default_protocols, ProtocolRegistry},
+    session::{InboundSession, ManualSession, OutboundSession, SeedSession, Session},
+    Channel, ChannelPtr, Hosts, HostsPtr, Settings, SettingsPtr,
 };
 
 /// List of channels that are awaiting connection.

src/net/protocol/mod.rs

@@ -58,7 +58,7 @@ pub use protocol_version::ProtocolVersion;
 pub use protocol_base::{ProtocolBase, ProtocolBasePtr};
 pub use protocol_registry::ProtocolRegistry;
 
-use crate::net::{
+use super::{
     session::{SESSION_ALL, SESSION_SEED},
     P2pPtr,
 };

src/net/protocol/protocol_address.rs

@@ -5,13 +5,13 @@ use log::debug;
 use smol::Executor;
 
 use crate::{
-    error::Result,
     net::{
         message,
         message_subscriber::MessageSubscription,
         protocol::{ProtocolBase, ProtocolBasePtr, ProtocolJobsManager, ProtocolJobsManagerPtr},
         ChannelPtr, HostsPtr, P2pPtr,
     },
+    Result,
 };
 
 /// Defines address and get-address messages.