Update to latest master (#246)

This commit is contained in:
Bastian Köcher
2020-11-23 19:09:25 +01:00
committed by GitHub
parent e5b4e8cae7
commit 35c2609b8b
3 changed files with 188 additions and 255 deletions
+181 -240
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -522,13 +522,13 @@ where
overseer_handler overseer_handler
.send_msg(CollationGenerationMessage::Initialize(config)) .send_msg(CollationGenerationMessage::Initialize(config))
.await .await;
.map_err(|e| format!("Failed to send `Initialize` message: {:?}", e))?;
overseer_handler overseer_handler
.send_msg(CollatorProtocolMessage::CollateOn(para_id)) .send_msg(CollatorProtocolMessage::CollateOn(para_id))
.await .await;
.map_err(|e| format!("Failed to send `CollateOn` message: {:?}", e))
Ok(())
} }
#[cfg(test)] #[cfg(test)]
+3 -11
View File
@@ -52,7 +52,7 @@ use futures::{
future::{ready, FutureExt}, future::{ready, FutureExt},
pin_mut, select, Future, StreamExt, pin_mut, select, Future, StreamExt,
}; };
use log::{trace, warn}; use log::trace;
use std::{marker::PhantomData, pin::Pin, sync::Arc}; use std::{marker::PhantomData, pin::Pin, sync::Arc};
@@ -467,19 +467,11 @@ async fn wait_to_announce<Block: BlockT>(
mut overseer_handler: OverseerHandler, mut overseer_handler: OverseerHandler,
) { ) {
let (sender, mut receiver) = mpsc::channel(5); let (sender, mut receiver) = mpsc::channel(5);
if overseer_handler overseer_handler
.send_msg(StatementDistributionMessage::RegisterStatementListener( .send_msg(StatementDistributionMessage::RegisterStatementListener(
sender, sender,
)) ))
.await .await;
.is_err()
{
warn!(
target: "cumulus-network",
"Failed to register the statement listener!",
);
return;
}
while let Some(statement) = receiver.next().await { while let Some(statement) = receiver.next().await {
match &statement.payload() { match &statement.payload() {