From 883e0bd8a2850c0c3f945adbe91c93adf1cdd2f8 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Sat, 11 Dec 2021 21:04:42 -0300 Subject: [PATCH] fix(multiplexer): resolve lint issues --- pallas-multiplexer/src/bearers.rs | 8 ++++---- pallas-multiplexer/src/lib.rs | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pallas-multiplexer/src/bearers.rs b/pallas-multiplexer/src/bearers.rs index 423b8ed..590c266 100644 --- a/pallas-multiplexer/src/bearers.rs +++ b/pallas-multiplexer/src/bearers.rs @@ -25,9 +25,9 @@ fn write_segment( ); } - msg.write(&payload[..]).unwrap(); + msg.write_all(payload)?; - writer.write(&msg)?; + writer.write_all(&msg)?; writer.flush() } @@ -41,8 +41,8 @@ fn read_segment(reader: &mut impl Read) -> Result<(u16, u32, Payload), std::io:: } let length = NetworkEndian::read_u16(&header[6..]) as usize; - let id = NetworkEndian::read_u16(&mut header[4..6]) as usize ^ 0x8000; - let ts = NetworkEndian::read_u32(&mut header[0..4]); + let id = NetworkEndian::read_u16(&header[4..6]) as usize ^ 0x8000; + let ts = NetworkEndian::read_u32(&header[0..4]); debug!( "parsed inbound msg, protocol id: {}, ts: {}, payload length: {}", diff --git a/pallas-multiplexer/src/lib.rs b/pallas-multiplexer/src/lib.rs index 70d0cff..fc05382 100644 --- a/pallas-multiplexer/src/lib.rs +++ b/pallas-multiplexer/src/lib.rs @@ -111,7 +111,7 @@ pub struct Channel(pub Sender, pub Receiver); type ChannelProtocolHandle = (u16, Channel); type ChannelIngressHandle = (u16, Receiver); type ChannelEgressHandle = (u16, Sender); -type MuxIngress = Vec; +type MuxIngress<'a> = &'a [ChannelIngressHandle]; type DemuxerEgress = Vec; pub struct Multiplexer { @@ -141,15 +141,14 @@ impl Multiplexer { let egress_handle: ChannelEgressHandle = (*id, demux_tx); (protocol_handle, (ingress_handle, egress_handle)) - }) - .collect::>(); + }); let (protocol_handles, multiplex_handles): (Vec<_>, Vec<_>) = handles.into_iter().unzip(); let (ingress, egress): (Vec<_>, Vec<_>) = multiplex_handles.into_iter().unzip(); let mut tx_bearer = bearer.clone(); - let tx_thread = thread::spawn(move || tx_loop(&mut tx_bearer, ingress)); + let tx_thread = thread::spawn(move || tx_loop(&mut tx_bearer, ingress.as_slice())); let mut rx_bearer = bearer.clone(); let rx_thread = thread::spawn(move || rx_loop(&mut rx_bearer, egress));