Sulkta-OSS/pallas
3
0
Fork 0
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

fix(multiplexer): resolve lint issues

Browse source
This commit is contained in:
Santiago Carmuega 2021-12-11 21:04:42 -03:00
parent fec280728b
commit 141ea76096
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pallas-multiplexer/src/bearers.rs
View file

@ -25,9 +25,9 @@ fn write_segment(
); );
} }
msg.write(&payload[..]).unwrap(); msg.write_all(payload)?;
writer.write(&msg)?; writer.write_all(&msg)?;
writer.flush() 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 length = NetworkEndian::read_u16(&header[6..]) as usize;
let id = NetworkEndian::read_u16(&mut header[4..6]) as usize ^ 0x8000; let id = NetworkEndian::read_u16(&header[4..6]) as usize ^ 0x8000;
let ts = NetworkEndian::read_u32(&mut header[0..4]); let ts = NetworkEndian::read_u32(&header[0..4]);
debug!( debug!(
"parsed inbound msg, protocol id: {}, ts: {}, payload length: {}", "parsed inbound msg, protocol id: {}, ts: {}, payload length: {}",

7
pallas-multiplexer/src/lib.rs
View file

@ -111,7 +111,7 @@ pub struct Channel(pub Sender<Payload>, pub Receiver<Payload>);
type ChannelProtocolHandle = (u16, Channel); type ChannelProtocolHandle = (u16, Channel);
type ChannelIngressHandle = (u16, Receiver<Payload>); type ChannelIngressHandle = (u16, Receiver<Payload>);
type ChannelEgressHandle = (u16, Sender<Payload>); type ChannelEgressHandle = (u16, Sender<Payload>);
type MuxIngress = Vec<ChannelIngressHandle>; type MuxIngress<'a> = &'a [ChannelIngressHandle];
type DemuxerEgress = Vec<ChannelEgressHandle>; type DemuxerEgress = Vec<ChannelEgressHandle>;
pub struct Multiplexer { pub struct Multiplexer {
@ -141,15 +141,14 @@ impl Multiplexer {
let egress_handle: ChannelEgressHandle = (*id, demux_tx); let egress_handle: ChannelEgressHandle = (*id, demux_tx);
(protocol_handle, (ingress_handle, egress_handle)) (protocol_handle, (ingress_handle, egress_handle))
}) });
.collect::<Vec<_>>();
let (protocol_handles, multiplex_handles): (Vec<_>, Vec<_>) = handles.into_iter().unzip(); let (protocol_handles, multiplex_handles): (Vec<_>, Vec<_>) = handles.into_iter().unzip();
let (ingress, egress): (Vec<_>, Vec<_>) = multiplex_handles.into_iter().unzip(); let (ingress, egress): (Vec<_>, Vec<_>) = multiplex_handles.into_iter().unzip();
let mut tx_bearer = bearer.clone(); 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 mut rx_bearer = bearer.clone();
let rx_thread = thread::spawn(move || rx_loop(&mut rx_bearer, egress)); let rx_thread = thread::spawn(move || rx_loop(&mut rx_bearer, egress));