Asynchronous backing statement distribution: Take III

node/network/statement-distribution/src/vstaging/mod.rs

@@ -419,6 +419,7 @@ pub(crate) async fn handle_active_leaves_update<Context>(
 		// New leaf: fetch info from runtime API and initialize
 		// `per_relay_parent`.
 
+		// TODO [now]: Didn't we already request this in `lib.rs`?
 		let mode = prospective_parachains_mode(ctx.sender(), new_relay_parent).await;
 
 		// request prospective parachains mode, skip disabled relay-parents

node/network/statement-distribution/src/vstaging/tests/cluster.rs

@@ -16,6 +16,8 @@
 
 use super::*;
 
+use polkadot_primitives_test_helpers::make_candidate;
+
 #[test]
 fn share_seconded_circulated_to_cluster() {
 	let config = TestConfig {
@@ -33,12 +35,13 @@ fn share_seconded_circulated_to_cluster() {
 		let local_validator = state.local.clone().unwrap();
 		let local_para = ParaId::from(local_validator.group_index.0);
 
-		let (pvd, candidate) = make_committed_candidate(
-			local_para,
+		let (candidate, pvd) = make_candidate(
 			relay_parent,
 			1,
+			local_para,
 			vec![1, 2, 3].into(),
 			vec![4, 5, 6].into(),
+			Hash::repeat_byte(42).into(),
 		);
 		let candidate_hash = candidate.hash();
 

node/network/statement-distribution/src/vstaging/tests/mod.rs

@@ -477,42 +477,3 @@ async fn send_new_topology(virtual_overseer: &mut VirtualOverseer, topology: New
 		})
 		.await;
 }
-
-fn make_committed_candidate(
-	para_id: ParaId,
-	relay_parent: Hash,
-	relay_parent_number: BlockNumber,
-	parent_head: HeadData,
-	para_head: HeadData,
-) -> (PersistedValidationData, CommittedCandidateReceipt) {
-	let persisted_validation_data = PersistedValidationData {
-		parent_head,
-		relay_parent_number,
-		relay_parent_storage_root: Hash::repeat_byte(69),
-		max_pov_size: 1_000_000,
-	};
-
-	let candidate = CommittedCandidateReceipt {
-		descriptor: CandidateDescriptor {
-			para_id,
-			relay_parent,
-			collator: polkadot_primitives_test_helpers::dummy_collator(),
-			persisted_validation_data_hash: persisted_validation_data.hash(),
-			pov_hash: Hash::repeat_byte(1),
-			erasure_root: Hash::repeat_byte(1),
-			signature: polkadot_primitives_test_helpers::dummy_collator_signature(),
-			para_head: para_head.hash(),
-			validation_code_hash: Hash::repeat_byte(42).into(),
-		},
-		commitments: CandidateCommitments {
-			upward_messages: Vec::new(),
-			horizontal_messages: Vec::new(),
-			new_validation_code: None,
-			head_data: para_head,
-			processed_downward_messages: 1,
-			hrmp_watermark: relay_parent_number,
-		},
-	};
-
-	(persisted_validation_data, candidate)
-}