Address Feedback

node/core/approval-voting/src/lib.rs

@@ -509,8 +509,6 @@ impl ApprovalState {
 }
 
 struct CurrentlyCheckingSet {
-	/// Invariant: The contained `Vec` needs to stay sorted as we are using `binary_search_by_key`
-	/// on it.
 	candidate_hash_map: HashMap<CandidateHash, HashSet<Hash>>,
 	currently_checking: FuturesUnordered<BoxFuture<'static, ApprovalState>>,
 }

node/core/approval-voting/src/tests.rs

@@ -2195,7 +2195,7 @@ fn subsystem_validate_approvals_cache() {
 		let block_hash = Hash::repeat_byte(0x01);
 		let fork_block_hash = Hash::repeat_byte(0x02);
 		let candidate_commitments = CandidateCommitments::default();
-		let mut candidate_receipt = CandidateReceipt::<Hash>::default();
+		let mut candidate_receipt = dummy_candidate_receipt(block_hash);
 		candidate_receipt.commitments_hash = candidate_commitments.hash();
 		let candidate_hash = candidate_receipt.hash();
 		let slot = Slot::from(1);
@@ -2225,30 +2225,19 @@ fn subsystem_validate_approvals_cache() {
 			no_show_slots: 2,
 		};
 
+		let candidates = Some(vec![(candidate_receipt.clone(), CoreIndex(0), GroupIndex(0))]);
 		ChainBuilder::new()
 			.add_block(
 				block_hash,
 				ChainBuilder::GENESIS_HASH,
 				1,
-				BlockConfig {
-					slot,
-					candidates: Some(vec![(
-						candidate_receipt.clone(),
-						CoreIndex(0),
-						GroupIndex(0),
-					)]),
-					session_info: Some(session_info.clone()),
-				},
+				BlockConfig { slot, candidates, session_info: Some(session_info.clone()) },
 			)
 			.add_block(
 				fork_block_hash,
 				ChainBuilder::GENESIS_HASH,
 				1,
-				BlockConfig {
-					slot,
-					candidates: Some(vec![(candidate_receipt, CoreIndex(0), GroupIndex(0))]),
-					session_info: Some(session_info),
-				},
+				BlockConfig { slot, candidates, session_info: Some(session_info) },
 			)
 			.build(&mut virtual_overseer)
 			.await;