Merge #4500

4500: Update all protocol tests r=AurelienFT a=AurelienFT

While updating the tests I spot problems that I have fixed in this PR : 

- Multiple tests couldn't be launched at the same time because of the logs registry that was instantiates too much time
- Remove the gauge registry to protocol that was failing because all tests was runs in the same time
- Add an opti in block retrieval to exit early if nothing to do.
- Improve the utils available in the test universe
- Fix all the errors logs output


Co-authored-by: AurelienFT <[email protected]>

massa-channel/Cargo.toml

@@ -3,6 +3,9 @@ name = "massa_channel"
 version = "0.26.1"
 edition = "2021"
 
+[features]
+test-exports = []
+
 [dependencies]
 prometheus = {workspace = true}
 crossbeam = {workspace = true}   # BOM UPGRADE     Revert to "0.8.0" if problem

massa-channel/src/lib.rs

@@ -18,7 +18,6 @@ use std::sync::Arc;
 
 use receiver::MassaReceiver;
 use sender::MassaSender;
-use tracing::debug;
 
 pub mod receiver;
 pub mod sender;
@@ -54,12 +53,17 @@ impl MassaChannel {
 
         // Register metrics in prometheus
         // error here if metrics already registered (ex : ProtocolController>::get_stats )
-        if let Err(e) = prometheus::register(Box::new(actual_len.clone())) {
-            debug!("Failed to register actual_len gauge for {} : {}", name, e);
-        }
 
-        if let Err(e) = prometheus::register(Box::new(received.clone())) {
-            debug!("Failed to register received counter for {} : {}", name, e);
+        #[cfg(not(feature = "test-exports"))]
+        {
+            use tracing::debug;
+            if let Err(e) = prometheus::register(Box::new(actual_len.clone())) {
+                debug!("Failed to register actual_len gauge for {} : {}", name, e);
+            }
+
+            if let Err(e) = prometheus::register(Box::new(received.clone())) {
+                debug!("Failed to register received counter for {} : {}", name, e);
+            }
         }
 
         let sender = MassaSender {

massa-models/src/block_header.rs

@@ -83,9 +83,6 @@ impl BlockHeader {
         // assert that the endorsement indexes are all unique...
         let mut set = HashSet::new();
         for endo in self.endorsements.iter() {
-            // ...and check signatures + invariants while at it
-            endo.check_invariants()?;
-
             if !set.insert(endo.content.index) {
                 return Err("Endorsement duplicate index found".into());
             }

massa-node/src/survey.rs

@@ -47,7 +47,7 @@ impl MassaSurvey {
         config: (u8, MassaTime, MassaTime, u64, u64),
     ) -> MassaSurveyStopper {
         if massa_metrics.is_enabled() {
-            #[cfg(not(feature = "sandbox"))]
+            #[cfg(all(not(feature = "sandbox"), not(test)))]
             {
                 let mut data_sent = 0;
                 let mut data_received = 0;
@@ -141,7 +141,7 @@ impl MassaSurvey {
                 }
             }
 
-            #[cfg(feature = "sandbox")]
+            #[cfg(any(feature = "sandbox", test))]
             {
                 MassaSurveyStopper {
                     handle: None,

massa-protocol-exports/src/test_exports/config.rs

@@ -14,7 +14,7 @@ impl Default for ProtocolConfig {
                 .expect("cannot create temp file")
                 .path()
                 .to_path_buf(),
-            ask_block_timeout: MassaTime::from_millis(500),
+            ask_block_timeout: MassaTime::from_millis(10000),
             max_blocks_kept_for_propagation: 300,
             max_block_propagation_time: MassaTime::from_millis(40000),
             block_propagation_tick: MassaTime::from_millis(1000),

massa-protocol-worker/Cargo.toml

@@ -42,4 +42,5 @@ massa_test_framework = {workspace = true}
 mockall = {workspace = true}
 mockall_wrap = {workspace = true}
 num = {workspace = true}
+massa_channel = {workspace = true, features = ["test-exports"]}
 peernet = {workspace = true, features = ["testing"]}

massa-protocol-worker/src/connectivity.rs

@@ -196,17 +196,17 @@ pub(crate) fn start_connectivity_thread(
                         protocol_channels.connectivity_thread.1.update_metrics();
                         match msg {
                             Ok(ConnectivityCommand::Stop) => {
-                                println!("Stopping protocol");
+                                debug!("Stopping protocol");
                                 drop(network_controller);
-                                println!("Stopped network controller");
+                                debug!("Stopped network controller");
                                 operation_handler.stop();
-                                println!("Stopped operation handler");
+                                debug!("Stopped operation handler");
                                 endorsement_handler.stop();
-                                println!("Stopped endorsement handler");
+                                debug!("Stopped endorsement handler");
                                 block_handler.stop();
-                                println!("Stopped block handler");
+                                debug!("Stopped block handler");
                                 peer_management_handler.stop();
-                                println!("Stopped peer handler");
+                                debug!("Stopped peer handler");
                                 break;
                             },
                             Ok(ConnectivityCommand::GetStats { responder }) => {

massa-protocol-worker/src/handlers/block_handler/retrieval.rs

@@ -931,7 +931,11 @@ impl RetrievalThread {
             .ok_or(TimeError::TimeOverflowError)
             .expect("could not compute next block retrieval timer tick");
 
-        // Get conencted peer list
+        if self.asked_blocks.is_empty() && self.block_wishlist.is_empty() {
+            return;
+        }
+
+        // Get connected peer list
         let connected_peers = self.active_connections.get_peer_ids_connected();
 
         // Update cache