Update dispute participation on active leaves update

node/core/dispute-coordinator/src/initialized.rs

@@ -417,7 +417,7 @@ impl Initialized {
 				})
 				.collect();
 
-			// Importantly, handling import statements for backing votes also 
+			// Importantly, handling import statements for backing votes also
 			// clears spam slots for any newly backed candidates
 			let import_result = self
 				.handle_import_statements(
@@ -838,8 +838,8 @@ impl Initialized {
 		let is_disputed = new_state.is_disputed();
 		let has_controlled_indices = !env.controlled_indices().is_empty();
 		let is_confirmed = new_state.is_confirmed();
-		let potential_spam = !is_included && !is_backed 
-			&& !new_state.is_confirmed() && !new_state.has_own_vote();
+		let potential_spam =
+			!is_included && !is_backed && !new_state.is_confirmed() && !new_state.has_own_vote();
 		// We participate only in disputes which are included, backed or confirmed
 		let allow_participation = is_included || is_backed || is_confirmed;
 
@@ -854,8 +854,8 @@ impl Initialized {
 			"Is spam?"
 		);
 
-		// This check is responsible for all clearing of spam slots. It runs 
-		// whenever a vote is imported from on or off chain, and decrements 
+		// This check is responsible for all clearing of spam slots. It runs
+		// whenever a vote is imported from on or off chain, and decrements
 		// slots whenever a candidate is newly backed, confirmed, or has our
 		// own vote.
 		if !potential_spam {

node/core/dispute-coordinator/src/participation/mod.rs

@@ -213,14 +213,15 @@ impl Participation {
 	}
 
 	/// Reprioritizes participation requests for disputes that are freshly included
-	pub async fn prioritize_newly_included<Context>(&mut self, ctx: &mut Context, included_receipts: &Vec<CandidateReceipt>) {
+	pub async fn prioritize_newly_included<Context>(
+		&mut self,
+		ctx: &mut Context,
+		included_receipts: &Vec<CandidateReceipt>,
+	) {
 		for receipt in included_receipts {
 			let r = self.queue.prioritize_if_present(ctx.sender(), receipt).await;
-			if let Err(queue_error) = r {
-				match queue_error {
-					QueueError::PriorityFull => return, // Avoid working through the rest of the vec
-					_ => (),
-				}
+			if let Err(QueueError::PriorityFull) = r {
+					return // Avoid working through the rest of the vec
 			}
 		}
 	}

node/core/dispute-coordinator/src/participation/queues/mod.rs

@@ -67,7 +67,7 @@ pub struct ParticipationRequest {
 }
 
 /// Whether a `ParticipationRequest` should be put on best-effort or the priority queue.
-#[derive(Debug, PartialEq)]
+#[derive(Debug)]
 pub enum ParticipationPriority {
 	BestEffort,
 	Priority,
@@ -164,16 +164,18 @@ impl Queues {
 	/// Reprioritizes any participation requests pertaining to the
 	/// passed candidates from best effort to priority.
 	pub async fn prioritize_if_present(
-		&mut self, 
+		&mut self,
 		sender: &mut impl overseer::DisputeCoordinatorSenderTrait,
 		receipt: &CandidateReceipt,
-	) -> std::result::Result<(), QueueError>{
+	) -> std::result::Result<(), QueueError> {
 		if self.priority.len() >= PRIORITY_QUEUE_SIZE {
 			return Err(QueueError::PriorityFull)
 		}
 
-		let comparator = CandidateComparator::new(sender, receipt).await.map_err(|_e| QueueError::CouldNotGenerateComparator)?;
-		if let Some(request) = self.best_effort.remove(&comparator){
+		let comparator = CandidateComparator::new(sender, receipt)
+			.await
+			.map_err(|_e| QueueError::CouldNotGenerateComparator)?;
+		if let Some(request) = self.best_effort.remove(&comparator) {
 			self.priority.insert(comparator, request);
 		}
 		Ok(())

node/core/dispute-coordinator/src/scraping/mod.rs

@@ -26,7 +26,7 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_util::runtime::{get_candidate_events, get_on_chain_votes};
 use polkadot_primitives::v2::{
-	BlockNumber, CandidateEvent, CandidateHash, Hash, ScrapedOnChainVotes, CandidateReceipt,
+	BlockNumber, CandidateEvent, CandidateHash, CandidateReceipt, Hash, ScrapedOnChainVotes,
 };
 
 use crate::{
@@ -132,7 +132,8 @@ impl ChainScraper {
 	///
 	/// and updates current heads, so we can query candidates for all non finalized blocks.
 	///
-	/// Returns: On chain vote for the leaf and any ancestors we might not yet have seen.
+	/// Returns: On chain votes and included candidate receipts for the leaf and any
+	/// ancestors we might not yet have seen.
 	pub async fn process_active_leaves_update<Sender>(
 		&mut self,
 		sender: &mut Sender,
@@ -162,7 +163,8 @@ impl ChainScraper {
 		for (block_number, block_hash) in block_numbers.zip(block_hashes) {
 			gum::trace!(?block_number, ?block_hash, "In ancestor processing.");
 
-			let events_for_block = self.process_candidate_events(sender, block_number, block_hash).await?;
+			let events_for_block =
+				self.process_candidate_events(sender, block_number, block_hash).await?;
 			included_receipts.extend(events_for_block);
 
 			if let Some(votes) = get_on_chain_votes(sender, block_hash).await? {

node/core/dispute-coordinator/src/tests.rs

@@ -3208,15 +3208,10 @@ fn local_participation_in_dispute_for_backed_candidate() {
 			let candidate_hash = candidate_receipt.hash();
 
 			// Step 1: Show that we don't participate when not backed, confirmed, or included
-			
+
 			// activate leaf - without candidate backed event
 			test_state
-				.activate_leaf_at_session(
-					&mut virtual_overseer,
-					session,
-					1,
-					vec![],
-				)
+				.activate_leaf_at_session(&mut virtual_overseer, session, 1, vec![])
 				.await;
 
 			// generate two votes
@@ -3270,21 +3265,20 @@ fn local_participation_in_dispute_for_backed_candidate() {
 				.await;
 
 			let backing_valid = test_state
-				.issue_backing_statement_with_index(ValidatorIndex(3), candidate_hash, session).await;
+				.issue_backing_statement_with_index(ValidatorIndex(3), candidate_hash, session)
+				.await;
 
 			virtual_overseer
 				.send(FromOrchestra::Communication {
 					msg: DisputeCoordinatorMessage::ImportStatements {
 						candidate_receipt: candidate_receipt.clone(),
 						session,
-						statements: vec![
-							(backing_valid, ValidatorIndex(3))
-						],
+						statements: vec![(backing_valid, ValidatorIndex(3))],
 						pending_confirmation: None,
 					},
 				})
 				.await;
-			
+
 			participation_with_distribution(
 				&mut virtual_overseer,
 				&candidate_hash,
@@ -3323,4 +3317,4 @@ fn local_participation_in_dispute_for_backed_candidate() {
 			test_state
 		})
 	});
-}
+}