Fix infinite tester con

massa-node/Cargo.toml

@@ -18,7 +18,7 @@ tracing = { version = "0.1", features = [
     "max_level_debug",
     "release_max_level_debug",
 ] }
-peernet = { git = "https://github.com/massalabs/PeerNet", rev = "cf4cb09deda8cdd9b8893cc9595ac3b255aa74c9" }
+peernet = { git = "https://github.com/massalabs/PeerNet", rev = "2338a3256655ece10ec5d11398c0bdb6b93b764c" }
 tracing-subscriber = "0.3"
 paw = "1.0"
 structopt = { version = "0.3", features = ["paw"] }

massa-node/base_config/config.toml

@@ -209,8 +209,10 @@
     max_endorsements_propagation_time = 48000
     # number of thread tester
     thread_tester_count = 5
+    # Nb max in connections that we accept
+    max_in_connections = 100
     # Peer default category limits
-    default_category_info = { target_out_connections = 10, max_in_connections_per_ip = 2, max_in_connections_pre_handshake = 100, max_in_connections_post_handshake = 15}
+    default_category_info = { target_out_connections = 10, max_in_connections_per_ip = 2, max_in_connections_pre_handshake = 70, max_in_connections_post_handshake = 15}
     # Peer categories limits
     [protocol.peers_categories]
     Bootstrap = { target_out_connections = 1, max_in_connections_per_ip = 1, max_in_connections_pre_handshake = 8, max_in_connections_post_handshake = 1}

massa-node/src/main.rs

@@ -520,6 +520,7 @@ async fn launch(
         read_write_limit_bytes_per_second: SETTINGS.protocol.read_write_limit_bytes_per_second
             as u128,
         try_connection_timer: SETTINGS.protocol.try_connection_timer,
+        max_in_connections: SETTINGS.protocol.max_in_connections,
         timeout_connection: SETTINGS.protocol.timeout_connection,
         routable_ip: SETTINGS
             .protocol

massa-node/src/settings.rs

@@ -231,6 +231,8 @@ pub struct ProtocolSettings {
     pub try_connection_timer: MassaTime,
     /// Timeout connection
     pub timeout_connection: MassaTime,
+    /// Nb in connections
+    pub max_in_connections: usize,
     /// Peers limits per category
     pub peers_categories: HashMap<String, PeerCategoryInfo>,
     /// Limits for default category

massa-protocol-exports/Cargo.toml

@@ -10,7 +10,7 @@ thiserror = "1.0"
 nom = "7.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-peernet = { git = "https://github.com/massalabs/PeerNet", rev = "cf4cb09deda8cdd9b8893cc9595ac3b255aa74c9" }
+peernet = { git = "https://github.com/massalabs/PeerNet", rev = "2338a3256655ece10ec5d11398c0bdb6b93b764c" }
 tempfile = { version = "3.3", optional = true } # use with testing feature
 mockall = "0.11.4"
 

massa-protocol-exports/src/settings.rs

@@ -142,6 +142,8 @@ pub struct ProtocolConfig {
     pub last_start_period: u64,
     /// try connection timer
     pub try_connection_timer: MassaTime,
+    /// Max in connections
+    pub max_in_connections: usize,
     /// Timeout connection
     pub timeout_connection: MassaTime,
     /// Number of bytes per second that can be read/write in a connection (should be a 10 multiplier)

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

@@ -76,6 +76,7 @@ impl Default for ProtocolConfig {
             timeout_connection: MassaTime::from_millis(1000),
             try_connection_timer: MassaTime::from_millis(5000),
             routable_ip: None,
+            max_in_connections: 10,
             debug: true,
             peers_categories: HashMap::default(),
             default_category_info: PeerCategoryInfo {

massa-protocol-worker/Cargo.toml

@@ -12,7 +12,7 @@ crossbeam = "0.8"
 serde_json = "1.0"
 nom = "7.1"
 num_enum = "0.5"
-peernet = { git = "https://github.com/massalabs/PeerNet", rev = "cf4cb09deda8cdd9b8893cc9595ac3b255aa74c9" }
+peernet = { git = "https://github.com/massalabs/PeerNet", rev = "2338a3256655ece10ec5d11398c0bdb6b93b764c" }
 tempfile = { version = "3.3", optional = true } # use with testing feature
 rayon = "1.7.0"
 lru = "0.10.0"

massa-protocol-worker/src/handlers/peer_handler/mod.rs

@@ -186,14 +186,14 @@ impl PeerManagementHandler {
                             match message {
                                 PeerManagementMessage::NewPeerConnected((peer_id, listeners)) => {
                                     debug!("Received peer message: NewPeerConnected from {}", peer_id);
-                                    if let Err(e) = test_sender.send((peer_id, listeners)) {
+                                    if let Err(e) = test_sender.try_send((peer_id, listeners)) {
                                         error!("error when sending msg to peer tester : {}", e);
                                     }
                                 }
                                 PeerManagementMessage::ListPeers(peers) => {
                                     debug!("Received peer message: List peers from {}", peer_id);
                                     for (peer_id, listeners) in peers.into_iter() {
-                                        if let Err(e) = test_sender.send((peer_id, listeners)) {
+                                        if let Err(e) = test_sender.try_send((peer_id, listeners)) {
                                             error!("error when sending msg to peer tester : {}", e);
                                         }
                                     }