don't return async::notready for messages without scheduling wakeup

This commit is contained in:
Robert Habermeier
2018-05-06 13:25:37 +02:00
parent 04cbcd0655
commit 2232da2d53
+6 -6
View File
@@ -108,22 +108,22 @@ impl Stream for Messages {
} }
// check the network // check the network
loop {
match self.network_stream.poll() { match self.network_stream.poll() {
Err(_) => Err(bft::InputStreamConcluded.into()), Err(_) => return Err(bft::InputStreamConcluded.into()),
Ok(Async::NotReady) => Ok(Async::NotReady), Ok(Async::NotReady) => return Ok(Async::NotReady),
Ok(Async::Ready(None)) => Ok(Async::NotReady), // the input stream for agreements is never meant to logically end. Ok(Async::Ready(None)) => return Ok(Async::NotReady), // the input stream for agreements is never meant to logically end.
Ok(Async::Ready(Some(message))) => { Ok(Async::Ready(Some(message))) => {
if message.parent_hash == self.parent_hash { if message.parent_hash == self.parent_hash {
match process_message(message, &self.authorities) { match process_message(message, &self.authorities) {
Ok(message) => Ok(Async::Ready(Some(message))), Ok(message) => return Ok(Async::Ready(Some(message))),
Err(e) => { Err(e) => {
debug!("Message validation failed: {:?}", e); debug!("Message validation failed: {:?}", e);
Ok(Async::NotReady)
} }
} }
} else { } else {
self.collection.push(message); self.collection.push(message);
Ok(Async::NotReady) }
} }
} }
} }