IOTEX-343 Remove numCandidates from config (#755)

iotexproject · Mar 19, 2019 · 071e5c9 · 071e5c9
1 parent 3144f61
commit 071e5c9
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 1,022 deletions.
diff --git a/blockchain/blockchain_test.go b/blockchain/blockchain_test.go
@@ -787,7 +787,6 @@ func TestBlockchainInitialCandidate(t *testing.T) {
 	cfg := config.Default
 	cfg.Chain.TrieDBPath = testTriePath
 	cfg.Chain.ChainDBPath = testDBPath
-	cfg.Chain.NumCandidates = 2
 
 	sf, err := factory.NewFactory(cfg, factory.DefaultTrieOption())
 	require.NoError(err)
@@ -817,7 +816,7 @@ func TestBlockchainInitialCandidate(t *testing.T) {
 	}()
 	candidate, err := sf.CandidatesByHeight(0)
 	require.NoError(err)
-	require.True(len(candidate) == 2)
+	require.Equal(24, len(candidate))
 }
 
 func TestBlockchain_StateByAddr(t *testing.T) {

diff --git a/config/config.go b/config/config.go
@@ -97,7 +97,6 @@ var (
 			Address:         "",
 			ProducerPrivKey: PrivateKey.HexString(),
 			EmptyGenesis:    false,
-			NumCandidates:   101,
 			GravityChainDB:  DB{DbPath: "./poll.db", NumRetries: 10},
 			Committee: committee.Config{
 				BeaconChainAPIs: []string{},
@@ -191,7 +190,6 @@ var (
 		ValidateExplorer,
 		ValidateAPI,
 		ValidateActPool,
-		ValidateChain,
 	}
 
 	// PrivateKey is a randomly generated producer's key for testing purpose
@@ -217,7 +215,6 @@ type (
 		Address         string           `yaml:"address"`
 		ProducerPrivKey string           `yaml:"producerPrivKey"`
 		EmptyGenesis    bool             `yaml:"emptyGenesis"`
-		NumCandidates   uint             `yaml:"numCandidates"`
 		GravityChainDB  DB               `yaml:"gravityChainDB"`
 		Committee       committee.Config `yaml:"committee"`
 
@@ -481,14 +478,6 @@ func (cfg Config) ProducerPrivateKey() keypair.PrivateKey {
 	return sk
 }
 
-// ValidateChain validates the chain configure
-func ValidateChain(cfg Config) error {
-	if cfg.Chain.NumCandidates <= 0 {
-		return errors.Wrapf(ErrInvalidCfg, "candidate number should be greater than 0")
-	}
-	return nil
-}
-
 // ValidateDispatcher validates the dispatcher configs
 func ValidateDispatcher(cfg Config) error {
 	if cfg.Dispatcher.EventChanSize <= 0 {

diff --git a/config/config_test.go b/config/config_test.go
@@ -160,19 +160,6 @@ func TestValidateExplorer(t *testing.T) {
 	)
 }
 
-func TestValidateChain(t *testing.T) {
-	cfg := Default
-	cfg.Chain.NumCandidates = 0
-
-	err := ValidateChain(cfg)
-	require.Error(t, err)
-	require.Equal(t, ErrInvalidCfg, errors.Cause(err))
-	require.True(
-		t,
-		strings.Contains(err.Error(), "candidate number should be greater than 0"),
-	)
-}
-
 func TestValidateDispatcher(t *testing.T) {
 	cfg := Default
 	cfg.Dispatcher.EventChanSize = 0