Remove unused field common.Config#Validators (ava-labs#2604)

multisig-labs · Feb 17, 2023 · 2a26d89 · 2a26d89
1 parent d2ba3bc
commit 2a26d89
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 18 deletions.
diff --git a/chains/manager.go b/chains/manager.go
@@ -687,7 +687,6 @@ func (m *manager) createAvalancheChain(
 
 	commonCfg := common.Config{
 		Ctx:                            ctx,
-		Validators:                     vdrs,
 		Beacons:                        beacons,
 		SampleK:                        sampleK,
 		StartupTracker:                 startupTracker,
@@ -956,7 +955,6 @@ func (m *manager) createSnowmanChain(
 
 	commonCfg := common.Config{
 		Ctx:                            ctx,
-		Validators:                     vdrs,
 		Beacons:                        beacons,
 		SampleK:                        sampleK,
 		StartupTracker:                 startupTracker,

diff --git a/snow/engine/avalanche/bootstrap/bootstrapper_test.go b/snow/engine/avalanche/bootstrap/bootstrapper_test.go
@@ -78,7 +78,6 @@ func newConfig(t *testing.T) (Config, ids.NodeID, *common.SenderTest, *vertex.Te
 
 	commonConfig := common.Config{
 		Ctx:                            ctx,
-		Validators:                     peers,
 		Beacons:                        peers,
 		SampleK:                        peers.Len(),
 		Alpha:                          peers.Weight()/2 + 1,

diff --git a/snow/engine/avalanche/config_test.go b/snow/engine/avalanche/config_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/engine/common/queue"
+	"github.com/ava-labs/avalanchego/snow/validators"
 )
 
 func DefaultConfig() (common.Config, bootstrap.Config, Config) {
@@ -34,7 +35,7 @@ func DefaultConfig() (common.Config, bootstrap.Config, Config) {
 		VM:         bootstrapConfig.VM,
 		Manager:    bootstrapConfig.Manager,
 		Sender:     bootstrapConfig.Sender,
-		Validators: bootstrapConfig.Validators,
+		Validators: validators.NewSet(),
 		Params: avalanche.Parameters{
 			Parameters: snowball.Parameters{
 				K:                       1,

diff --git a/snow/engine/avalanche/getter/getter_test.go b/snow/engine/avalanche/getter/getter_test.go
@@ -44,7 +44,6 @@ func testSetup(t *testing.T) (*vertex.TestManager, *common.SenderTest, common.Co
 
 	commonConfig := common.Config{
 		Ctx:                            snow.DefaultConsensusContextTest(),
-		Validators:                     peers,
 		Beacons:                        peers,
 		SampleK:                        peers.Len(),
 		Alpha:                          peers.Weight()/2 + 1,

diff --git a/snow/engine/avalanche/transitive_test.go b/snow/engine/avalanche/transitive_test.go
@@ -2710,7 +2710,6 @@ func TestEngineBootstrappingIntoConsensus(t *testing.T) {
 	vals.RegisterCallbackListener(startup)
 
 	bootCfg.Beacons = vals
-	bootCfg.Validators = vals
 	bootCfg.StartupTracker = startup
 	engCfg.Validators = vals
 
@@ -2987,7 +2986,6 @@ func TestEngineReBootstrapFails(t *testing.T) {
 	vals.RegisterCallbackListener(startup)
 
 	bootCfg.Beacons = vals
-	bootCfg.Validators = vals
 	bootCfg.StartupTracker = startup
 	engCfg.Validators = vals
 
@@ -3152,7 +3150,6 @@ func TestEngineReBootstrappingIntoConsensus(t *testing.T) {
 	vals.RegisterCallbackListener(startup)
 
 	bootCfg.Beacons = vals
-	bootCfg.Validators = vals
 	bootCfg.StartupTracker = startup
 	engCfg.Validators = vals
 

diff --git a/snow/engine/common/config.go b/snow/engine/common/config.go
@@ -14,9 +14,8 @@ import (
 // Config wraps the common configurations that are needed by a Snow consensus
 // engine
 type Config struct {
-	Ctx        *snow.ConsensusContext
-	Validators validators.Set
-	Beacons    validators.Set
+	Ctx     *snow.ConsensusContext
+	Beacons validators.Set
 
 	SampleK          int
 	Alpha            uint64

diff --git a/snow/engine/common/test_config.go b/snow/engine/common/test_config.go
@@ -30,7 +30,6 @@ func DefaultConfigTest() Config {
 
 	return Config{
 		Ctx:                            snow.DefaultConsensusContextTest(),
-		Validators:                     validators.NewSet(),
 		Beacons:                        beacons,
 		StartupTracker:                 startupTracker,
 		Sender:                         &SenderTest{},

diff --git a/snow/engine/snowman/bootstrap/bootstrapper_test.go b/snow/engine/snowman/bootstrap/bootstrapper_test.go
@@ -75,7 +75,6 @@ func newConfig(t *testing.T) (Config, ids.NodeID, *common.SenderTest, *block.Tes
 
 	commonConfig := common.Config{
 		Ctx:                            ctx,
-		Validators:                     peers,
 		Beacons:                        peers,
 		SampleK:                        peers.Len(),
 		Alpha:                          peers.Weight()/2 + 1,
@@ -125,7 +124,6 @@ func TestBootstrapperStartsOnlyIfEnoughStakeIsConnected(t *testing.T) {
 
 	commonCfg := common.Config{
 		Ctx:                            snow.DefaultConsensusContextTest(),
-		Validators:                     peers,
 		Beacons:                        peers,
 		SampleK:                        sampleK,
 		Alpha:                          alpha,

diff --git a/snow/engine/snowman/config_test.go b/snow/engine/snowman/config_test.go
@@ -8,14 +8,15 @@ import (
 	"github.com/ava-labs/avalanchego/snow/consensus/snowman"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
+	"github.com/ava-labs/avalanchego/snow/validators"
 )
 
 func DefaultConfigs() Config {
 	commonCfg := common.DefaultConfigTest()
 	return Config{
 		Ctx:        commonCfg.Ctx,
 		Sender:     commonCfg.Sender,
-		Validators: commonCfg.Validators,
+		Validators: validators.NewSet(),
 		VM:         &block.TestVM{},
 		Params: snowball.Parameters{
 			K:                       1,

diff --git a/snow/engine/snowman/getter/getter_test.go b/snow/engine/snowman/getter/getter_test.go
@@ -67,7 +67,6 @@ func testSetup(
 
 	commonConfig := common.Config{
 		Ctx:                            ctx,
-		Validators:                     peers,
 		Beacons:                        peers,
 		SampleK:                        peers.Len(),
 		Alpha:                          peers.Weight()/2 + 1,

diff --git a/snow/engine/snowman/syncer/state_syncer_test.go b/snow/engine/snowman/syncer/state_syncer_test.go
@@ -108,7 +108,6 @@ func TestStateSyncingStartsOnlyIfEnoughStakeIsConnected(t *testing.T) {
 
 	commonCfg := common.Config{
 		Ctx:            snow.DefaultConsensusContextTest(),
-		Validators:     vdrs,
 		Beacons:        vdrs,
 		SampleK:        vdrs.Len(),
 		Alpha:          alpha,

diff --git a/vms/platformvm/vm_test.go b/vms/platformvm/vm_test.go
@@ -1802,7 +1802,6 @@ func TestBootstrapPartiallyAccepted(t *testing.T) {
 	consensus := &smcon.Topological{}
 	commonCfg := common.Config{
 		Ctx:                            consensusCtx,
-		Validators:                     beacons,
 		Beacons:                        beacons,
 		SampleK:                        beacons.Len(),
 		StartupTracker:                 startup,