Move the overridden manager into the node

chains/manager.go

@@ -531,19 +531,13 @@ func (m *manager) buildChain(chainParams ChainParameters, sb subnets.Subnet) (*c
 		}
 	}
 
-	vdrs := m.Validators
-	if !m.SybilProtectionEnabled {
-		// If sybil protection is disabled, everyone validates every chain
-		vdrs = validators.NewOverriddenManager(constants.PrimaryNetworkID, vdrs)
-	}
-
 	var chain *chain
 	switch vm := vm.(type) {
 	case vertex.LinearizableVMWithEngine:
 		chain, err = m.createAvalancheChain(
 			ctx,
 			chainParams.GenesisData,
-			vdrs,
+			m.Validators,
 			vm,
 			fxs,
 			sb,
@@ -552,15 +546,15 @@ func (m *manager) buildChain(chainParams ChainParameters, sb subnets.Subnet) (*c
 			return nil, fmt.Errorf("error while creating new avalanche vm %w", err)
 		}
 	case block.ChainVM:
-		beacons := vdrs
+		beacons := m.Validators
 		if chainParams.ID == constants.PlatformChainID {
 			beacons = chainParams.CustomBeacons
 		}
 
 		chain, err = m.createSnowmanChain(
 			ctx,
 			chainParams.GenesisData,
-			vdrs,
+			m.Validators,
 			beacons,
 			vm,
 			fxs,

node/node.go

@@ -290,7 +290,6 @@ func (n *Node) initNetworking() error {
 	// Configure benchlist
 	n.Config.BenchlistConfig.Validators = n.vdrs
 	n.Config.BenchlistConfig.Benchable = n.Config.ConsensusRouter
-	n.Config.BenchlistConfig.SybilProtectionEnabled = n.Config.SybilProtectionEnabled
 	n.benchlistManager = benchlist.NewManager(&n.Config.BenchlistConfig)
 
 	n.uptimeCalculator = uptime.NewLockedCalculator()
@@ -1401,6 +1400,9 @@ func (n *Node) Initialize(
 	}
 
 	n.vdrs = validators.NewManager()
+	if !n.Config.SybilProtectionEnabled {
+		n.vdrs = newOverriddenManager(constants.PrimaryNetworkID, n.vdrs)
+	}
 	if err := n.initResourceManager(n.MetricsRegisterer); err != nil {
 		return fmt.Errorf("problem initializing resource manager: %w", err)
 	}

snow/validators/overridden_manager.go → node/overridden_manager.go

@@ -1,21 +1,22 @@
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package validators
+package node
 
 import (
 	"fmt"
 
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/set"
 )
 
-var _ Manager = (*overriddenManager)(nil)
+var _ validators.Manager = (*overriddenManager)(nil)
 
-// NewOverriddenManager returns a Manager that overrides of all calls to the
+// newOverriddenManager returns a Manager that overrides of all calls to the
 // underlying Manager to only operate on the validators in [subnetID].
-func NewOverriddenManager(subnetID ids.ID, manager Manager) Manager {
+func newOverriddenManager(subnetID ids.ID, manager validators.Manager) *overriddenManager {
 	return &overriddenManager{
 		subnetID: subnetID,
 		manager:  manager,
@@ -27,7 +28,7 @@ func NewOverriddenManager(subnetID ids.ID, manager Manager) Manager {
 // subnetID here is typically the primary network ID, as it has the superset of
 // all subnet validators.
 type overriddenManager struct {
-	manager  Manager
+	manager  validators.Manager
 	subnetID ids.ID
 }
 
@@ -43,7 +44,7 @@ func (o *overriddenManager) GetWeight(_ ids.ID, nodeID ids.NodeID) uint64 {
 	return o.manager.GetWeight(o.subnetID, nodeID)
 }
 
-func (o *overriddenManager) GetValidator(_ ids.ID, nodeID ids.NodeID) (*Validator, bool) {
+func (o *overriddenManager) GetValidator(_ ids.ID, nodeID ids.NodeID) (*validators.Validator, bool) {
 	return o.manager.GetValidator(o.subnetID, nodeID)
 }
 
@@ -67,11 +68,11 @@ func (o *overriddenManager) Sample(_ ids.ID, size int) ([]ids.NodeID, error) {
 	return o.manager.Sample(o.subnetID, size)
 }
 
-func (o *overriddenManager) GetMap(ids.ID) map[ids.NodeID]*GetValidatorOutput {
+func (o *overriddenManager) GetMap(ids.ID) map[ids.NodeID]*validators.GetValidatorOutput {
 	return o.manager.GetMap(o.subnetID)
 }
 
-func (o *overriddenManager) RegisterCallbackListener(_ ids.ID, listener SetCallbackListener) {
+func (o *overriddenManager) RegisterCallbackListener(_ ids.ID, listener validators.SetCallbackListener) {
 	o.manager.RegisterCallbackListener(o.subnetID, listener)
 }
 

snow/validators/overridden_manager_test.go → node/overridden_manager_test.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package validators
+package node
 
 import (
 	"math"
@@ -10,8 +10,42 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/snow/validators"
 )
 
+func TestOverriddenManager(t *testing.T) {
+	require := require.New(t)
+
+	nodeID0 := ids.GenerateTestNodeID()
+	nodeID1 := ids.GenerateTestNodeID()
+	subnetID0 := ids.GenerateTestID()
+	subnetID1 := ids.GenerateTestID()
+
+	m := validators.NewManager()
+	require.NoError(m.AddStaker(subnetID0, nodeID0, nil, ids.Empty, 1))
+	require.NoError(m.AddStaker(subnetID1, nodeID1, nil, ids.Empty, 1))
+
+	om := newOverriddenManager(subnetID0, m)
+	_, ok := om.GetValidator(subnetID0, nodeID0)
+	require.True(ok)
+	_, ok = om.GetValidator(subnetID0, nodeID1)
+	require.False(ok)
+	_, ok = om.GetValidator(subnetID1, nodeID0)
+	require.True(ok)
+	_, ok = om.GetValidator(subnetID1, nodeID1)
+	require.False(ok)
+
+	require.NoError(om.RemoveWeight(subnetID1, nodeID0, 1))
+	_, ok = om.GetValidator(subnetID0, nodeID0)
+	require.False(ok)
+	_, ok = om.GetValidator(subnetID0, nodeID1)
+	require.False(ok)
+	_, ok = om.GetValidator(subnetID1, nodeID0)
+	require.False(ok)
+	_, ok = om.GetValidator(subnetID1, nodeID1)
+	require.False(ok)
+}
+
 func TestOverriddenString(t *testing.T) {
 	require := require.New(t)
 
@@ -24,12 +58,12 @@ func TestOverriddenString(t *testing.T) {
 	subnetID1, err := ids.FromString("2mcwQKiD8VEspmMJpL1dc7okQQ5dDVAWeCBZ7FWBFAbxpv3t7w")
 	require.NoError(err)
 
-	m := NewManager()
+	m := validators.NewManager()
 	require.NoError(m.AddStaker(subnetID0, nodeID0, nil, ids.Empty, 1))
 	require.NoError(m.AddStaker(subnetID0, nodeID1, nil, ids.Empty, math.MaxInt64-1))
 	require.NoError(m.AddStaker(subnetID1, nodeID1, nil, ids.Empty, 1))
 
-	om := NewOverriddenManager(subnetID0, m)
+	om := newOverriddenManager(subnetID0, m)
 	expected := "Overridden Validator Manager (SubnetID = TtF4d2QWbk5vzQGTEPrN48x6vwgAoAmKQ9cbp79inpQmcRKES): Validator Manager: (Size = 2)\n" +
 		"    Subnet[TtF4d2QWbk5vzQGTEPrN48x6vwgAoAmKQ9cbp79inpQmcRKES]: Validator Set: (Size = 2, Weight = 9223372036854775807)\n" +
 		"        Validator[0]: NodeID-111111111111111111116DBWJs, 1\n" +

snow/networking/benchlist/manager.go

@@ -10,7 +10,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils/constants"
 )
 
 var _ Manager = (*manager)(nil)
@@ -42,7 +41,6 @@ type Manager interface {
 type Config struct {
 	Benchable              Benchable          `json:"-"`
 	Validators             validators.Manager `json:"-"`
-	SybilProtectionEnabled bool               `json:"-"`
 	Threshold              int                `json:"threshold"`
 	MinimumFailingDuration time.Duration      `json:"minimumFailingDuration"`
 	Duration               time.Duration      `json:"duration"`
@@ -110,16 +108,10 @@ func (m *manager) RegisterChain(ctx *snow.ConsensusContext) error {
 		return nil
 	}
 
-	vdrs := m.config.Validators
-	if !m.config.SybilProtectionEnabled {
-		// If sybil protection is disabled, everyone validates every chain
-		vdrs = validators.NewOverriddenManager(constants.PrimaryNetworkID, vdrs)
-	}
-
 	benchlist, err := NewBenchlist(
 		ctx,
 		m.config.Benchable,
-		vdrs,
+		m.config.Validators,
 		m.config.Threshold,
 		m.config.MinimumFailingDuration,
 		m.config.Duration,