mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 21:01:05 +00:00
Mass replace ,); pattern (#3580)
This is an artifact left by rustfmt which is not dare to remove the comma being conservative.
This commit is contained in:
@@ -200,11 +200,11 @@ impl State {
|
||||
match event {
|
||||
NetworkBridgeEvent::PeerConnected(peer_id, role, _) => {
|
||||
// insert a blank view if none already present
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?role, "Peer connected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?role, "Peer connected");
|
||||
self.peer_views.entry(peer_id).or_default();
|
||||
},
|
||||
NetworkBridgeEvent::PeerDisconnected(peer_id) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Peer disconnected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Peer disconnected");
|
||||
self.peer_views.remove(&peer_id);
|
||||
self.blocks.iter_mut().for_each(|(_hash, entry)| {
|
||||
entry.known_by.remove(&peer_id);
|
||||
@@ -224,7 +224,7 @@ impl State {
|
||||
self.handle_peer_view_change(ctx, metrics, peer_id, view).await;
|
||||
},
|
||||
NetworkBridgeEvent::OurViewChange(view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Own view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Own view change");
|
||||
for head in view.iter() {
|
||||
if !self.blocks.contains_key(head) {
|
||||
self.pending_known.entry(*head).or_default();
|
||||
@@ -454,7 +454,7 @@ impl State {
|
||||
peer_id: PeerId,
|
||||
view: View,
|
||||
) {
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Peer view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Peer view change");
|
||||
let finalized_number = view.finalized_number;
|
||||
let old_view = self.peer_views.insert(peer_id.clone(), view.clone());
|
||||
let old_finalized_number = old_view.map(|v| v.finalized_number).unwrap_or(0);
|
||||
@@ -570,7 +570,7 @@ impl State {
|
||||
if entry.knowledge.known_messages.contains(&fingerprint) {
|
||||
modify_reputation(ctx, peer_id.clone(), BENEFIT_VALID_MESSAGE).await;
|
||||
if let Some(peer_knowledge) = entry.known_by.get_mut(&peer_id) {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?fingerprint, "Known assignment",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?fingerprint, "Known assignment");
|
||||
peer_knowledge.received.insert(fingerprint.clone());
|
||||
}
|
||||
return
|
||||
@@ -589,7 +589,7 @@ impl State {
|
||||
let result = match rx.await {
|
||||
Ok(result) => result,
|
||||
Err(_) => {
|
||||
tracing::debug!(target: LOG_TARGET, "The approval voting subsystem is down",);
|
||||
tracing::debug!(target: LOG_TARGET, "The approval voting subsystem is down");
|
||||
return
|
||||
},
|
||||
};
|
||||
@@ -805,7 +805,7 @@ impl State {
|
||||
|
||||
// if the approval is known to be valid, reward the peer
|
||||
if entry.knowledge.contains(&fingerprint) {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?fingerprint, "Known approval",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?fingerprint, "Known approval");
|
||||
modify_reputation(ctx, peer_id.clone(), BENEFIT_VALID_MESSAGE).await;
|
||||
if let Some(peer_knowledge) = entry.known_by.get_mut(&peer_id) {
|
||||
peer_knowledge.received.insert(fingerprint.clone());
|
||||
@@ -822,7 +822,7 @@ impl State {
|
||||
let result = match rx.await {
|
||||
Ok(result) => result,
|
||||
Err(_) => {
|
||||
tracing::debug!(target: LOG_TARGET, "The approval voting subsystem is down",);
|
||||
tracing::debug!(target: LOG_TARGET, "The approval voting subsystem is down");
|
||||
return
|
||||
},
|
||||
};
|
||||
@@ -978,7 +978,7 @@ impl State {
|
||||
);
|
||||
|
||||
if !lucky {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Unlucky peer",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Unlucky peer");
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ async fn overseer_send(overseer: &mut VirtualOverseer, msg: ApprovalDistribution
|
||||
}
|
||||
|
||||
async fn overseer_signal_block_finalized(overseer: &mut VirtualOverseer, number: BlockNumber) {
|
||||
tracing::trace!(?number, "Sending a finalized signal",);
|
||||
tracing::trace!(?number, "Sending a finalized signal");
|
||||
// we don't care about the block hash
|
||||
overseer
|
||||
.send(FromOverseer::Signal(OverseerSignal::BlockFinalized(Hash::zero(), number)))
|
||||
@@ -249,7 +249,7 @@ fn try_import_the_same_assignment() {
|
||||
expect_reputation_change(overseer, &peer_d, COST_UNEXPECTED_MESSAGE).await;
|
||||
expect_reputation_change(overseer, &peer_d, BENEFIT_VALID_MESSAGE).await;
|
||||
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent",);
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
|
||||
virtual_overseer
|
||||
});
|
||||
}
|
||||
@@ -405,7 +405,7 @@ fn peer_sending_us_the_same_we_just_sent_them_is_ok() {
|
||||
let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments);
|
||||
send_message_from_peer(overseer, peer, msg.clone()).await;
|
||||
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "we should not punish the peer",);
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "we should not punish the peer");
|
||||
|
||||
// send the assignments again
|
||||
send_message_from_peer(overseer, peer, msg).await;
|
||||
@@ -860,7 +860,7 @@ fn import_remotely_then_locally() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent",);
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
|
||||
|
||||
// send the approval remotely
|
||||
let approval = IndirectSignedApprovalVote {
|
||||
@@ -887,7 +887,7 @@ fn import_remotely_then_locally() {
|
||||
// import the same approval locally
|
||||
overseer_send(overseer, ApprovalDistributionMessage::DistributeApproval(approval)).await;
|
||||
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent",);
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
|
||||
virtual_overseer
|
||||
});
|
||||
}
|
||||
@@ -966,7 +966,7 @@ fn sends_assignments_even_when_state_is_approved() {
|
||||
}
|
||||
);
|
||||
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent",);
|
||||
assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
|
||||
virtual_overseer
|
||||
});
|
||||
}
|
||||
|
||||
@@ -723,7 +723,7 @@ where
|
||||
launch_interaction(state, ctx, session_info, receipt, backing_group, response_sender)
|
||||
.await,
|
||||
None => {
|
||||
tracing::warn!(target: LOG_TARGET, "SessionInfo is `None` at {:?}", state.live_block,);
|
||||
tracing::warn!(target: LOG_TARGET, "SessionInfo is `None` at {:?}", state.live_block);
|
||||
response_sender
|
||||
.send(Err(RecoveryError::Unavailable))
|
||||
.map_err(|_| error::Error::CanceledResponseSender)?;
|
||||
|
||||
@@ -460,7 +460,7 @@ async fn process_incoming_peer_message<Context>(
|
||||
if !received_set.contains(&validator) {
|
||||
received_set.insert(validator.clone());
|
||||
} else {
|
||||
tracing::trace!(target: LOG_TARGET, ?validator_index, ?origin, "Duplicate message",);
|
||||
tracing::trace!(target: LOG_TARGET, ?validator_index, ?origin, "Duplicate message");
|
||||
modify_reputation(ctx, origin, COST_PEER_DUPLICATE_MESSAGE).await;
|
||||
return
|
||||
};
|
||||
@@ -512,12 +512,12 @@ async fn handle_network_msg<Context>(
|
||||
|
||||
match bridge_message {
|
||||
NetworkBridgeEvent::PeerConnected(peerid, role, _) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, ?role, "Peer connected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, ?role, "Peer connected");
|
||||
// insert if none already present
|
||||
state.peer_views.entry(peerid).or_default();
|
||||
},
|
||||
NetworkBridgeEvent::PeerDisconnected(peerid) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, "Peer disconnected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, "Peer disconnected");
|
||||
// get rid of superfluous data
|
||||
state.peer_views.remove(&peerid);
|
||||
},
|
||||
@@ -531,11 +531,11 @@ async fn handle_network_msg<Context>(
|
||||
}
|
||||
},
|
||||
NetworkBridgeEvent::PeerViewChange(peerid, view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, ?view, "Peer view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peerid, ?view, "Peer view change");
|
||||
handle_peer_view_change(ctx, state, peerid, view).await;
|
||||
},
|
||||
NetworkBridgeEvent::OurViewChange(view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Our view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Our view change");
|
||||
handle_our_view_change(state, view);
|
||||
},
|
||||
NetworkBridgeEvent::PeerMessage(remote, message) =>
|
||||
@@ -589,7 +589,7 @@ async fn handle_peer_view_change<Context>(
|
||||
);
|
||||
|
||||
if !lucky {
|
||||
tracing::trace!(target: LOG_TARGET, ?origin, "Peer view change is ignored",);
|
||||
tracing::trace!(target: LOG_TARGET, ?origin, "Peer view change is ignored");
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -777,7 +777,7 @@ async fn send_collation(
|
||||
};
|
||||
|
||||
if let Err(_) = request.send_outgoing_response(response) {
|
||||
tracing::warn!(target: LOG_TARGET, "Sending collation response failed",);
|
||||
tracing::warn!(target: LOG_TARGET, "Sending collation response failed");
|
||||
}
|
||||
|
||||
state.active_collation_fetches.push(
|
||||
@@ -913,7 +913,7 @@ where
|
||||
PeerConnected(peer_id, observed_role, maybe_authority) => {
|
||||
// If it is possible that a disconnected validator would attempt a reconnect
|
||||
// it should be handled here.
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?observed_role, "Peer connected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?observed_role, "Peer connected");
|
||||
if let Some(authority) = maybe_authority {
|
||||
tracing::trace!(
|
||||
target: LOG_TARGET,
|
||||
@@ -927,16 +927,16 @@ where
|
||||
}
|
||||
},
|
||||
PeerViewChange(peer_id, view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?view, "Peer view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, ?view, "Peer view change");
|
||||
handle_peer_view_change(ctx, state, peer_id, view).await;
|
||||
},
|
||||
PeerDisconnected(peer_id) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Peer disconnected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer_id, "Peer disconnected");
|
||||
state.peer_views.remove(&peer_id);
|
||||
state.peer_ids.remove(&peer_id);
|
||||
},
|
||||
OurViewChange(view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Own view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?view, "Own view change");
|
||||
handle_our_view_change(state, view).await?;
|
||||
},
|
||||
PeerMessage(remote, msg) => {
|
||||
|
||||
@@ -395,7 +395,7 @@ impl ActiveParas {
|
||||
)
|
||||
},
|
||||
None => {
|
||||
tracing::trace!(target: LOG_TARGET, ?relay_parent, "Not a validator",);
|
||||
tracing::trace!(target: LOG_TARGET, ?relay_parent, "Not a validator");
|
||||
|
||||
continue
|
||||
},
|
||||
|
||||
@@ -1450,7 +1450,7 @@ async fn handle_network_update(
|
||||
) {
|
||||
match update {
|
||||
NetworkBridgeEvent::PeerConnected(peer, role, maybe_authority) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, ?role, "Peer connected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, ?role, "Peer connected");
|
||||
peers.insert(
|
||||
peer,
|
||||
PeerData {
|
||||
@@ -1464,7 +1464,7 @@ async fn handle_network_update(
|
||||
}
|
||||
},
|
||||
NetworkBridgeEvent::PeerDisconnected(peer) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, "Peer disconnected",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, "Peer disconnected");
|
||||
if let Some(auth_id) = peers.remove(&peer).and_then(|p| p.maybe_authority) {
|
||||
authorities.remove(&auth_id);
|
||||
}
|
||||
@@ -1502,7 +1502,7 @@ async fn handle_network_update(
|
||||
.await;
|
||||
},
|
||||
NetworkBridgeEvent::PeerViewChange(peer, view) => {
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, ?view, "Peer view change",);
|
||||
tracing::trace!(target: LOG_TARGET, ?peer, ?view, "Peer view change");
|
||||
match peers.get_mut(&peer) {
|
||||
Some(data) =>
|
||||
update_peer_view_and_maybe_send_unlocked(
|
||||
|
||||
@@ -641,7 +641,7 @@ fn circulated_statement_goes_to_all_peers_with_view() {
|
||||
.get(&hash_b)
|
||||
.unwrap()
|
||||
.sent_statements
|
||||
.contains(&fingerprint),);
|
||||
.contains(&fingerprint));
|
||||
|
||||
assert!(peer_data
|
||||
.get(&peer_c)
|
||||
@@ -650,7 +650,7 @@ fn circulated_statement_goes_to_all_peers_with_view() {
|
||||
.get(&hash_b)
|
||||
.unwrap()
|
||||
.sent_statements
|
||||
.contains(&fingerprint),);
|
||||
.contains(&fingerprint));
|
||||
|
||||
let message = handle.recv().await;
|
||||
assert_matches!(
|
||||
|
||||
Reference in New Issue
Block a user