provisioner logs minor janitor duties (#5142)

* provisioner data, one more log

* minor cleanups in provisioner logs

* remove deprecated foo in overseer

Closes #5128

* candidate_hash needs the ? prefix in gum

* demote to trace

polkadot/node/core/provisioner/src/lib.rs

@@ -213,11 +213,10 @@ impl ProvisionerJob {
 		disputes_enabled: bool,
 		span: PerLeafSpan,
 	) -> Result<(), Error> {
-		use ProvisionerMessage::{ProvisionableData, RequestInherentData};
 		loop {
 			futures::select! {
 				msg = self.receiver.next() => match msg {
-					Some(RequestInherentData(_, return_sender)) => {
+					Some(ProvisionerMessage::RequestInherentData(_, return_sender)) => {
 						let _span = span.child("req-inherent-data");
 						let _timer = self.metrics.time_request_inherent_data();
 
@@ -227,7 +226,7 @@ impl ProvisionerJob {
 							self.awaiting_inherent.push(return_sender);
 						}
 					}
-					Some(ProvisionableData(_, data)) => {
+					Some(ProvisionerMessage::ProvisionableData(_, data)) => {
 						let span = span.child("provisionable-data");
 						let _timer = self.metrics.time_provisionable_data();
 
@@ -289,8 +288,16 @@ impl ProvisionerJob {
 			ProvisionableData::Bitfield(_, signed_bitfield) =>
 				self.signed_bitfields.push(signed_bitfield),
 			ProvisionableData::BackedCandidate(backed_candidate) => {
+				let candidate_hash = backed_candidate.hash();
+				gum::trace!(
+					target: LOG_TARGET,
+					?candidate_hash,
+					para = ?backed_candidate.descriptor().para_id,
+					"noted backed candidate",
+				);
 				let _span = span
 					.child("provisionable-backed")
+					.with_candidate(candidate_hash)
 					.with_para_id(backed_candidate.descriptor().para_id);
 				self.backed_candidates.push(backed_candidate)
 			},
@@ -452,7 +459,12 @@ async fn select_candidates(
 	let mut selected_candidates =
 		Vec::with_capacity(candidates.len().min(availability_cores.len()));
 
-	gum::debug!(target: LOG_TARGET, leaf_hash=?relay_parent, "{} candidates before selection", candidates.len());
+	gum::debug!(
+		target: LOG_TARGET,
+		leaf_hash=?relay_parent,
+		n_candidates = candidates.len(),
+		"Candidate receipts (before selection)",
+	);
 
 	for (core_idx, core) in availability_cores.iter().enumerate() {
 		let (scheduled_core, assumption) = match core {
@@ -505,10 +517,10 @@ async fn select_candidates(
 			gum::trace!(
 				target: LOG_TARGET,
 				leaf_hash=?relay_parent,
-				"Selecting candidate {}. para_id={} core={}",
+				?candidate_hash,
-				candidate_hash,
+				para = ?candidate.descriptor.para_id,
-				candidate.descriptor.para_id,
+				core = core_idx,
-				core_idx,
+				"Selected candidate receipt",
 			);
 
 			selected_candidates.push(candidate_hash);
@@ -566,7 +578,7 @@ async fn select_candidates(
 		n_candidates = candidates.len(),
 		n_cores = availability_cores.len(),
 		?relay_parent,
-		"Selected candidates for cores",
+		"Selected backed candidates",
 	);
 
 	Ok(candidates)

polkadot/node/overseer/overseer-gen/proc-macro/src/impl_dispatch.rs

@@ -44,7 +44,7 @@ pub(crate) fn impl_dispatch(info: &OverseerInfo) -> TokenStream {
 			impl #message_wrapper {
 				/// Generated dispatch iterator generator.
 				pub fn dispatch_iter(extern_msg: #extern_network_ty) -> impl Iterator<Item=Self> + Send {
-					::std::array::IntoIter::new([
+					[
 					#(
 						extern_msg
 							// focuses on a `NetworkBridgeEvent< protocol_v1::* >`
@@ -59,7 +59,7 @@ pub(crate) fn impl_dispatch(info: &OverseerInfo) -> TokenStream {
 								)
 							}),
 					)*
-					])
+					]
 					.into_iter()
 					.filter_map(|x: Option<_>| x)
 				}