Cleanup

finality-aleph/src/network/clique/mock.rs

@@ -8,15 +8,16 @@ use std::{
 
 use codec::{Decode, Encode};
 use futures::{
-    channel::{mpsc, oneshot},
-    StreamExt,
+    channel::{mpsc, mpsc::UnboundedReceiver, oneshot},
+    Future, StreamExt,
 };
 use log::info;
 use rand::Rng;
 use tokio::io::{duplex, AsyncRead, AsyncWrite, DuplexStream, ReadBuf};
 
 use crate::network::{
     clique::{
+        protocols::{ProtocolError, ResultForService},
         ConnectionInfo, Dialer, Listener, Network, PeerAddressInfo, PublicKey, SecretKey,
         Splittable, LOG_TARGET,
     },
@@ -541,3 +542,16 @@ impl UnreliableConnectionMaker {
         }
     }
 }
+
+pub struct MockPrelims<D> {
+    pub id_incoming: MockPublicKey,
+    pub pen_incoming: MockSecretKey,
+    pub id_outgoing: MockPublicKey,
+    pub pen_outgoing: MockSecretKey,
+    pub incoming_handle: Pin<Box<dyn Future<Output = Result<(), ProtocolError<MockPublicKey>>>>>,
+    pub outgoing_handle: Pin<Box<dyn Future<Output = Result<(), ProtocolError<MockPublicKey>>>>>,
+    pub data_from_incoming: UnboundedReceiver<D>,
+    pub data_from_outgoing: Option<UnboundedReceiver<D>>,
+    pub result_from_incoming: UnboundedReceiver<ResultForService<MockPublicKey, D>>,
+    pub result_from_outgoing: UnboundedReceiver<ResultForService<MockPublicKey, D>>,
+}

finality-aleph/src/network/clique/protocols/v0/mod.rs

@@ -129,8 +129,8 @@ mod tests {
 
     use super::{incoming, outgoing, ProtocolError};
     use crate::network::clique::{
-        mock::{key, MockPublicKey, MockSecretKey, MockSplittable},
-        protocols::{ConnectionType, ResultForService},
+        mock::{key, MockPrelims, MockSplittable},
+        protocols::ConnectionType,
         Data,
     };
 

finality-aleph/src/network/clique/protocols/v1/mod.rs

@@ -149,8 +149,8 @@ mod tests {
 
     use super::{incoming, outgoing, ProtocolError};
     use crate::network::clique::{
-        mock::{key, MockPublicKey, MockSecretKey, MockSplittable},
-        protocols::{ConnectionType, ResultForService},
+        mock::{key, MockPrelims, MockSplittable},
+        protocols::ConnectionType,
         Data,
     };