cleanup stream polls (#3397)

* metered-channel: remove dead code

* we don't need no fuse

* even more
This commit is contained in:
Andronik Ordian
2021-07-02 10:23:26 +02:00
committed by GitHub
parent 505145efd3
commit 7b054b3c77
5 changed files with 17 additions and 65 deletions
+1 -1
View File
@@ -830,7 +830,7 @@ async fn handle_network_messages<AD: validator_discovery::AuthorityDiscovery>(
}
}
},
req_res_event = request_multiplexer.next().fuse() => match req_res_event {
req_res_event = request_multiplexer.next() => match req_res_event {
None => return Err(UnexpectedAbort::RequestStreamConcluded),
Some(Err(err)) => {
network_service.report_peer(err.peer, MALFORMED_MESSAGE_COST);
@@ -595,14 +595,14 @@ impl Message {
// We are only fusing here to make `select` happy, in reality we will quit if one of those
// streams end:
let from_overseer = ctx.recv().fuse();
let from_requester = from_requester.next().fuse();
let from_responder = from_responder.next().fuse();
let from_requester = from_requester.next();
let from_responder = from_responder.next();
futures::pin_mut!(from_overseer, from_requester, from_responder);
futures::select!(
futures::select! {
msg = from_overseer => Message::Subsystem(msg.map_err(Fatal::SubsystemReceive)),
msg = from_requester => Message::Requester(msg),
msg = from_responder => Message::Responder(msg),
)
}
}
}