A0-1576: Move clique network into network

finality-aleph/src/lib.rs

@@ -44,10 +44,8 @@ mod nodes;
 mod party;
 mod session;
 mod session_map;
-mod tcp_network;
 #[cfg(test)]
 pub mod testing;
-mod validator_network;
 
 pub use abft::{Keychain, NodeCount, NodeIndex, Recipient, SignatureSet, SpawnHandle};
 pub use aleph_primitives::{AuthorityId, AuthorityPair, AuthoritySignature};

finality-aleph/src/validator_network/incoming.rs → finality-aleph/src/network/clique/incoming.rs

@@ -3,9 +3,9 @@ use std::fmt::{Display, Error as FmtError, Formatter};
 use futures::channel::mpsc;
 use log::{debug, info};
 
-use crate::validator_network::{
+use crate::network::clique::{
     protocols::{protocol, ProtocolError, ProtocolNegotiationError, ResultForService},
-    Data, PublicKey, SecretKey, Splittable,
+    Data, PublicKey, SecretKey, Splittable, LOG_TARGET,
 };
 
 enum IncomingError<PK: PublicKey> {
@@ -41,9 +41,12 @@ async fn manage_incoming<SK: SecretKey, D: Data, S: Splittable>(
     result_for_parent: mpsc::UnboundedSender<ResultForService<SK::PublicKey, D>>,
     data_for_user: mpsc::UnboundedSender<D>,
 ) -> Result<(), IncomingError<SK::PublicKey>> {
-    debug!(target: "validator-network", "Performing incoming protocol negotiation.");
+    debug!(
+        target: LOG_TARGET,
+        "Performing incoming protocol negotiation."
+    );
     let (stream, protocol) = protocol(stream).await?;
-    debug!(target: "validator-network", "Negotiated protocol, running.");
+    debug!(target: LOG_TARGET, "Negotiated protocol, running.");
     Ok(protocol
         .manage_incoming(stream, secret_key, result_for_parent, data_for_user)
         .await?)
@@ -62,6 +65,9 @@ pub async fn incoming<SK: SecretKey, D: Data, S: Splittable>(
 ) {
     let addr = stream.peer_address_info();
     if let Err(e) = manage_incoming(secret_key, stream, result_for_parent, data_for_user).await {
-        info!(target: "validator-network", "Incoming connection from {} failed: {}.", addr, e);
+        info!(
+            target: LOG_TARGET,
+            "Incoming connection from {} failed: {}.", addr, e
+        );
     }
 }

finality-aleph/src/validator_network/io.rs → finality-aleph/src/network/clique/io.rs

@@ -6,7 +6,7 @@ use std::{
 use codec::DecodeAll;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
-use crate::validator_network::Data;
+use crate::network::Data;
 
 // We allow sending up to 16MiB, that should be enough forever.
 pub const MAX_DATA_SIZE: u32 = 16 * 1024 * 1024;

finality-aleph/src/validator_network/manager/direction.rs → finality-aleph/src/network/clique/manager/direction.rs

@@ -3,7 +3,7 @@ use std::{
     ops::BitXor,
 };
 
-use crate::validator_network::{Data, PublicKey};
+use crate::network::{clique::PublicKey, Data};
 
 /// Data about peers we know and whether we should connect to them or they to us. For the former
 /// case also keeps the peers' addresses.
@@ -85,7 +85,7 @@ impl<PK: PublicKey, A: Data> DirectedPeers<PK, A> {
 #[cfg(test)]
 mod tests {
     use super::DirectedPeers;
-    use crate::validator_network::mock::{key, MockPublicKey};
+    use crate::network::clique::mock::{key, MockPublicKey};
 
     type Address = String;
 

finality-aleph/src/validator_network/manager/legacy.rs → finality-aleph/src/network/clique/manager/legacy.rs

@@ -5,12 +5,12 @@ use std::{
 
 use futures::channel::mpsc;
 
-use crate::{
-    network::PeerId,
-    validator_network::{
+use crate::network::{
+    clique::{
         manager::{AddResult, SendError},
-        Data, PublicKey,
+        PublicKey,
     },
+    Data, PeerId,
 };
 
 /// Network component responsible for holding the list of peers that we
@@ -218,7 +218,7 @@ mod tests {
     use futures::{channel::mpsc, StreamExt};
 
     use super::{AddResult::*, Manager, SendError};
-    use crate::validator_network::mock::{key, MockPublicKey};
+    use crate::network::clique::mock::{key, MockPublicKey};
 
     type Data = String;
     type Address = String;

finality-aleph/src/validator_network/manager/mod.rs → finality-aleph/src/network/clique/manager/mod.rs

@@ -5,10 +5,7 @@ use std::{
 
 use futures::channel::mpsc;
 
-use crate::{
-    network::PeerId,
-    validator_network::{Data, PublicKey},
-};
+use crate::network::{clique::PublicKey, Data, PeerId};
 
 mod direction;
 mod legacy;
@@ -242,7 +239,7 @@ mod tests {
     use futures::{channel::mpsc, StreamExt};
 
     use super::{AddResult::*, Manager, SendError};
-    use crate::validator_network::mock::{key, MockPublicKey};
+    use crate::network::clique::mock::{key, MockPublicKey};
 
     type Data = String;
     type Address = String;