minor renaming

vms/platformvm/blocks/builder/helpers_test.go

@@ -169,7 +169,7 @@ func newEnvironment(t *testing.T) *environment {
 		metrics,
 		res.state,
 		&res.backend,
-		pvalidators.TestSet,
+		pvalidators.TestManager,
 	)
 
 	res.Builder = New(

vms/platformvm/blocks/executor/acceptor.go

@@ -24,7 +24,7 @@ var _ blocks.Visitor = (*acceptor)(nil)
 type acceptor struct {
 	*backend
 	metrics      metrics.Metrics
-	validators   validators.Set
+	validators   validators.Manager
 	bootstrapped *utils.Atomic[bool]
 }
 

vms/platformvm/blocks/executor/acceptor_test.go

@@ -61,7 +61,7 @@ func TestAcceptorVisitProposalBlock(t *testing.T) {
 			state: s,
 		},
 		metrics:    metrics.Noop,
-		validators: validators.TestSet,
+		validators: validators.TestManager,
 	}
 
 	err = acceptor.ApricotProposalBlock(blk)
@@ -98,7 +98,7 @@ func TestAcceptorVisitAtomicBlock(t *testing.T) {
 			},
 		},
 		metrics:    metrics.Noop,
-		validators: validators.TestSet,
+		validators: validators.TestManager,
 	}
 
 	blk, err := blocks.NewApricotAtomicBlock(
@@ -179,7 +179,7 @@ func TestAcceptorVisitStandardBlock(t *testing.T) {
 			},
 		},
 		metrics:    metrics.Noop,
-		validators: validators.TestSet,
+		validators: validators.TestManager,
 	}
 
 	blk, err := blocks.NewBanffStandardBlock(
@@ -270,7 +270,7 @@ func TestAcceptorVisitCommitBlock(t *testing.T) {
 			},
 		},
 		metrics:      metrics.Noop,
-		validators:   validators.TestSet,
+		validators:   validators.TestManager,
 		bootstrapped: &utils.Atomic[bool]{},
 	}
 
@@ -356,7 +356,7 @@ func TestAcceptorVisitAbortBlock(t *testing.T) {
 			},
 		},
 		metrics:      metrics.Noop,
-		validators:   validators.TestSet,
+		validators:   validators.TestManager,
 		bootstrapped: &utils.Atomic[bool]{},
 	}
 

vms/platformvm/blocks/executor/helpers_test.go

