pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 18:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

overseer: send_msg should not return an error (#1995)

Browse Source 
* send_message should not return an error

* Apply suggestions from code review

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

* s/send_logging_error/send_and_log_error

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
This commit is contained in:
Andronik Ordian
2020-11-23 12:42:14 +01:00
committed by GitHub
parent 8cdb063f72
commit 69b103b1d5
21 changed files with 330 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/network/collator-protocol/src/collator_side.rs
+18 -36
View File
@@ -274,7 +274,7 @@ async fn distribute_collation(
"there are no validators assigned to core",
);
return Ok(())
return Ok(());
}
// Issue a discovery request for the validators of the current group and the next group.
@@ -342,7 +342,7 @@ async fn declare(
ctx: &mut impl SubsystemContext<Message = CollatorProtocolMessage>,
state: &mut State,
peer: PeerId,
) -> Result<()> {
) {
let wire_message = protocol_v1::CollatorProtocolMessage::Declare(state.our_id.clone());
ctx.send_message(AllMessages::NetworkBridge(
@@ -350,9 +350,7 @@ async fn declare(
vec![peer],
protocol_v1::CollationProtocol::CollatorProtocol(wire_message),
)
)).await?;
Ok(())
)).await;
}
/// Issue a connection request to a set of validators and
@@ -385,12 +383,10 @@ async fn advertise_collation(
state: &mut State,
relay_parent: Hash,
peer: PeerId,
) -> Result<()> {
) {
let collating_on = match state.collating_on {
Some(collating_on) => collating_on,
None => {
return Ok(());
}
None => return,
};
let should_advertise = state.our_validators_groups
@@ -399,7 +395,7 @@ async fn advertise_collation(
.unwrap_or(false);
if !state.collations.contains_key(&relay_parent) || !should_advertise {
return Ok(())
return;
}
let wire_message = protocol_v1::CollatorProtocolMessage::AdvertiseCollation(relay_parent, collating_on);
@@ -409,15 +405,13 @@ async fn advertise_collation(
vec![peer.clone()],
protocol_v1::CollationProtocol::CollatorProtocol(wire_message),
)
)).await?;
)).await;
if let Some(validators) = state.our_validators_groups.get_mut(&relay_parent) {
validators.advertised_to_peer(&peer);
}
state.metrics.on_advertisment_made();
Ok(())
}
/// The main incoming message dispatching switch.
@@ -504,7 +498,7 @@ async fn send_collation(
origin: PeerId,
receipt: CandidateReceipt,
pov: PoV,
) -> Result<()> {
) {
let wire_message = protocol_v1::CollatorProtocolMessage::Collation(
request_id,
receipt,
@@ -516,11 +510,9 @@ async fn send_collation(
vec![origin],
protocol_v1::CollationProtocol::CollatorProtocol(wire_message),
)
)).await?;
)).await;
state.metrics.on_collation_sent();
Ok(())
}
/// A networking messages switch.
@@ -551,7 +543,7 @@ async fn handle_incoming_peer_message(
Some(our_para_id) => {
if our_para_id == para_id {
if let Some(collation) = state.collations.get(&relay_parent).cloned() {
send_collation(ctx, state, request_id, origin, collation.0, collation.1).await?;
send_collation(ctx, state, request_id, origin, collation.0, collation.1).await;
}
} else {
tracing::warn!(
@@ -589,7 +581,7 @@ async fn handle_peer_view_change(
state: &mut State,
peer_id: PeerId,
view: View,
) -> Result<()> {
) {
let current = state.peer_views.entry(peer_id.clone()).or_default();
let added: Vec<Hash> = view.difference(&*current).cloned().collect();
@@ -597,10 +589,8 @@ async fn handle_peer_view_change(
*current = view;
for added in added.into_iter() {
advertise_collation(ctx, state, added, peer_id.clone()).await?;
advertise_collation(ctx, state, added, peer_id.clone()).await;
}
Ok(())
}
/// A validator is connected.
@@ -613,11 +603,11 @@ async fn handle_validator_connected(
peer_id: PeerId,
validator_id: ValidatorId,
relay_parent: Hash,
) -> Result<()> {
) {
let not_declared = state.declared_at.insert(peer_id.clone());
if not_declared {
declare(ctx, state, peer_id.clone()).await?;
declare(ctx, state, peer_id.clone()).await;
}
// Store the PeerId and find out if we should advertise to this peer.
@@ -630,10 +620,8 @@ async fn handle_validator_connected(
};
if advertise && state.peer_interested_in_leaf(&peer_id, &relay_parent) {
advertise_collation(ctx, state, relay_parent, peer_id).await?;
advertise_collation(ctx, state, relay_parent, peer_id).await;
}
Ok(())
}
/// Bridge messages switch.
@@ -651,7 +639,7 @@ async fn handle_network_msg(
// it should be handled here.
}
PeerViewChange(peer_id, view) => {
handle_peer_view_change(ctx, state, peer_id, view).await?;
handle_peer_view_change(ctx, state, peer_id, view).await;
}
PeerDisconnected(peer_id) => {
state.peer_views.remove(&peer_id);
@@ -712,19 +700,13 @@ pub(crate) async fn run(
let _timer = state.metrics.time_handle_connection_request();
if let Err(err) = handle_validator_connected(
handle_validator_connected(
&mut ctx,
&mut state,
peer_id,
validator_id,
relay_parent,
).await {
tracing::warn!(
target: LOG_TARGET,
err = ?err,
"Failed to declare our collator id",
);
}
).await;
},
msg = ctx.recv().fuse() => match msg? {
Communication { msg } => {
polkadot/node/network/collator-protocol/src/lib.rs
+2 -4
View File
@@ -137,7 +137,7 @@ where
/// Modify the reputation of a peer based on its behavior.
#[tracing::instrument(level = "trace", skip(ctx), fields(subsystem = LOG_TARGET))]
async fn modify_reputation<Context>(ctx: &mut Context, peer: PeerId, rep: Rep) -> Result<()>
async fn modify_reputation<Context>(ctx: &mut Context, peer: PeerId, rep: Rep)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>,
{
@@ -150,7 +150,5 @@ where
ctx.send_message(AllMessages::NetworkBridge(
NetworkBridgeMessage::ReportPeer(peer, rep),
)).await?;
Ok(())
)).await;
}
polkadot/node/network/collator-protocol/src/validator_side.rs
+28 -46
View File
@@ -225,7 +225,7 @@ async fn fetch_collation<Context>(
collator_id: CollatorId,
para_id: ParaId,
tx: oneshot::Sender<(CandidateReceipt, PoV)>
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -242,7 +242,7 @@ where
"Failed to send collation",
);
}
return Ok(());
return;
}
}
}
@@ -262,10 +262,8 @@ where
// Request the collation.
// Assume it is `request_collation`'s job to check and ignore duplicate requests.
if let Some(relevant_advertiser) = relevant_advertiser {
request_collation(ctx, state, relay_parent, para_id, relevant_advertiser, tx).await?;
request_collation(ctx, state, relay_parent, para_id, relevant_advertiser, tx).await;
}
Ok(())
}
/// Report a collator for some malicious actions.
@@ -274,7 +272,7 @@ async fn report_collator<Context>(
ctx: &mut Context,
state: &mut State,
id: CollatorId,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -283,11 +281,9 @@ where
// is a tolerable thing to do.
for (k, v) in state.known_collators.iter() {
if *v == id {
modify_reputation(ctx, k.clone(), COST_REPORT_BAD).await?;
modify_reputation(ctx, k.clone(), COST_REPORT_BAD).await;
}
}
Ok(())
}
/// Some other subsystem has reported a collator as a good one, bump reputation.
@@ -296,17 +292,15 @@ async fn note_good_collation<Context>(
ctx: &mut Context,
state: &mut State,
id: CollatorId,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
for (peer_id, collator_id) in state.known_collators.iter() {
if id == *collator_id {
modify_reputation(ctx, peer_id.clone(), BENEFIT_NOTIFY_GOOD).await?;
modify_reputation(ctx, peer_id.clone(), BENEFIT_NOTIFY_GOOD).await;
}
}
Ok(())
}
/// A peer's view has changed. A number of things should be done:
@@ -362,7 +356,7 @@ async fn received_collation<Context>(
request_id: RequestId,
receipt: CandidateReceipt,
pov: PoV,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -390,11 +384,9 @@ where
// If this collation is not just a delayed one that we were expecting,
// but our view has moved on, in that case modify peer's reputation.
if !state.recently_removed_heads.contains(&relay_parent) {
modify_reputation(ctx, origin, COST_UNEXPECTED_MESSAGE).await?;
modify_reputation(ctx, origin, COST_UNEXPECTED_MESSAGE).await;
}
}
Ok(())
}
/// Request a collation from the network.
@@ -411,7 +403,7 @@ async fn request_collation<Context>(
para_id: ParaId,
peer_id: PeerId,
result: oneshot::Sender<(CandidateReceipt, PoV)>,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -423,7 +415,7 @@ where
relay_parent = %relay_parent,
"collation is no longer in view",
);
return Ok(());
return;
}
if state.requested_collations.contains_key(&(relay_parent, para_id.clone(), peer_id.clone())) {
@@ -434,7 +426,7 @@ where
relay_parent = %relay_parent,
"collation has already been requested",
);
return Ok(());
return;
}
let request_id = state.next_request_id;
@@ -470,9 +462,7 @@ where
vec![peer_id],
protocol_v1::CollationProtocol::CollatorProtocol(wire_message),
)
)).await?;
Ok(())
)).await;
}
/// Notify `CandidateSelectionSubsystem` that a collation has been advertised.
@@ -482,7 +472,7 @@ async fn notify_candidate_selection<Context>(
collator: CollatorId,
relay_parent: Hash,
para_id: ParaId,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -492,9 +482,7 @@ where
para_id,
collator,
)
)).await?;
Ok(())
)).await;
}
/// Networking message has been received.
@@ -504,7 +492,7 @@ async fn process_incoming_peer_message<Context>(
state: &mut State,
origin: PeerId,
msg: protocol_v1::CollatorProtocolMessage,
)-> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -519,19 +507,17 @@ where
state.advertisements.entry(origin.clone()).or_default().insert((para_id, relay_parent));
if let Some(collator) = state.known_collators.get(&origin) {
notify_candidate_selection(ctx, collator.clone(), relay_parent, para_id).await?;
notify_candidate_selection(ctx, collator.clone(), relay_parent, para_id).await;
}
}
RequestCollation(_, _, _) => {
// This is a validator side of the protocol, collation requests are not expected here.
return modify_reputation(ctx, origin, COST_UNEXPECTED_MESSAGE).await;
modify_reputation(ctx, origin, COST_UNEXPECTED_MESSAGE).await;
}
Collation(request_id, receipt, pov) => {
received_collation(ctx, state, origin, request_id, receipt, pov).await?;
received_collation(ctx, state, origin, request_id, receipt, pov).await;
}
}
Ok(())
}
/// A leaf has become inactive so we want to
@@ -592,7 +578,7 @@ async fn request_timed_out<Context>(
ctx: &mut Context,
state: &mut State,
id: RequestId,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -604,12 +590,10 @@ where
if let Some(_) = state.requests_info.remove(&id) {
let peer_id = key.2;
modify_reputation(ctx, peer_id, COST_REQUEST_TIMED_OUT).await?;
modify_reputation(ctx, peer_id, COST_REQUEST_TIMED_OUT).await;
}
}
}
Ok(())
}
/// Bridge event switch.
@@ -639,7 +623,7 @@ where
handle_our_view_change(state, view).await?;
},
PeerMessage(remote, msg) => {
process_incoming_peer_message(ctx, state, remote, msg).await?;
process_incoming_peer_message(ctx, state, remote, msg).await;
}
}
@@ -652,7 +636,7 @@ async fn process_msg<Context>(
ctx: &mut Context,
msg: CollatorProtocolMessage,
state: &mut State,
) -> Result<()>
)
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
@@ -675,13 +659,13 @@ where
);
}
FetchCollation(relay_parent, collator_id, para_id, tx) => {
fetch_collation(ctx, state, relay_parent, collator_id, para_id, tx).await?;
fetch_collation(ctx, state, relay_parent, collator_id, para_id, tx).await;
}
ReportCollator(id) => {
report_collator(ctx, state, id).await?;
report_collator(ctx, state, id).await;
}
NoteGoodCollation(id) => {
note_good_collation(ctx, state, id).await?;
note_good_collation(ctx, state, id).await;
}
NetworkBridgeUpdateV1(event) => {
if let Err(e) = handle_network_msg(
@@ -697,8 +681,6 @@ where
}
}
}
Ok(())
}
/// The main run loop.
@@ -726,7 +708,7 @@ where
tracing::trace!(target: LOG_TARGET, msg = ?msg, "received a message");
match msg {
Communication { msg } => process_msg(&mut ctx, msg, &mut state).await?,
Communication { msg } => process_msg(&mut ctx, msg, &mut state).await,
Signal(BlockFinalized(_)) => {}
Signal(ActiveLeaves(_)) => {}
Signal(Conclude) => { break }
@@ -742,7 +724,7 @@ where
match request {
CollationRequestResult::Timeout(id) => {
tracing::trace!(target: LOG_TARGET, id, "request timed out");
request_timed_out(&mut ctx, &mut state, id).await?;
request_timed_out(&mut ctx, &mut state, id).await;
}
CollationRequestResult::Received(id) => {
state.requests_info.remove(&id);