Merge branch 'master' into auth-bft

ethcore/src/service.rs

@@ -17,6 +17,7 @@
 //! Creates and registers client and network services.
 
 use util::*;
+use rlp::{UntrustedRlp, View};
 use io::*;
 use spec::Spec;
 use error::*;
@@ -227,7 +228,9 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {
 			ClientIoMessage::UpdateSealing => self.client.update_sealing(),
 			ClientIoMessage::SubmitSeal(ref hash, ref seal) => self.client.submit_seal(*hash, seal.clone()),
 			ClientIoMessage::BroadcastMessage(ref message) => self.client.broadcast_message(message.clone()),
-			ClientIoMessage::NewMessage(ref message) => self.client.handle_queued_message(message),
+			ClientIoMessage::NewMessage(ref message) => if let Err(e) = self.client.engine().handle_message(UntrustedRlp::new(message)) {
+				trace!(target: "poa", "Invalid message received: {}", e);
+			},
 			_ => {} // ignore other messages
 		}
 	}