@@ -204,7 +204,7 @@ func newEnvironment(t *testing.T, ctrl *gomock.Controller) *environment {
 			metrics,
 			res.state,
 			res.backend,
-			pvalidators.TestSet,
+			pvalidators.TestManager,
 		)
 		addSubnet(res)
 	} else {
@@ -213,7 +213,7 @@ func newEnvironment(t *testing.T, ctrl *gomock.Controller) *environment {
 			metrics,
 			res.mockedState,
 			res.backend,
-			pvalidators.TestSet,
+			pvalidators.TestManager,
 		)
 		// we do not add any subnet to state, since we can mock
 		// whatever we need

vms/platformvm/blocks/executor/manager.go

@@ -31,7 +31,7 @@ func NewManager(
 	metrics metrics.Metrics,
 	s state.State,
 	txExecutorBackend *executor.Backend,
-	validatorsSet validators.Set,
+	validatorsSet validators.Manager,
 ) Manager {
 	backend := &backend{
 		Mempool:      mempool,

vms/platformvm/validators/set.go → vms/platformvm/validators/manager.go

@@ -30,34 +30,34 @@ const (
 )
 
 var (
-	_ validators.State = (*set)(nil)
+	_ validators.State = (*manager)(nil)
 
 	ErrMissingValidatorSet = errors.New("missing validator set")
 )
 
 // P-chain must be able to provide information about validators active
-// at different heights. [QueribleSet] interface encapsulates all the machinery
+// at different heights. [QueryManager] interface encapsulates all the machinery
 // to achieve this.
-type QueribleSet interface {
+type QueryManager interface {
 	validators.State
 
 	GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool)
 }
 
-// Set interface adds to QueribleSet the ability to blocks IDs
+// Manager interface adds to QueribleSet the ability to blocks IDs
 // to serve GetMinimumHeight
-type Set interface {
-	QueribleSet
+type Manager interface {
+	QueryManager
 	Track(blkID ids.ID)
 }
 
-func NewSet(
+func NewManager(
 	cfg config.Config,
 	state state.State,
 	metrics metrics.Metrics,
 	clk mockable.Clock,
-) Set {
-	return &set{
+) Manager {
+	return &manager{
 		cfg:     cfg,
 		state:   state,
 		metrics: metrics,
@@ -73,7 +73,7 @@ func NewSet(
 	}
 }
 
-type set struct {
+type manager struct {
 	cfg     config.Config
 	state   state.State
 	metrics metrics.Metrics
@@ -105,17 +105,17 @@ type set struct {
 // 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].
-func (vs *set) GetMinimumHeight(ctx context.Context) (uint64, error) {
-	if vs.cfg.UseCurrentHeight {
-		return vs.GetCurrentHeight(ctx)
+func (m *manager) GetMinimumHeight(ctx context.Context) (uint64, error) {
+	if m.cfg.UseCurrentHeight {
+		return m.GetCurrentHeight(ctx)
 	}
 
-	oldest, ok := vs.recentlyAccepted.Oldest()
+	oldest, ok := m.recentlyAccepted.Oldest()
 	if !ok {
-		return vs.GetCurrentHeight(ctx)
+		return m.GetCurrentHeight(ctx)
 	}
 
-	blk, _, err := vs.state.GetStatelessBlock(oldest)
+	blk, _, err := m.state.GetStatelessBlock(oldest)
 	if err != nil {
 		return 0, err
 	}
@@ -129,9 +129,9 @@ func (vs *set) GetMinimumHeight(ctx context.Context) (uint64, error) {
 }
 
 // GetCurrentHeight returns the height of the last accepted block
-func (vs *set) GetCurrentHeight(context.Context) (uint64, error) {
-	lastAcceptedID := vs.state.GetLastAccepted()
-	lastAccepted, _, err := vs.state.GetStatelessBlock(lastAcceptedID)
+func (m *manager) GetCurrentHeight(context.Context) (uint64, error) {
+	lastAcceptedID := m.state.GetLastAccepted()
+	lastAccepted, _, err := m.state.GetStatelessBlock(lastAcceptedID)
 	if err != nil {
 		return 0, err
 	}
@@ -140,22 +140,22 @@ func (vs *set) GetCurrentHeight(context.Context) (uint64, error) {
 
 // GetValidatorSet returns the validator set at the specified height for the
 // provided subnetID.
-func (vs *set) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.ID) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
-	validatorSetsCache, exists := vs.caches[subnetID]
+func (m *manager) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.ID) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
+	validatorSetsCache, exists := m.caches[subnetID]
 	if !exists {
 		validatorSetsCache = &cache.LRU[uint64, map[ids.NodeID]*validators.GetValidatorOutput]{Size: validatorSetsCacheSize}
 		// Only cache tracked subnets
-		if subnetID == constants.PrimaryNetworkID || vs.cfg.TrackedSubnets.Contains(subnetID) {
-			vs.caches[subnetID] = validatorSetsCache
+		if subnetID == constants.PrimaryNetworkID || m.cfg.TrackedSubnets.Contains(subnetID) {
+			m.caches[subnetID] = validatorSetsCache
 		}
 	}
 
 	if validatorSet, ok := validatorSetsCache.Get(height); ok {
-		vs.metrics.IncValidatorSetsCached()
+		m.metrics.IncValidatorSetsCached()
 		return validatorSet, nil
 	}
 
-	lastAcceptedHeight, err := vs.GetCurrentHeight(ctx)
+	lastAcceptedHeight, err := m.GetCurrentHeight(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -164,16 +164,16 @@ func (vs *set) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.
 	}
 
 	// get the start time to track metrics
-	startTime := vs.clk.Time()
+	startTime := m.clk.Time()
 
-	currentSubnetValidators, ok := vs.cfg.Validators.Get(subnetID)
+	currentSubnetValidators, ok := m.cfg.Validators.Get(subnetID)
 	if !ok {
 		currentSubnetValidators = validators.NewSet()
-		if err := vs.state.ValidatorSet(subnetID, currentSubnetValidators); err != nil {
+		if err := m.state.ValidatorSet(subnetID, currentSubnetValidators); err != nil {
 			return nil, err
 		}
 	}
-	currentPrimaryNetworkValidators, ok := vs.cfg.Validators.Get(constants.PrimaryNetworkID)
+	currentPrimaryNetworkValidators, ok := m.cfg.Validators.Get(constants.PrimaryNetworkID)
 	if !ok {
 		// This should never happen
 		return nil, ErrMissingValidatorSet
@@ -195,7 +195,7 @@ func (vs *set) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.
 	}
 
 	for i := lastAcceptedHeight; i > height; i-- {
-		weightDiffs, err := vs.state.GetValidatorWeightDiffs(i, subnetID)
+		weightDiffs, err := m.state.GetValidatorWeightDiffs(i, subnetID)
 		if err != nil {
 			return nil, err
 		}
@@ -235,7 +235,7 @@ func (vs *set) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.
 			}
 		}
 
-		pkDiffs, err := vs.state.GetValidatorPublicKeyDiffs(i)
+		pkDiffs, err := m.state.GetValidatorPublicKeyDiffs(i)
 		if err != nil {
 			return nil, err
 		}
@@ -255,20 +255,20 @@ func (vs *set) GetValidatorSet(ctx context.Context, height uint64, subnetID ids.
 	// cache the validator set
 	validatorSetsCache.Put(height, vdrSet)
 
-	endTime := vs.clk.Time()
-	vs.metrics.IncValidatorSetsCreated()
-	vs.metrics.AddValidatorSetsDuration(endTime.Sub(startTime))
-	vs.metrics.AddValidatorSetsHeightDiff(lastAcceptedHeight - height)
+	endTime := m.clk.Time()
+	m.metrics.IncValidatorSetsCreated()
+	m.metrics.AddValidatorSetsDuration(endTime.Sub(startTime))
+	m.metrics.AddValidatorSetsHeightDiff(lastAcceptedHeight - height)
 	return vdrSet, nil
 }
 
 // GetCurrentHeight returns the height of the last accepted block
-func (vs *set) GetSubnetID(_ context.Context, chainID ids.ID) (ids.ID, error) {
+func (m *manager) GetSubnetID(_ context.Context, chainID ids.ID) (ids.ID, error) {
 	if chainID == constants.PlatformChainID {
 		return constants.PrimaryNetworkID, nil
 	}
 
-	chainTx, _, err := vs.state.GetTx(chainID)
+	chainTx, _, err := m.state.GetTx(chainID)
 	if err != nil {
 		return ids.Empty, fmt.Errorf(
 			"problem retrieving blockchain %q: %w",
@@ -283,8 +283,8 @@ func (vs *set) GetSubnetID(_ context.Context, chainID ids.ID) (ids.ID, error) {
 	return chain.SubnetID, nil
 }
 
-func (vs *set) GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool) {
-	validatorSet, exist := vs.cfg.Validators.Get(subnetID)
+func (m *manager) GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool) {
+	validatorSet, exist := m.cfg.Validators.Get(subnetID)
 	if !exist {
 		return nil, false
 	}
@@ -298,6 +298,6 @@ func (vs *set) GetValidatorIDs(subnetID ids.ID) ([]ids.NodeID, bool) {
 	return validatorIDs, true
 }
 
-func (vs *set) Track(blkID ids.ID) {
-	vs.recentlyAccepted.Add(blkID)
+func (m *manager) Track(blkID ids.ID) {
+	m.recentlyAccepted.Add(blkID)
 }

vms/platformvm/validators/set_test.go → vms/platformvm/validators/manager_test.go

@@ -385,7 +385,7 @@ func TestVM_GetValidatorSet(t *testing.T) {
 			r.NoError(err)
 
 			clk := mockable.Clock{}
-			validatorssSet := NewSet(cfg, mockState, metrics, clk)
+			validatorssSet := NewManager(cfg, mockState, metrics, clk)
 
 			// Mock the VM's validators
 			mockSubnetVdrSet := validators.NewMockSet(ctrl)

vms/platformvm/validators/test_manager.go

@@ -0,0 +1,36 @@
+// Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package validators
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/snow/validators"
+)
+
+var TestManager Manager = testManager{}
+
+type testManager struct{}
+
+func (testManager) GetMinimumHeight(context.Context) (uint64, error) {
+	return 0, nil
+}
+
+func (testManager) GetCurrentHeight(context.Context) (uint64, error) {
+	return 0, nil
+}
+
+func (testManager) GetSubnetID(context.Context, ids.ID) (ids.ID, error) {
+	return ids.Empty, nil
+}
+
+func (testManager) GetValidatorSet(context.Context, uint64, ids.ID) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
+	return nil, nil
+}
+
+func (testManager) GetValidatorIDs(ids.ID) ([]ids.NodeID, bool) {
+	return nil, false
+}
+func (testManager) Track(ids.ID) {}

vms/platformvm/vm.go

@@ -62,7 +62,7 @@ var (
 type VM struct {
 	config.Config
 	blockbuilder.Builder
-	pvalidators.QueribleSet
+	pvalidators.QueryManager
 
 	metrics            metrics.Metrics
 	atomicUtxosManager avax.AtomicUTXOManager
@@ -139,8 +139,8 @@ func (vm *VM) Initialize(
 		return err
 	}
 
-	validatorsSet := pvalidators.NewSet(vm.Config, vm.state, vm.metrics, vm.clock)
-	vm.QueribleSet = validatorsSet
+	validatorsSet := pvalidators.NewManager(vm.Config, vm.state, vm.metrics, vm.clock)
+	vm.QueryManager = validatorsSet
 	vm.atomicUtxosManager = avax.NewAtomicUTXOManager(chainCtx.SharedMemory, txs.Codec)
 	utxoHandler := utxo.NewHandler(vm.ctx, &vm.clock, vm.fx)
 	vm.uptimeManager = uptime.NewManager(vm.state)