diff --git a/polkadot/node/network/bitfield-distribution/src/lib.rs b/polkadot/node/network/bitfield-distribution/src/lib.rs index 4c832fc216..dd09712cf6 100644 --- a/polkadot/node/network/bitfield-distribution/src/lib.rs +++ b/polkadot/node/network/bitfield-distribution/src/lib.rs @@ -127,6 +127,8 @@ impl PerRelayParentData { } } +const TARGET: &'static str = "bitd"; + /// The bitfield distribution subsystem. pub struct BitfieldDistribution; @@ -144,22 +146,22 @@ impl BitfieldDistribution { FromOverseer::Communication { msg: BitfieldDistributionMessage::DistributeBitfield(hash, signed_availability), } => { - trace!(target: "bitd", "Processing DistributeBitfield"); + trace!(target: TARGET, "Processing DistributeBitfield"); handle_bitfield_distribution(&mut ctx, &mut state, hash, signed_availability) .await?; } FromOverseer::Communication { msg: BitfieldDistributionMessage::NetworkBridgeUpdateV1(event), } => { - trace!(target: "bitd", "Processing NetworkMessage"); + trace!(target: TARGET, "Processing NetworkMessage"); // a network message was received if let Err(e) = handle_network_msg(&mut ctx, &mut state, event).await { - warn!(target: "bitd", "Failed to handle incomming network messages: {:?}", e); + warn!(target: TARGET, "Failed to handle incomming network messages: {:?}", e); } } FromOverseer::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate { activated, deactivated })) => { for relay_parent in activated { - trace!(target: "bitd", "Start {:?}", relay_parent); + trace!(target: TARGET, "Start {:?}", relay_parent); // query basic system parameters once if let Some((validator_set, signing_context)) = query_basics(&mut ctx, relay_parent).await? @@ -181,15 +183,15 @@ impl BitfieldDistribution { } for relay_parent in deactivated { - trace!(target: "bitd", "Stop {:?}", relay_parent); + trace!(target: TARGET, "Stop {:?}", relay_parent); // defer the cleanup to the view change } } FromOverseer::Signal(OverseerSignal::BlockFinalized(hash)) => { - trace!(target: "bitd", "Block finalized {:?}", hash); + trace!(target: TARGET, "Block finalized {:?}", hash); } FromOverseer::Signal(OverseerSignal::Conclude) => { - trace!(target: "bitd", "Conclude"); + trace!(target: TARGET, "Conclude"); return Ok(()); } } @@ -206,7 +208,7 @@ async fn modify_reputation( where Context: SubsystemContext, { - trace!(target: "bitd", "Reputation change of {:?} for peer {:?}", rep, peer); + trace!(target: TARGET, "Reputation change of {:?} for peer {:?}", rep, peer); ctx.send_message(AllMessages::NetworkBridge( NetworkBridgeMessage::ReportPeer(peer, rep), )) @@ -231,7 +233,7 @@ where job_data } else { trace!( - target: "bitd", + target: TARGET, "Not supposed to work on relay parent {} related data", relay_parent ); @@ -240,7 +242,7 @@ where }; let validator_set = &job_data.validator_set; if validator_set.is_empty() { - trace!(target: "bitd", "Validator set for {:?} is empty", relay_parent); + trace!(target: TARGET, "Validator set for {:?} is empty", relay_parent); return Ok(()); } @@ -248,7 +250,7 @@ where let validator = if let Some(validator) = validator_set.get(validator_index) { validator.clone() } else { - trace!(target: "bitd", "Could not find a validator for index {}", validator_index); + trace!(target: TARGET, "Could not find a validator for index {}", validator_index); return Ok(()); }; @@ -308,7 +310,7 @@ where if interested_peers.is_empty() { trace!( - target: "bitd", + target: TARGET, "No peers are interested in gossip for relay parent {:?}", message.relay_parent ); @@ -334,12 +336,12 @@ async fn process_incoming_peer_message( where Context: SubsystemContext, { - // we don't care about this, not part of our view + // we don't care about this, not part of our view. if !state.view.contains(&message.relay_parent) { return modify_reputation(ctx, origin, COST_NOT_IN_VIEW).await; } - // Ignore anything the overseer did not tell this subsystem to work on + // Ignore anything the overseer did not tell this subsystem to work on. let mut job_data = state.per_relay_parent.get_mut(&message.relay_parent); let job_data: &mut _ = if let Some(ref mut job_data) = job_data { job_data @@ -350,7 +352,7 @@ where let validator_set = &job_data.validator_set; if validator_set.is_empty() { trace!( - target: "bitd", + target: TARGET, "Validator set for relay parent {:?} is empty", &message.relay_parent ); @@ -391,7 +393,7 @@ where // only relay_message a message of a validator once if one_per_validator.get(&validator).is_some() { trace!( - target: "bitd", + target: TARGET, "Already received a message for validator at index {}", validator_index ); @@ -407,6 +409,7 @@ where modify_reputation(ctx, origin, COST_SIGNATURE_INVALID).await } } + /// Deal with network bridge updates and track what needs to be tracked /// which depends on the message type received. async fn handle_network_msg( @@ -435,7 +438,7 @@ where NetworkBridgeEvent::PeerMessage(remote, message) => { match message { protocol_v1::BitfieldDistributionMessage::Bitfield(relay_parent, bitfield) => { - trace!(target: "bitd", "Received bitfield gossip from peer {:?}", &remote); + trace!(target: TARGET, "Received bitfield gossip from peer {:?}", &remote); let gossiped_bitfield = BitfieldGossipMessage { relay_parent, signed_availability: bitfield, @@ -455,7 +458,7 @@ fn handle_our_view_change(state: &mut ProtocolState, view: View) -> SubsystemRes for added in state.view.difference(&old_view) { if !state.per_relay_parent.contains_key(&added) { warn!( - target: "bitd", + target: TARGET, "Our view contains {} but the overseer never told use we should work on this", &added ); @@ -501,7 +504,7 @@ where one_per_validator .into_iter() .filter(move |(validator, _message)| { - // ..except for the ones the peer already has + // ..except for the ones the peer already has. job_data.message_from_validator_needed_by_peer(&origin, validator) }), ) @@ -598,7 +601,7 @@ where SigningContext { parent_hash: relay_parent, session_index: s }, ))), (Err(e), _) | (_, Err(e)) => { - warn!(target: "bitd", "Failed to fetch basics from runtime API: {:?}", e); + warn!(target: TARGET, "Failed to fetch basics from runtime API: {:?}", e); Ok(None) } }