Track all subnet validator sets in the validator manager

vms/platformvm/block/executor/proposal_block_test.go

@@ -947,7 +947,7 @@ func TestBanffProposalBlockTrackedSubnet(t *testing.T) {
 			require.NoError(propBlk.Accept(context.Background()))
 			require.NoError(commitBlk.Accept(context.Background()))
 			_, ok := env.config.Validators.GetValidator(subnetID, subnetValidatorNodeID)
-			require.Equal(tracked, ok)
+			require.True(ok)
 		})
 	}
 }

vms/platformvm/block/executor/standard_block_test.go

@@ -747,7 +747,7 @@ func TestBanffStandardBlockTrackedSubnet(t *testing.T) {
 			require.NoError(block.Verify(context.Background()))
 			require.NoError(block.Accept(context.Background()))
 			_, ok := env.config.Validators.GetValidator(subnetID, subnetValidatorNodeID)
-			require.Equal(tracked, ok)
+			require.True(ok)
 		})
 	}
 }

vms/platformvm/state/state.go

@@ -140,10 +140,6 @@ type State interface {
 
 	GetBlockIDAtHeight(height uint64) (ids.ID, error)
 
-	// ApplyCurrentValidators adds all the current validators and delegators of
-	// [subnetID] into [vdrs].
-	ApplyCurrentValidators(subnetID ids.ID, vdrs validators.Manager) error
-
 	// ApplyValidatorWeightDiffs iterates from [startHeight] towards the genesis
 	// block until it has applied all of the diffs up to and including
 	// [endHeight]. Applying the diffs modifies [validators].
@@ -1139,26 +1135,6 @@ func (s *state) SetCurrentSupply(subnetID ids.ID, cs uint64) {
 	}
 }
 
