remove deprecated UDP TPU socket bindings

Signed-off-by: AvhiMaz <[email protected]>

Author: AvhiMaz

gossip/src/cluster_info.rs

@@ -2371,8 +2371,6 @@ pub struct Sockets {
     pub ip_echo: Option<TcpListener>,
     pub tvu: Vec<UdpSocket>,
     pub tvu_quic: UdpSocket,
-    pub tpu: Vec<UdpSocket>,
-    pub tpu_forwards: Vec<UdpSocket>,
     pub tpu_vote: Vec<UdpSocket>,
     pub broadcast: Vec<UdpSocket>,
     // Socket sending out local repair requests,
@@ -2872,7 +2870,6 @@ mod tests {
         }
         check_sockets(&node.sockets.gossip, ip, range);
         check_sockets(&node.sockets.tvu, ip, range);
-        check_sockets(&node.sockets.tpu, ip, range);
     }
 
     #[test]
@@ -3777,7 +3774,7 @@ mod tests {
         agave_logger::setup();
         // If you change the format of cluster_info_trace or rpc_info_trace, please make sure
         // you read the actual output so the headers lign up with the output.
-        const CLUSTER_INFO_TRACE_LENGTH: usize = 452;
+        const CLUSTER_INFO_TRACE_LENGTH: usize = 461;
         const RPC_INFO_TRACE_LENGTH: usize = 335;
         let keypair43 = Arc::new(
             Keypair::try_from(

gossip/src/node.rs

@@ -132,12 +132,6 @@ impl Node {
             bind_in_range_with_config(bind_ip_addr, port_range, socket_config)
                 .expect("tvu_quic bind");
 
-        let (tpu_port, tpu_socket) =
-            bind_in_range_with_config(bind_ip_addr, port_range, socket_config)
-                .expect("tpu_socket primary bind");
-        let tpu_sockets =
-            bind_more_with_config(tpu_socket, 32, socket_config).expect("tpu_sockets multi_bind");
-
         let (tpu_port_quic, tpu_quic) =
             bind_in_range_with_config(bind_ip_addr, port_range, socket_config)
                 .expect("tpu_socket primary bind");
@@ -151,11 +145,6 @@ impl Node {
         );
         let tpu_quic_addresses = Self::get_socket_addrs(&tpu_quic);
 
-        let (tpu_forwards_port, tpu_forwards_socket) =
-            bind_in_range_with_config(bind_ip_addr, port_range, socket_config)
-                .expect("tpu_forwards primary bind");
-        let tpu_forwards_sockets = bind_more_with_config(tpu_forwards_socket, 8, socket_config)
-            .expect("tpu_forwards multi_bind");
         let (tpu_forwards_quic_port, tpu_forwards_quic) =
             bind_in_range_with_config(bind_ip_addr, port_range, socket_config)
                 .expect("tpu_forwards primary bind");
@@ -295,14 +284,11 @@ impl Node {
         )
         .unwrap();
         info.set_tvu(QUIC, (advertised_ip, tvu_quic_port)).unwrap();
-        info.set_tpu(UDP, (advertised_ip, tpu_port)).unwrap();
         info.set_tpu(
             QUIC,
             public_tpu_addr.unwrap_or_else(|| SocketAddr::new(advertised_ip, tpu_port_quic)),
         )
         .unwrap();
-        info.set_tpu_forwards(UDP, (advertised_ip, tpu_forwards_port))
-            .unwrap();
         info.set_tpu_forwards(
             QUIC,
             public_tpu_forwards_addr
@@ -342,8 +328,6 @@ impl Node {
             gossip: gossip_sockets.into_iter().collect(),
             tvu: tvu_sockets,
             tvu_quic,
-            tpu: tpu_sockets,
-            tpu_forwards: tpu_forwards_sockets,
             tpu_vote: tpu_vote_sockets,
             broadcast,
             repair,
@@ -531,10 +515,7 @@ pub use multihoming::*;
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::contact_info::Protocol::{QUIC, UDP},
-    };
+    use {super::*, crate::contact_info::Protocol::QUIC};
 
     /// Regression test for fix where tpu_forwards_quic was incorrectly
     /// using tpu_forwards_port (UDP) instead of tpu_forwards_quic_port (QUIC)
@@ -544,7 +525,6 @@ mod tests {
         let node = Node::new_localhost_with_pubkey(&pubkey);
 
         let tpu_forwards_quic = node.info.tpu_forwards(QUIC).unwrap();
-        let tpu_forwards_udp = node.info.tpu_forwards(UDP).unwrap();
 
         let actual_quic_port = node.sockets.tpu_forwards_quic[0]
             .local_addr()
@@ -556,11 +536,5 @@ mod tests {
             actual_quic_port,
             "TPU forwards QUIC advertised port should match actual bound QUIC socket"
         );
-
-        assert_ne!(
-            tpu_forwards_quic.port(),
-            tpu_forwards_udp.port(),
-            "TPU forwards QUIC and UDP should use different ports"
-        );
     }
 }