Use CandidateIndex as opposed to CoreIndex.

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

@@ -1209,9 +1209,9 @@ async fn get_approval_signatures_for_candidate<Context>(
 			None => continue,
 			Some(e) => e,
 		};
-		for (core_index, c_hash) in entry.candidates() {
+		for (candidate_index, (_core_index, c_hash)) in entry.candidates().iter().enumerate() {
 			if c_hash == &candidate_hash {
-				candidate_indices.insert((*hash, *core_index));
+				candidate_indices.insert((*hash, candidate_index as u32));
 				break
 			}
 		}

node/network/approval-distribution/src/lib.rs

@@ -1213,10 +1213,10 @@ impl State {
 	/// Retrieve approval signatures from state for the given relay block/indices:
 	fn get_approval_signatures(
 		&mut self,
-		indices: HashSet<(Hash, CoreIndex)>,
+		indices: HashSet<(Hash, CandidateIndex)>,
 	) -> HashMap<ValidatorIndex, ValidatorSignature> {
 		let mut all_sigs = HashMap::new();
-		for (hash, CoreIndex(index)) in indices {
+		for (hash, index) in indices {
 			let block_entry = match self.blocks.get(&hash) {
 				None => {
 					gum::debug!(

node/subsystem-types/src/messages.rs

@@ -40,7 +40,7 @@ use polkadot_node_primitives::{
 };
 use polkadot_primitives::v2::{
 	AuthorityDiscoveryId, BackedCandidate, BlockNumber, CandidateEvent, CandidateHash,
-	CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt, CoreIndex, CoreState,
+	CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt, CoreState,
 	DisputeState, GroupIndex, GroupRotationInfo, Hash, Header as BlockHeader, Id as ParaId,
 	InboundDownwardMessage, InboundHrmpMessage, MultiDisputeStatementSet, OccupiedCoreAssumption,
 	PersistedValidationData, PvfCheckStatement, SessionIndex, SessionInfo,
@@ -928,7 +928,7 @@ pub enum ApprovalDistributionMessage {
 
 	/// Get all approval signatures for all chains a candidate appeared in.
 	GetApprovalSignatures(
-		HashSet<(Hash, CoreIndex)>,
+		HashSet<(Hash, CandidateIndex)>,
 		oneshot::Sender<HashMap<ValidatorIndex, ValidatorSignature>>,
 	),
 }