diff --git a/src/rpu.rs b/src/rpu.rs index df7adca90c..329789a991 100644 --- a/src/rpu.rs +++ b/src/rpu.rs @@ -60,7 +60,7 @@ impl Rpu { exit.clone(), packet_recycler.clone(), packet_sender, - )?; + ); let sig_verify_stage = SigVerifyStage::new(exit.clone(), packet_receiver); diff --git a/src/streamer.rs b/src/streamer.rs index 7e08d16ce8..4047cf3fb6 100644 --- a/src/streamer.rs +++ b/src/streamer.rs @@ -51,12 +51,12 @@ pub fn receiver( sock: UdpSocket, exit: Arc, recycler: PacketRecycler, - channel: PacketSender, -) -> Result> { - Ok(spawn(move || { - let _ = recv_loop(&sock, &exit, &recycler, &channel); + packet_sender: PacketSender, +) -> JoinHandle<()> { + spawn(move || { + let _ = recv_loop(&sock, &exit, &recycler, &packet_sender); () - })) + }) } fn recv_send(sock: &UdpSocket, recycler: &BlobRecycler, r: &BlobReceiver) -> Result<()> { @@ -591,13 +591,15 @@ mod test { #[test] pub fn streamer_send_test() { let read = UdpSocket::bind("127.0.0.1:0").expect("bind"); + read.set_read_timeout(Some(Duration::new(1, 0))).unwrap(); + let addr = read.local_addr().unwrap(); let send = UdpSocket::bind("127.0.0.1:0").expect("bind"); let exit = Arc::new(AtomicBool::new(false)); let pack_recycler = PacketRecycler::default(); let resp_recycler = BlobRecycler::default(); let (s_reader, r_reader) = channel(); - let t_receiver = receiver(read, exit.clone(), pack_recycler.clone(), s_reader).unwrap(); + let t_receiver = receiver(read, exit.clone(), pack_recycler.clone(), s_reader); let (s_responder, r_responder) = channel(); let t_responder = responder(send, exit.clone(), resp_recycler.clone(), r_responder); let mut msgs = VecDeque::new(); diff --git a/src/tpu.rs b/src/tpu.rs index 455a32ad10..51e11d1289 100644 --- a/src/tpu.rs +++ b/src/tpu.rs @@ -58,7 +58,7 @@ impl Tpu { exit.clone(), packet_recycler.clone(), packet_sender, - )?; + ); let sig_verify_stage = SigVerifyStage::new(exit.clone(), packet_receiver); diff --git a/src/tvu.rs b/src/tvu.rs index 8634a99de5..fece1980cf 100644 --- a/src/tvu.rs +++ b/src/tvu.rs @@ -156,7 +156,7 @@ impl Tvu { exit.clone(), packet_recycler.clone(), packet_sender, - )?; + ); let sig_verify_stage = SigVerifyStage::new(exit.clone(), packet_receiver);