Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

overseer: send_msg should not return an error #1995

Merged
merged 4 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions node/collation-generation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ impl CollationGenerationSubsystem {
},
msg = receiver.next().fuse() => {
if let Some(msg) = msg {
if let Err(err) = ctx.send_message(msg).await {
tracing::warn!(target: LOG_TARGET, err = ?err, "failed to forward message to overseer");
break;
}
ctx.send_message(msg).await;
}
},
}
Expand Down
4 changes: 2 additions & 2 deletions node/core/av-store/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ where
RuntimeApiRequest::CandidateEvents(tx),
));

ctx.send_message(msg.into()).await?;
ctx.send_message(msg.into()).await;

Ok(rx.await??)
}
Expand Down Expand Up @@ -858,7 +858,7 @@ where
{
let (tx, rx) = oneshot::channel();

ctx.send_message(AllMessages::ChainApi(ChainApiMessage::BlockNumber(block_hash, tx))).await?;
ctx.send_message(AllMessages::ChainApi(ChainApiMessage::BlockNumber(block_hash, tx))).await;

Ok(rx.await??.map(|number| number).unwrap_or_default())
}
Expand Down
2 changes: 1 addition & 1 deletion node/core/candidate-validation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ async fn runtime_api_request<T>(
relay_parent,
request,
))
).await?;
).await;

receiver.await.map_err(Into::into)
}
Expand Down
4 changes: 2 additions & 2 deletions node/core/proposer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ where

let (sender, receiver) = futures::channel::oneshot::channel();

overseer.wait_for_activation(parent_header_hash, sender).await?;
overseer.wait_for_activation(parent_header_hash, sender).await;
receiver.await.map_err(|_| Error::ClosedChannelAwaitingActivation)??;

let (sender, receiver) = futures::channel::oneshot::channel();
overseer.send_msg(AllMessages::Provisioner(
ProvisionerMessage::RequestInherentData(parent_header_hash, sender),
)).await?;
)).await;

let mut timeout = futures_timer::Delay::new(PROPOSE_TIMEOUT).fuse();

Expand Down
Loading