Refactor candidate validation messages (#2219)

paritytech · Nov 8, 2023 · 5039095 · 5039095
1 parent 1bc0885
commit 5039095
Show file tree

Hide file tree

Showing 14 changed files with 384 additions and 354 deletions.
diff --git a/polkadot/node/core/approval-voting/src/lib.rs b/polkadot/node/core/approval-voting/src/lib.rs
@@ -2861,15 +2861,15 @@ async fn launch_approval<Context>(
 
 		let (val_tx, val_rx) = oneshot::channel();
 		sender
-			.send_message(CandidateValidationMessage::ValidateFromExhaustive(
-				available_data.validation_data,
+			.send_message(CandidateValidationMessage::ValidateFromExhaustive {
+				validation_data: available_data.validation_data,
 				validation_code,
-				candidate.clone(),
-				available_data.pov,
+				candidate_receipt: candidate.clone(),
+				pov: available_data.pov,
 				executor_params,
-				PvfExecTimeoutKind::Approval,
-				val_tx,
-			))
+				exec_timeout_kind: PvfExecTimeoutKind::Approval,
+				response_sender: val_tx,
+			})
 			.await;
 
 		match val_rx.await {

diff --git a/polkadot/node/core/approval-voting/src/tests.rs b/polkadot/node/core/approval-voting/src/tests.rs
@@ -2704,8 +2704,12 @@ async fn handle_double_assignment_import(
 
 	assert_matches!(
 		overseer_recv(virtual_overseer).await,
-		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)) if timeout == PvfExecTimeoutKind::Approval => {
-			tx.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
+		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive {
+			exec_timeout_kind,
+			response_sender,
+			..
+		}) if exec_timeout_kind == PvfExecTimeoutKind::Approval => {
+			response_sender.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
 				.unwrap();
 		}
 	);

diff --git a/polkadot/node/core/backing/src/lib.rs b/polkadot/node/core/backing/src/lib.rs
@@ -551,24 +551,24 @@ async fn request_pov(
 
 async fn request_candidate_validation(
 	sender: &mut impl overseer::CandidateBackingSenderTrait,
-	pvd: PersistedValidationData,
-	code: ValidationCode,
+	validation_data: PersistedValidationData,
+	validation_code: ValidationCode,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
 	executor_params: ExecutorParams,
 ) -> Result<ValidationResult, Error> {
 	let (tx, rx) = oneshot::channel();
 
 	sender
-		.send_message(CandidateValidationMessage::ValidateFromExhaustive(
-			pvd,
-			code,
+		.send_message(CandidateValidationMessage::ValidateFromExhaustive {
+			validation_data,
+			validation_code,
 			candidate_receipt,
 			pov,
 			executor_params,
-			PvfExecTimeoutKind::Backing,
-			tx,
-		))
+			exec_timeout_kind: PvfExecTimeoutKind::Backing,
+			response_sender: tx,
+		})
 		.await;
 
 	match rx.await {