From ebbdf144062b0b0dc21650f3cce1d001915e4c3d Mon Sep 17 00:00:00 2001
From: Youngjoon Lee <taxihighway@gmail.com>
Date: Mon, 21 Aug 2023 22:13:52 +0900
Subject: [PATCH] Pick ports more randomly for integration tests (#315)

---
 tests/src/lib.rs         | 19 +++++--------------
 tests/src/nodes/nomos.rs |  6 +++---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/tests/src/lib.rs b/tests/src/lib.rs
index bcd39159..e3096c0b 100644
--- a/tests/src/lib.rs
+++ b/tests/src/lib.rs
@@ -4,27 +4,18 @@ pub use nodes::NomosNode;
 // std
 use std::fmt::Debug;
 use std::net::TcpListener;
-use std::sync::Mutex;
 use std::time::Duration;
 
 //crates
 use fraction::Fraction;
-use once_cell::sync::Lazy;
-use rand::SeedableRng;
-use rand_xoshiro::Xoshiro256PlusPlus;
-
-static RNG: Lazy<Mutex<Xoshiro256PlusPlus>> =
-    Lazy::new(|| Mutex::new(Xoshiro256PlusPlus::seed_from_u64(42)));
-
-static NET_PORT: Mutex<u16> = Mutex::new(8000);
+use rand::{thread_rng, Rng};
 
 pub fn get_available_port() -> u16 {
-    let mut port = NET_PORT.lock().unwrap();
-    *port += 1;
-    while TcpListener::bind(("127.0.0.1", *port)).is_err() {
-        *port += 1;
+    let mut port: u16 = thread_rng().gen_range(8000..10000);
+    while TcpListener::bind(("127.0.0.1", port)).is_err() {
+        port += 1;
     }
-    *port
+    port
 }
 
 #[async_trait::async_trait]
diff --git a/tests/src/nodes/nomos.rs b/tests/src/nodes/nomos.rs
index 8009f521..284a3fe6 100644
--- a/tests/src/nodes/nomos.rs
+++ b/tests/src/nodes/nomos.rs
@@ -3,7 +3,7 @@ use std::net::SocketAddr;
 use std::process::{Child, Command, Stdio};
 use std::time::Duration;
 // internal
-use crate::{get_available_port, Node, SpawnConfig, RNG};
+use crate::{get_available_port, Node, SpawnConfig};
 use consensus_engine::overlay::{FlatOverlaySettings, RoundRobin};
 use consensus_engine::NodeId;
 use nomos_consensus::{CarnotInfo, CarnotSettings};
@@ -22,7 +22,7 @@ use waku_bindings::{Multiaddr, PeerId};
 // crates
 use fraction::Fraction;
 use once_cell::sync::Lazy;
-use rand::Rng;
+use rand::{thread_rng, Rng};
 use reqwest::Client;
 use tempfile::NamedTempFile;
 
@@ -174,7 +174,7 @@ impl Node for NomosNode {
             } => {
                 let mut ids = vec![[0; 32]; n_participants];
                 for id in &mut ids {
-                    RNG.lock().unwrap().fill(id);
+                    thread_rng().fill(id);
                 }
                 let mut configs = ids
                     .iter()