reduce scope

Author: alexpyattaev

net-utils/src/lib.rs

@@ -318,10 +318,6 @@ pub fn bind_common_in_range_with_config(
     range: PortRange,
     config: SocketConfig,
 ) -> io::Result<(u16, (UdpSocket, TcpListener))> {
-    assert!(
-        !config.reuseport,
-        "SO_REUSEPORT will allow this function to accidentally bind to occupied ports"
-    );
     for port in range.0..range.1 {
         if let Ok((sock, listener)) = bind_common_with_config(ip_addr, port, config) {
             return Result::Ok((sock.local_addr().unwrap().port(), (sock, listener)));
@@ -356,11 +352,8 @@ pub fn bind_in_range_with_config(
     range: PortRange,
     config: SocketConfig,
 ) -> io::Result<(u16, UdpSocket)> {
-    assert!(
-        !config.reuseport,
-        "SO_REUSEPORT will allow this function to accidentally bind to occupied ports"
-    );
     let sock = udp_socket_with_config(config)?;
+
     for port in range.0..range.1 {
         let addr = SocketAddr::new(ip_addr, port);
 

test-validator/src/lib.rs

@@ -20,7 +20,7 @@ use {
         geyser_plugin_manager::GeyserPluginManager, GeyserPluginManagerRequest,
     },
     solana_gossip::{
-        cluster_info::{ClusterInfo, Node, NodeConfig},
+        cluster_info::{ClusterInfo, Node},
         contact_info::Protocol,
         gossip_service::discover_cluster,
         socketaddr,
@@ -29,7 +29,7 @@ use {
         blockstore::create_new_ledger, blockstore_options::LedgerColumnOptions,
         create_new_tmp_ledger,
     },
-    solana_net_utils::{find_available_port_in_range, PortRange},
+    solana_net_utils::PortRange,
     solana_rpc::{rpc::JsonRpcConfig, rpc_pubsub_service::PubSubConfig},
     solana_rpc_client::{nonblocking, rpc_client::RpcClient},
     solana_rpc_client_api::request::MAX_MULTIPLE_ACCOUNTS,
@@ -63,7 +63,6 @@ use {
         fs::{self, remove_dir_all, File},
         io::Read,
         net::{IpAddr, Ipv4Addr, SocketAddr},
-        num::NonZero,
         path::{Path, PathBuf},
         str::FromStr,
         sync::{Arc, RwLock},
@@ -949,30 +948,17 @@ impl TestValidator {
                 .unwrap(),
         )?;
 
-        let node_config = NodeConfig {
-            gossip_addr: config.node_config.gossip_addr,
-            port_range: config.node_config.port_range,
-            bind_ip_addr: config.node_config.bind_ip_addr,
-            public_tpu_addr: None,
-            public_tpu_forwards_addr: None,
-            num_quic_endpoints: NonZero::new(1).unwrap(),
-            num_tvu_receive_sockets: NonZero::new(1).unwrap(),
-            num_tvu_retransmit_sockets: NonZero::new(1).unwrap(),
-        };
-
-        let port_range = node_config.port_range;
-        let mut node = Node::new_with_external_ip(&validator_identity.pubkey(), node_config);
-        let addr = node.info.gossip().unwrap().ip();
+        let mut node = Node::new_single_bind(
+            &validator_identity.pubkey(),
+            &config.node_config.gossip_addr,
+            config.node_config.port_range,
+            config.node_config.bind_ip_addr,
+        );
         if let Some((rpc, rpc_pubsub)) = config.rpc_ports {
+            let addr = node.info.gossip().unwrap().ip();
             node.info.set_rpc((addr, rpc)).unwrap();
             node.info.set_rpc_pubsub((addr, rpc_pubsub)).unwrap();
-        } else {
-            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();
         }
-
         let vote_account_address = validator_vote_account.pubkey();
         let rpc_url = format!("http://{}", node.info.rpc().unwrap());
         let rpc_pubsub_url = format!("ws://{}/", node.info.rpc_pubsub().unwrap());