-func (s *state) ApplyCurrentValidators(subnetID ids.ID, vdrs validators.Manager) error {
-	for nodeID, validator := range s.currentStakers.validators[subnetID] {
-		staker := validator.validator
-		if err := vdrs.AddStaker(subnetID, nodeID, staker.PublicKey, staker.TxID, staker.Weight); err != nil {
-			return err
-		}
-
-		delegatorIterator := NewTreeIterator(validator.delegators)
-		for delegatorIterator.Next() {
-			staker := delegatorIterator.Value()
-			if err := vdrs.AddWeight(subnetID, nodeID, staker.Weight); err != nil {
-				delegatorIterator.Release()
-				return err
-			}
-		}
-		delegatorIterator.Release()
-	}
-	return nil
-}
-
 func (s *state) ApplyValidatorWeightDiffs(
 	ctx context.Context,
 	validators map[ids.NodeID]*validators.GetValidatorOutput,
@@ -1689,13 +1665,28 @@ func (s *state) loadPendingValidators() error {
 // Invariant: initValidatorSets requires loadCurrentValidators to have already
 // been called.
 func (s *state) initValidatorSets() error {
-	if s.cfg.Validators.Count(constants.PrimaryNetworkID) != 0 {
-		// Enforce the invariant that the validator set is empty here.
-		return errValidatorSetAlreadyPopulated
-	}
-	err := s.ApplyCurrentValidators(constants.PrimaryNetworkID, s.cfg.Validators)
-	if err != nil {
-		return err
+	for subnetID, validators := range s.currentStakers.validators {
+		if s.cfg.Validators.Count(subnetID) != 0 {
+			// Enforce the invariant that the validator set is empty here.
+			return fmt.Errorf("%w: %s", errValidatorSetAlreadyPopulated, subnetID)
+		}
+
+		for nodeID, validator := range validators {
+			staker := validator.validator
+			if err := s.cfg.Validators.AddStaker(subnetID, nodeID, staker.PublicKey, staker.TxID, staker.Weight); err != nil {
+				return err
+			}
+
+			delegatorIterator := NewTreeIterator(validator.delegators)
+			for delegatorIterator.Next() {
+				staker := delegatorIterator.Value()
+				if err := s.cfg.Validators.AddWeight(subnetID, nodeID, staker.Weight); err != nil {
+					delegatorIterator.Release()
+					return err
+				}
+			}
+			delegatorIterator.Release()
+		}
 	}
 
 	vl := validators.NewLogger(s.ctx.Log, s.bootstrapped, constants.PrimaryNetworkID, s.ctx.NodeID)
@@ -1709,15 +1700,6 @@ func (s *state) initValidatorSets() error {
 	s.metrics.SetTotalStake(totalWeight)
 
 	for subnetID := range s.cfg.TrackedSubnets {
-		if s.cfg.Validators.Count(subnetID) != 0 {
-			// Enforce the invariant that the validator set is empty here.
-			return errValidatorSetAlreadyPopulated
-		}
-		err := s.ApplyCurrentValidators(subnetID, s.cfg.Validators)
-		if err != nil {
-			return err
-		}
-
 		vl := validators.NewLogger(s.ctx.Log, s.bootstrapped, subnetID, s.ctx.NodeID)
 		s.cfg.Validators.RegisterCallbackListener(subnetID, vl)
 	}
@@ -2109,11 +2091,6 @@ func (s *state) writeCurrentStakers(updateValidators bool, height uint64) error
 				continue
 			}
 
-			// We only track the current validator set of tracked subnets.
-			if subnetID != constants.PrimaryNetworkID && !s.cfg.TrackedSubnets.Contains(subnetID) {
-				continue
-			}
-
 			if weightDiff.Decrease {
 				err = s.cfg.Validators.RemoveWeight(subnetID, nodeID, weightDiff.Amount)
 			} else {

vms/platformvm/txs/executor/advance_time_test.go

@@ -617,7 +617,7 @@ func TestTrackedSubnet(t *testing.T) {
 			env.state.SetHeight(dummyHeight)
 			require.NoError(env.state.Commit())
 			_, ok := env.config.Validators.GetValidator(subnetID, ids.NodeID(subnetValidatorNodeID))
-			require.Equal(tracked, ok)
+			require.True(ok)
 		})
 	}
 }

vms/platformvm/validators/manager.go

@@ -48,10 +48,6 @@ type State interface {
 	GetLastAccepted() ids.ID
 	GetStatelessBlock(blockID ids.ID) (block.Block, error)
 
-	// ApplyCurrentValidators adds all the current validators and delegators of
-	// [subnetID] into [vdrs].
-	ApplyCurrentValidators(subnetID ids.ID, vdrs validators.Manager) error
-
 	// ApplyValidatorWeightDiffs iterates from [startHeight] towards the genesis
 	// block until it has applied all of the diffs up to and including
 	// [endHeight]. Applying the diffs modifies [validators].
@@ -346,22 +342,7 @@ func (m *manager) getCurrentValidatorSets(
 	ctx context.Context,
 	subnetID ids.ID,
 ) (map[ids.NodeID]*validators.GetValidatorOutput, map[ids.NodeID]*validators.GetValidatorOutput, uint64, error) {
-	subnetManager := m.cfg.Validators
-	if subnetManager.Count(subnetID) == 0 {
-		// If this subnet isn't tracked, there will not be any registered
-		// validators. To calculate the current validators we need to first
-		// fetch them from state. We generate a new manager as we don't want to
-		// modify that long-lived reference.
-		//
-		// TODO: remove this once all subnets are included in the validator
-		// manager.
-		subnetManager = validators.NewManager()
-		if err := m.state.ApplyCurrentValidators(subnetID, subnetManager); err != nil {
-			return nil, nil, 0, err
-		}
-	}
-
-	subnetMap := subnetManager.GetMap(subnetID)
+	subnetMap := m.cfg.Validators.GetMap(subnetID)
 	primaryMap := m.cfg.Validators.GetMap(constants.PrimaryNetworkID)
 	currentHeight, err := m.getCurrentHeight(ctx)
 	return subnetMap, primaryMap, currentHeight, err

vms/platformvm/vm_regression_test.go

@@ -1397,9 +1397,6 @@ func TestRemovePermissionedValidatorDuringPendingToCurrentTransitionTracked(t *t
 	require.NoError(createSubnetBlock.Accept(context.Background()))
 	require.NoError(vm.SetPreference(context.Background(), vm.manager.LastAccepted()))
 
-	vm.TrackedSubnets.Add(createSubnetTx.ID())
-	require.NoError(vm.state.ApplyCurrentValidators(createSubnetTx.ID(), vm.Validators))
-
 	addSubnetValidatorTx, err := vm.txBuilder.NewAddSubnetValidatorTx(
 		defaultMaxValidatorStake,
 		uint64(validatorStartTime.Unix()),