nits

vms/platformvm/blocks/executor/acceptor.go

@@ -315,6 +315,6 @@ func (a *acceptor) commonAccept(b blocks.Block) error {
 	a.state.SetLastAccepted(blkID)
 	a.state.SetHeight(b.Height())
 	a.state.AddStatelessBlock(b, choices.Accepted)
-	a.validators.Track(blkID)
+	a.validators.OnAcceptedBlockID(blkID)
 	return nil
 }

vms/platformvm/validators/manager.go

@@ -35,20 +35,22 @@ var (
 	ErrMissingValidatorSet = errors.New("missing validator set")
 )
 
-// P-chain must be able to provide information about validators active
-// at different heights. [QueryManager] interface encapsulates all the machinery
-// to achieve this.
+// QueryManager encapsulates the logic that allows the P-chain to provide
+// information about validators active at different heights.
 type QueryManager interface {
 	validators.State
 
 	GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool)
 }
 
-// Manager interface adds to QueribleSet the ability to blocks IDs
+// Manager interface adds to QueryManager the ability to blocks IDs
 // to serve GetMinimumHeight
 type Manager interface {
 	QueryManager
-	Track(blkID ids.ID)
+
+	// OnAcceptedBlockID register the ID of the latest accepted block.
+	// It is used to update [recentlyAccepted] sliding window.
+	OnAcceptedBlockID(blkID ids.ID)
 }
 
 func NewManager(
@@ -102,9 +104,9 @@ type manager struct {
 // height which is likely (but not guaranteed) to also be older than the
 // window's configured TTL.
 //
-// If [UseCurrentHeight] is true, we will always return the last accepted block
-// height as the minimum. This is used to trigger the proposervm on recently
-// created subnets before [recentlyAcceptedWindowTTL].
+// If [UseCurrentHeight] is true, we override the block selection policy
+// described above and we will always return the last accepted block height
+// as the minimum.
 func (m *manager) GetMinimumHeight(ctx context.Context) (uint64, error) {
 	if m.cfg.UseCurrentHeight {
 		return m.GetCurrentHeight(ctx)
@@ -262,7 +264,7 @@ func (m *manager) GetValidatorSet(ctx context.Context, height uint64, subnetID i
 	return vdrSet, nil
 }
 
-// GetCurrentHeight returns the height of the last accepted block
+// GetSubnetID returns subnetID of the specified chainID
 func (m *manager) GetSubnetID(_ context.Context, chainID ids.ID) (ids.ID, error) {
 	if chainID == constants.PlatformChainID {
 		return constants.PrimaryNetworkID, nil
@@ -298,6 +300,6 @@ func (m *manager) GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool) {
 	return validatorIDs, true
 }
 
-func (m *manager) Track(blkID ids.ID) {
+func (m *manager) OnAcceptedBlockID(blkID ids.ID) {
 	m.recentlyAccepted.Add(blkID)
 }

vms/platformvm/validators/manager_test.go

@@ -40,9 +40,6 @@ var defaultRewardConfig = reward.Config{
 }
 
 func TestVM_GetValidatorSet(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
 	// Populate the validator set to use below
 	var (
 		numVdrs       = 4
@@ -71,10 +68,10 @@ func TestVM_GetValidatorSet(t *testing.T) {
 		currentPrimaryNetworkValidators []*validators.Validator
 		currentSubnetValidators         []*validators.Validator
 		// Diff at tip, block before tip, etc.
-		// This must have [height] - [lastAcceptedHeight] elements
+		// This must have [lastAcceptedHeight] - [height] elements
 		weightDiffs []map[ids.NodeID]*state.ValidatorWeightDiff
 		// Diff at tip, block before tip, etc.
-		// This must have [height] - [lastAcceptedHeight] elements
+		// This must have [lastAcceptedHeight] - [height] elements
 		pkDiffs        []map[ids.NodeID]*bls.PublicKey
 		expectedVdrSet map[ids.NodeID]*validators.GetValidatorOutput
 		expectedErr    error
@@ -368,6 +365,8 @@ func TestVM_GetValidatorSet(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			r := require.New(t)
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
 
 			// setup validators set
 			vdrs := validators.NewMockManager(ctrl)

vms/platformvm/validators/test_manager.go

@@ -33,4 +33,4 @@ func (testManager) GetValidatorSet(context.Context, uint64, ids.ID) (map[ids.Nod
 func (testManager) GetValidatorIDs(ids.ID) ([]ids.NodeID, bool) {
 	return nil, false
 }
-func (testManager) Track(ids.ID) {}
+func (testManager) OnAcceptedBlockID(ids.ID) {}

vms/platformvm/vm.go

@@ -139,8 +139,8 @@ func (vm *VM) Initialize(
 		return err
 	}
 
-	validatorsSet := pvalidators.NewManager(vm.Config, vm.state, vm.metrics, &vm.clock)
-	vm.QueryManager = validatorsSet
+	queryManager := pvalidators.NewManager(vm.Config, vm.state, vm.metrics, &vm.clock)
+	vm.QueryManager = queryManager
 	vm.atomicUtxosManager = avax.NewAtomicUTXOManager(chainCtx.SharedMemory, txs.Codec)
 	utxoHandler := utxo.NewHandler(vm.ctx, &vm.clock, vm.fx)
 	vm.uptimeManager = uptime.NewManager(vm.state)
@@ -179,7 +179,7 @@ func (vm *VM) Initialize(
 		vm.metrics,
 		vm.state,
 		txExecutorBackend,
-		validatorsSet,
+		queryManager,
 	)
 	vm.Builder = blockbuilder.New(
 		mempool,