chore(dot/parachain): consistently use ParaID type

ChainSafe · Oct 24, 2024 · adcc739 · adcc739
1 parent cc73286
commit adcc739
Show file tree

Hide file tree

Showing 36 changed files with 89 additions and 82 deletions.
diff --git a/dot/core/mock_runtime_instance_test.go b/dot/core/mock_runtime_instance_test.go
diff --git a/dot/parachain/availability-store/mock_runtime_instance_test.go b/dot/parachain/availability-store/mock_runtime_instance_test.go
diff --git a/dot/parachain/backing/active_leaves_update.go b/dot/parachain/backing/active_leaves_update.go
@@ -337,7 +337,7 @@ func constructPerRelayParentState(
 		case parachaintypes.OccupiedCore:
 			if mode.IsEnabled {
 				// Async backing makes it legal to build on top of occupied core.
-				coreParaID = parachaintypes.ParaID(v.CandidateDescriptor.ParaID)
+				coreParaID = v.CandidateDescriptor.ParaID
 			} else {
 				continue
 			}

diff --git a/dot/parachain/backing/can_second.go b/dot/parachain/backing/can_second.go
@@ -88,7 +88,7 @@ func (cb *CandidateBacking) secondingSanityCheck(
 		candidateRelayParent = v.RelayParent
 		candidateHash = v.CandidateHash
 	case parachaintypes.HypotheticalCandidateComplete:
-		candidateParaID = parachaintypes.ParaID(v.CommittedCandidateReceipt.Descriptor.ParaID)
+		candidateParaID = v.CommittedCandidateReceipt.Descriptor.ParaID
 		candidateRelayParent = v.CommittedCandidateReceipt.Descriptor.RelayParent
 		candidateHash = v.CandidateHash
 	}

diff --git a/dot/parachain/backing/candidate_backing_test.go b/dot/parachain/backing/candidate_backing_test.go
@@ -51,7 +51,7 @@ func getDummyCommittedCandidateReceipt(t *testing.T) parachaintypes.CommittedCan
 
 	ccr := parachaintypes.CommittedCandidateReceipt{
 		Descriptor: parachaintypes.CandidateDescriptor{
-			ParaID:                      uint32(1),
+			ParaID:                      1,
 			RelayParent:                 hash5,
 			Collator:                    collatorID,
 			PersistedValidationDataHash: hash5,

diff --git a/dot/parachain/backing/integration_test.go b/dot/parachain/backing/integration_test.go
@@ -101,7 +101,7 @@ func makeErasureRoot(
 // newCommittedCandidate creates a new committed candidate receipt for testing purposes.
 func newCommittedCandidate(
 	t *testing.T,
-	paraID uint32, //nolint:unparam
+	paraID parachaintypes.ParaID, //nolint:unparam
 	headData parachaintypes.HeadData,
 	povHash, relayParent, erasureRoot, pvdHash common.Hash,
 	validationCode parachaintypes.ValidationCode,
@@ -265,7 +265,7 @@ func TestSecondsValidCandidate(t *testing.T) {
 	paraValidators := parachainValidators(t, candidateBacking.Keystore)
 	numOfValidators := uint(len(paraValidators))
 	relayParent := getDummyHash(t, 5)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 
 	ctrl := gomock.NewController(t)
 	mockBlockState := backing.NewMockBlockState(ctrl)
@@ -443,7 +443,7 @@ func TestCandidateReachesQuorum(t *testing.T) {
 	paraValidators := parachainValidators(t, candidateBacking.Keystore)
 	numOfValidators := uint(len(paraValidators))
 	relayParent := getDummyHash(t, 5)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 
 	pov := parachaintypes.PoV{BlockData: []byte{1, 2, 3}}
 	povHash, err := pov.Hash()
@@ -635,7 +635,7 @@ func TestValidationFailDoesNotStopSubsystem(t *testing.T) {
 	paraValidators := parachainValidators(t, candidateBacking.Keystore)
 	numOfValidators := uint(len(paraValidators))
 	relayParent := getDummyHash(t, 5)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 
 	pov := parachaintypes.PoV{BlockData: []byte{1, 2, 3}}
 	povHash, err := pov.Hash()
@@ -778,7 +778,7 @@ func TestCanNotSecondMultipleCandidatesPerRelayParent(t *testing.T) {
 	paraValidators := parachainValidators(t, candidateBacking.Keystore)
 	numOfValidators := uint(len(paraValidators))
 	relayParent := getDummyHash(t, 5)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 
 	ctrl := gomock.NewController(t)
 	mockBlockState := backing.NewMockBlockState(ctrl)
@@ -922,7 +922,7 @@ func TestNewLeafDoesNotClobberOld(t *testing.T) {
 	numOfValidators := uint(len(paraValidators))
 	relayParent1 := getDummyHash(t, 5)
 	relayParent2 := getDummyHash(t, 6)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 	validationCode := parachaintypes.ValidationCode{1, 2, 3}
 
 	ctrl := gomock.NewController(t)
@@ -1045,7 +1045,7 @@ func TestConflictingStatementIsMisbehavior(t *testing.T) {
 	paraValidators := parachainValidators(t, candidateBacking.Keystore)
 	numOfValidators := uint(len(paraValidators))
 	relayParent := getDummyHash(t, 5)
-	paraID := uint32(1)
+	paraID := parachaintypes.ParaID(1)
 
 	pov := parachaintypes.PoV{BlockData: []byte{1, 2, 3}}
 	povHash, err := pov.Hash()

diff --git a/dot/parachain/backing/mocks_runtime_test.go b/dot/parachain/backing/mocks_runtime_test.go
diff --git a/dot/parachain/backing/per_relay_parent_state.go b/dot/parachain/backing/per_relay_parent_state.go
@@ -73,7 +73,7 @@ func (rpState *perRelayParentState) importStatement(
 		return nil, errNilPersistedValidationData
 	}
 
-	paraID := parachaintypes.ParaID(committedCandidateReceipt.Descriptor.ParaID)
+	paraID := committedCandidateReceipt.Descriptor.ParaID
 
 	if rpState.prospectiveParachainsMode.IsEnabled {
 		chIntroduceCandidate := make(chan error)
@@ -161,13 +161,13 @@ func (rpState *perRelayParentState) postImportStatement(subSystemToOverseer chan
 
 		// Inform the prospective parachains subsystem that the candidate is now backed.
 		subSystemToOverseer <- parachaintypes.ProspectiveParachainsMessageCandidateBacked{
-			ParaID:        parachaintypes.ParaID(paraID),
+			ParaID:        paraID,
 			CandidateHash: candidateHash,
 		}
 
 		// Backed candidate potentially unblocks new advertisements, notify collator protocol.
 		subSystemToOverseer <- collatorprotocolmessages.Backed{
-			ParaID:   parachaintypes.ParaID(paraID),
+			ParaID:   paraID,
 			ParaHead: backedCandidate.Candidate.Descriptor.ParaHead,
 		}
 
@@ -393,7 +393,7 @@ func getPovFromValidator(
 	fetchPov := parachaintypes.AvailabilityDistributionMessageFetchPoV{
 		RelayParent:   relayParent,
 		FromValidator: attesting.fromValidator,
-		ParaID:        parachaintypes.ParaID(attesting.candidate.Descriptor.ParaID),
+		ParaID:        attesting.candidate.Descriptor.ParaID,
 		CandidateHash: candidateHash,
 		PovHash:       attesting.povHash,
 		PovCh:         make(chan parachaintypes.OverseerFuncRes[parachaintypes.PoV]),

diff --git a/dot/parachain/backing/second.go b/dot/parachain/backing/second.go
@@ -56,7 +56,7 @@ func (cb *CandidateBacking) handleSecondMessage(
 	}
 
 	// Sanity check that candidate is from our assignment.
-	if candidateReceipt.Descriptor.ParaID != uint32(*rpState.assignment) {
+	if candidateReceipt.Descriptor.ParaID != *rpState.assignment {
 		return fmt.Errorf("%w: candidate hash: %s; candidate paraID: %d; assignment: %d",
 			errParaOutsideAssignmentForSeconding,
 			candidateHash,

diff --git a/dot/parachain/backing/statement_table.go b/dot/parachain/backing/statement_table.go
@@ -180,7 +180,7 @@ func (table *statementTable) importCandidate(
 	signature parachaintypes.ValidatorSignature,
 	tableCtx *tableContext,
 ) (*Summary, parachaintypes.Misbehaviour, error) {
-	paraID := parachaintypes.ParaID(candidate.Descriptor.ParaID)
+	paraID := candidate.Descriptor.ParaID
 
 	if !tableCtx.isMemberOf(authority, paraID) {
 		statementSeconded := parachaintypes.NewStatementVDT()

diff --git a/dot/parachain/backing/statement_table_test.go b/dot/parachain/backing/statement_table_test.go
@@ -255,7 +255,7 @@ func TestStatementTable_importCandidate(t *testing.T) {
 			expectedMisehaviour: nil,
 			expectedSummary: &Summary{
 				Candidate:     candidateHash,
-				GroupID:       parachaintypes.ParaID(candidate.Descriptor.ParaID),
+				GroupID:       candidate.Descriptor.ParaID,
 				ValidityVotes: 1,
 			},
 		},
@@ -327,7 +327,7 @@ func TestStatementTable_importCandidate(t *testing.T) {
 			expectedMisehaviour: nil,
 			expectedSummary: &Summary{
 				Candidate:     candidateHash,
-				GroupID:       parachaintypes.ParaID(candidate.Descriptor.ParaID),
+				GroupID:       candidate.Descriptor.ParaID,
 				ValidityVotes: 1,
 			},
 		},
@@ -362,7 +362,7 @@ func TestStatementTable_importCandidate(t *testing.T) {
 			expectedMisehaviour: nil,
 			expectedSummary: &Summary{
 				Candidate:     candidateHash,
-				GroupID:       parachaintypes.ParaID(candidate.Descriptor.ParaID),
+				GroupID:       candidate.Descriptor.ParaID,
 				ValidityVotes: 1,
 			},
 		},
@@ -461,7 +461,7 @@ func TestStatementTable_validityVote(t *testing.T) {
 			expectedMisehaviour: nil,
 			expectedSummary: &Summary{
 				Candidate:     candidateHash,
-				GroupID:       parachaintypes.ParaID(committedCandidate.Descriptor.ParaID),
+				GroupID:       committedCandidate.Descriptor.ParaID,
 				ValidityVotes: 1,
 			},
 		},

diff --git a/dot/parachain/backing/validated_candidate_command.go b/dot/parachain/backing/validated_candidate_command.go
@@ -234,10 +234,10 @@ func (cb *CandidateBacking) handleCommandSecond(
 			continue
 		}
 
-		secondedAtDepth, ok := leafState.secondedAtDepth[parachaintypes.ParaID(candidate.Descriptor.ParaID)]
+		secondedAtDepth, ok := leafState.secondedAtDepth[candidate.Descriptor.ParaID]
 		if !ok {
 			var btreeMap btree.Map[uint, parachaintypes.CandidateHash]
-			leafState.secondedAtDepth[parachaintypes.ParaID(candidate.Descriptor.ParaID)] = &btreeMap
+			leafState.secondedAtDepth[candidate.Descriptor.ParaID] = &btreeMap
 			secondedAtDepth = &btreeMap
 		}
 

diff --git a/dot/parachain/candidate-validation/candidate_validation.go b/dot/parachain/candidate-validation/candidate_validation.go
@@ -126,7 +126,7 @@ type PoVRequestor interface {
 }
 
 // getValidationData gets validation data for a parachain block from the runtime instance
-func getValidationData(runtimeInstance parachainruntime.RuntimeInstance, paraID uint32,
+func getValidationData(runtimeInstance parachainruntime.RuntimeInstance, paraID parachaintypes.ParaID,
 ) (*parachaintypes.PersistedValidationData, *parachaintypes.ValidationCode, error) {
 
 	var mergedError error
@@ -211,8 +211,9 @@ func (cv *CandidateValidation) validateFromChainState(msg ValidateFromChainState
 		}
 		return
 	}
-	valid, err := runtimeInstance.ParachainHostCheckValidationOutputs(parachaintypes.ParaID(msg.CandidateReceipt.
-		Descriptor.ParaID), result.Valid.CandidateCommitments)
+	valid, err := runtimeInstance.ParachainHostCheckValidationOutputs(
+		msg.CandidateReceipt.Descriptor.ParaID,
+		result.Valid.CandidateCommitments)
 	if err != nil {
 		msg.Ch <- parachaintypes.OverseerFuncRes[ValidationResult]{
 			Err: fmt.Errorf("check validation outputs: Bad request: %w", err),

diff --git a/dot/parachain/candidate-validation/candidate_validation_test.go b/dot/parachain/candidate-validation/candidate_validation_test.go
@@ -27,7 +27,7 @@ var (
 	badParent        = BadParent
 )
 
-func createTestCandidateReceiptAndValidationCodeWParaId(t *testing.T, id uint32) (
+func createTestCandidateReceiptAndValidationCodeWParaId(t *testing.T, id parachaintypes.ParaID) (
 	parachaintypes.CandidateReceipt, parachaintypes.ValidationCode) {
 	t.Helper()
 	// this wasm was achieved by building polkadot's adder test parachain
@@ -58,7 +58,7 @@ func createTestCandidateReceiptAndValidationCodeWParaId(t *testing.T, id uint32)
 	return candidateReceipt, validationCode
 }
 
-func makeValidCandidateDescriptor(t *testing.T, paraID uint32, relayParent common.Hash,
+func makeValidCandidateDescriptor(t *testing.T, paraID parachaintypes.ParaID, relayParent common.Hash,
 	persistedValidationDataHash common.Hash, povHash common.Hash,
 	validationCodeHash parachaintypes.ValidationCodeHash, paraHead common.Hash, erasureRoot common.Hash,
 	collator sr25519.Keypair,

diff --git a/dot/parachain/candidate-validation/mocks_instance_test.go b/dot/parachain/candidate-validation/mocks_instance_test.go
diff --git a/dot/parachain/collator-protocol/collation_fetching_test.go b/dot/parachain/collator-protocol/collation_fetching_test.go
@@ -40,7 +40,7 @@ func TestCollationFetchingResponse(t *testing.T) {
 	collation := parachaintypes.Collation{
 		CandidateReceipt: parachaintypes.CandidateReceipt{
 			Descriptor: parachaintypes.CandidateDescriptor{
-				ParaID:                      uint32(1),
+				ParaID:                      1,
 				RelayParent:                 testHash,
 				Collator:                    collatorID,
 				PersistedValidationDataHash: testHash,

diff --git a/dot/parachain/collator-protocol/message.go b/dot/parachain/collator-protocol/message.go
@@ -388,11 +388,11 @@ func (cpvs CollatorProtocolValidatorSide) processCollatorProtocolMessage(sender
 		}
 
 		// NOTE: assignments are setting when we handle view changes
-		_, ok = cpvs.currentAssignments[parachaintypes.ParaID(declareMessage.ParaID)]
+		_, ok = cpvs.currentAssignments[declareMessage.ParaID]
 		if ok {
 			logger.Errorf("declared as collator for current para: %d", declareMessage.ParaID)
 
-			peerData.SetCollating(declareMessage.CollatorId, parachaintypes.ParaID(declareMessage.ParaID))
+			peerData.SetCollating(declareMessage.CollatorId, declareMessage.ParaID)
 			cpvs.peerData[sender] = peerData
 		} else {
 			logger.Errorf("declared as collator for unneeded para: %d", declareMessage.ParaID)