Fix tests.

massa-network-exports/Cargo.toml

@@ -20,5 +20,9 @@ massa_time = { path = "../massa-time" }
 serde_json = "1.0"
 tempfile = "3.2"
 
+[dev-dependencies]
+massa_models = { path = "../massa-models", features = ["testing"] }
+
 [features]
 instrument = [ "massa_models/instrument", "massa_time/instrument"]
+testing = ["massa_models/testing"]

massa-network-exports/src/establisher.rs

@@ -1,43 +1,43 @@
 // Copyright (c) 2022 MASSA LABS <[email protected]>
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 use massa_time::MassaTime;
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 use std::{io, net::SocketAddr};
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 use tokio::{
     net::{TcpListener, TcpStream},
     time::timeout,
 };
 
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub type ReadHalf = super::test_exports::mock_establisher::ReadHalf;
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub type WriteHalf = super::test_exports::mock_establisher::WriteHalf;
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub type Listener = super::test_exports::mock_establisher::MockListener;
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub type Connector = super::test_exports::mock_establisher::MockConnector;
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub type Establisher = super::test_exports::mock_establisher::MockEstablisher;
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 pub type ReadHalf = tokio::net::tcp::OwnedReadHalf;
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 pub type WriteHalf = tokio::net::tcp::OwnedWriteHalf;
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 pub type Listener = DefaultListener;
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 pub type Connector = DefaultConnector;
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 pub type Establisher = DefaultEstablisher;
 
 /// The listener we are using
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 #[derive(Debug)]
 pub struct DefaultListener(TcpListener);
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 impl DefaultListener {
     /// Accepts a new incoming connection from this listener.
     pub async fn accept(&mut self) -> io::Result<(ReadHalf, WriteHalf, SocketAddr)> {
@@ -48,11 +48,11 @@ impl DefaultListener {
 }
 
 /// Initiates a connection with given timeout in millis
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 #[derive(Debug)]
 pub struct DefaultConnector(MassaTime);
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 impl DefaultConnector {
     /// Tries to connect to addr
     ///
@@ -71,11 +71,11 @@ impl DefaultConnector {
 }
 
 /// Establishes a connection
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 #[derive(Debug)]
 pub struct DefaultEstablisher;
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 impl DefaultEstablisher {
     /// Creates an Establisher.
     pub fn new() -> Self {
@@ -102,7 +102,7 @@ impl DefaultEstablisher {
     }
 }
 
-#[cfg(not(test))]
+#[cfg(not(feature = "testing"))]
 impl Default for DefaultEstablisher {
     fn default() -> Self {
         Self::new()

massa-network-exports/src/lib.rs

@@ -15,8 +15,5 @@ mod network_controller;
 mod peers;
 pub mod settings;
 
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub mod test_exports;
-
-#[cfg(test)]
-pub use settings::tests;

massa-network-exports/src/settings.rs

@@ -57,7 +57,7 @@ pub struct NetworkSettings {
     pub max_in_connection_overflow: usize,
 }
 
-#[cfg(test)]
+#[cfg(feature = "testing")]
 pub mod tests {
     use crate::{test_exports::tools::get_temp_private_key_file, NetworkSettings};
     use massa_models::constants::BASE_NETWORK_CONTROLLER_IP;

massa-network-exports/src/test_exports/mock_establisher.rs

@@ -116,6 +116,9 @@ pub struct MockEstablisher {
 }
 
 impl MockEstablisher {
+    pub fn new() -> Self {
+        unreachable!("place holder")
+    }
     pub async fn get_listener(&mut self, _addr: SocketAddr) -> io::Result<MockListener> {
         Ok(MockListener {
             connection_listener_rx: self

massa-network-worker/Cargo.toml

@@ -30,6 +30,7 @@ pretty_assertions = "1.0"
 serial_test = "0.5.1"
 tempfile = "3.2"
 massa_models = { path = "../massa-models", features = ["testing"] }
+massa_network_exports = { path = "../massa-network-exports", features = ["testing"] }
 
 [features]
 instrument = ["tokio/tracing", "massa_models/instrument", "massa_time/instrument", "massa_network_exports/instrument"]

massa-network-worker/src/tests/test_peer_info_database.rs

@@ -8,7 +8,7 @@ mod tests {
 
     use super::*;
     use massa_network_exports::{
-        tests, NetworkConnectionErrorType, NetworkError, NetworkSettings, PeerInfo,
+        NetworkConnectionErrorType, NetworkError, NetworkSettings, PeerInfo,
     };
     use serial_test::serial;
     use tokio::sync::watch;