Merge branch 'fix-connection-memory-limits' of github.com:jxs/rust-libp2p into fix-connection-memory-limits

Author: jxs

misc/memory-connection-limits/src/lib.rs

@@ -115,7 +115,7 @@ impl Behaviour {
     fn check_limit(&mut self) -> Result<(), ConnectionDenied> {
         self.refresh_memory_stats_if_needed();
 
-        if self.process_physical_memory_bytes >= self.max_allowed_bytes {
+        if self.process_physical_memory_bytes > self.max_allowed_bytes {
             return Err(ConnectionDenied::new(MemoryUsageLimitExceeded {
                 process_physical_memory_bytes: self.process_physical_memory_bytes,
                 max_allowed_bytes: self.max_allowed_bytes,

misc/memory-connection-limits/tests/max_bytes.rs

@@ -31,6 +31,9 @@ use util::*;
 
 #[tokio::test]
 async fn max_bytes() {
+    // These tests use connections as unit to test the memory limit.
+    // Each connection consumes approximately 1MB of memory, so we give
+    // one connection as buffer for test stability (CONNECTION_LIMIT - 1) on line 35.
     const CONNECTION_LIMIT: usize = 20;
     let max_allowed_bytes = (CONNECTION_LIMIT - 1) * 1024 * 1024;
 

misc/memory-connection-limits/tests/max_percentage.rs

@@ -59,6 +59,9 @@ async fn max_percentage() {
 
     // Adds current mem usage to the limit and update
     let current_mem = memory_stats::memory_stats().unwrap().physical_mem;
+    // These tests use connections as unit to test the memory limit.
+    // Each connection consumes approximately 1MB of memory, so we give
+    // one connection as buffer for test stability (CONNECTION_LIMIT - 1) on line 35.
     let max_allowed_bytes = current_mem + (CONNECTION_LIMIT - 1) * 1024 * 1024;
     network.behaviour_mut().connection_limits = Behaviour::with_max_percentage(
         max_allowed_bytes as f64 / system_info.total_memory() as f64,