check that tests still pass

Author: alexpyattaev

gossip/src/cluster_info.rs

@@ -90,7 +90,7 @@ use {
         rc::Rc,
         result::Result,
         sync::{
-            atomic::{AtomicBool, Ordering},
+            atomic::{AtomicBool, AtomicU16, Ordering},
             Arc, Mutex, RwLock, RwLockReadGuard,
         },
         thread::{sleep, Builder, JoinHandle},
@@ -2405,29 +2405,51 @@ pub struct Node {
     pub sockets: Sockets,
 }
 
+const NODE_BASE_PORT: u16 = 40000;
 impl Node {
+    /// create localhost node for tests
     pub fn new_localhost() -> Self {
         let pubkey = solana_pubkey::new_rand();
         Self::new_localhost_with_pubkey(&pubkey)
     }
 
+    fn localhost_port_range_for_tests() -> (u16, u16) {
+        static SLICE: AtomicU16 = AtomicU16::new(NODE_BASE_PORT);
+        let start = match std::env::var("NEXTEST_TEST_GLOBAL_SLOT") {
+            Ok(slot) => {
+                let slot: u16 = slot.parse().unwrap();
+                NODE_BASE_PORT + slot * 25
+            }
+            Err(_) => SLICE.fetch_add(100, Ordering::Relaxed),
+        };
+        assert!(start < 65500, "ran out of port numbers!");
+        (start, start + 25)
+    }
+
+    /// create localhost node for tests with provided pubkey
+    /// unlike the public IP version, this will also bind RPC sockets.
     pub fn new_localhost_with_pubkey(pubkey: &Pubkey) -> Self {
-        let localhost_ip_addr = IpAddr::V4(Ipv4Addr::LOCALHOST);
-        let port_range = (1024, 65535);
-        let gossip_port = find_available_port_in_range(localhost_ip_addr, port_range)
+        let addr = IpAddr::V4(Ipv4Addr::LOCALHOST);
+        let port_range = Self::localhost_port_range_for_tests();
+        let gossip_port = find_available_port_in_range(addr, port_range)
             .expect("At least one open port should be available");
         let config = NodeConfig {
-            gossip_addr: SocketAddr::new(localhost_ip_addr, gossip_port),
+            gossip_addr: SocketAddr::new(addr, gossip_port),
             port_range,
-            bind_ip_addr: localhost_ip_addr,
+            bind_ip_addr: addr,
             public_tpu_addr: None,
             public_tpu_forwards_addr: None,
             num_tvu_receive_sockets: NonZero::new(1).unwrap(),
             num_tvu_retransmit_sockets: NonZero::new(1).unwrap(),
             num_quic_endpoints: NonZero::new(DEFAULT_QUIC_ENDPOINTS)
                 .expect("Number of QUIC endpoints can not be zero"),
         };
-        Self::new_with_external_ip(pubkey, config)
+        let mut node = Self::new_with_external_ip(pubkey, config);
+        let rpc_port = find_available_port_in_range(addr, port_range).unwrap();
+        let rpc_pubsub_port = find_available_port_in_range(addr, port_range).unwrap();
+        node.info.set_rpc((addr, rpc_port)).unwrap();
+        node.info.set_rpc_pubsub((addr, rpc_pubsub_port)).unwrap();
+        node
     }
 
     fn get_gossip_port(

net-utils/src/lib.rs

@@ -1,6 +1,7 @@
 //! The `net_utils` module assists with networking
 mod ip_echo_client;
 mod ip_echo_server;
+pub mod sockets;
 
 #[cfg(feature = "dev-context-only-utils")]
 pub mod tooling_for_tests;