Add Config Change for Validator (#5038)

* add config for validator * gaz * Merge refs/heads/master into configureValidator * Merge refs/heads/master into configureValidator
prysmaticlabs · Mar 8, 2020 · 300d072 · 300d072
1 parent ac1c92e
commit 300d072
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/shared/featureconfig/config.go b/shared/featureconfig/config.go
@@ -170,10 +170,7 @@ func ConfigureBeaconChain(ctx *cli.Context) {
 func ConfigureValidator(ctx *cli.Context) {
 	complainOnDeprecatedFlags(ctx)
 	cfg := &Flags{}
-	if ctx.GlobalBool(minimalConfigFlag.Name) {
-		log.Warn("Using minimal config")
-		cfg.MinimalConfig = true
-	}
+	cfg = configureConfig(ctx, cfg)
 	if ctx.GlobalBool(protectProposerFlag.Name) {
 		log.Warn("Enabled validator proposal slashing protection.")
 		cfg.ProtectProposer = true

diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel
@@ -22,7 +22,6 @@ go_library(
         "//shared/cmd:go_default_library",
         "//shared/debug:go_default_library",
         "//shared/featureconfig:go_default_library",
-        "//shared/params:go_default_library",
         "//shared/prometheus:go_default_library",
         "//shared/tracing:go_default_library",
         "//shared/version:go_default_library",

diff --git a/validator/node/node.go b/validator/node/node.go
@@ -17,7 +17,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/debug"
 	"github.com/prysmaticlabs/prysm/shared/featureconfig"
-	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/prometheus"
 	"github.com/prysmaticlabs/prysm/shared/tracing"
 	"github.com/prysmaticlabs/prysm/shared/version"
@@ -68,17 +67,6 @@ func NewValidatorClient(ctx *cli.Context) (*ValidatorClient, error) {
 	}
 
 	featureconfig.ConfigureValidator(ctx)
-	// Use custom config values if the --no-custom-config flag is set.
-	if !ctx.GlobalBool(flags.NoCustomConfigFlag.Name) {
-		log.Info("Using custom parameter configuration")
-		if featureconfig.Get().MinimalConfig {
-			log.Warn("Using Minimal Config")
-			params.UseMinimalConfig()
-		} else {
-			log.Warn("Using Demo Config")
-			params.UseDemoBeaconConfig()
-		}
-	}
 
 	keyManager, err := selectKeyManager(ctx)
 	if err != nil {