From 187e08d38ddcd87b3275440eaa41844c656e06dd Mon Sep 17 00:00:00 2001
From: Victor Farazdagi <simple.square@gmail.com>
Date: Tue, 9 Jun 2020 22:16:59 +0300
Subject: [PATCH] Inverts enable-init-sync-wrr flag (#6187)

* Inverts enable-init-sync-wrr flag
---
 shared/featureconfig/config.go |  7 ++++---
 shared/featureconfig/flags.go  | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/shared/featureconfig/config.go b/shared/featureconfig/config.go
index ccad4e4e549..4f421607a43 100644
--- a/shared/featureconfig/config.go
+++ b/shared/featureconfig/config.go
@@ -208,9 +208,10 @@ func ConfigureBeaconChain(ctx *cli.Context) {
 		log.Warn("Enabling skipping of historical states regen")
 		cfg.SkipRegenHistoricalStates = true
 	}
-	if ctx.Bool(enableInitSyncWeightedRoundRobin.Name) {
-		log.Warn("Enabling weighted round robin in initial syncing")
-		cfg.EnableInitSyncWeightedRoundRobin = true
+	cfg.EnableInitSyncWeightedRoundRobin = true
+	if ctx.Bool(disableInitSyncWeightedRoundRobin.Name) {
+		log.Warn("Disabling weighted round robin in initial syncing")
+		cfg.EnableInitSyncWeightedRoundRobin = false
 	}
 	cfg.EnableStateRefCopy = true
 	if ctx.Bool(disableStateRefCopy.Name) {
diff --git a/shared/featureconfig/flags.go b/shared/featureconfig/flags.go
index 6ae983ea039..0a4826bafec 100644
--- a/shared/featureconfig/flags.go
+++ b/shared/featureconfig/flags.go
@@ -153,20 +153,19 @@ var (
 		Name:  "skip-regen-historical-states",
 		Usage: "Skips regeneration and saving of historical states from genesis to last finalized. This enables a quick switch-over to using `--enable-new-state-mgmt`",
 	}
-	enableInitSyncWeightedRoundRobin = &cli.BoolFlag{
-		Name:  "enable-init-sync-wrr",
-		Usage: "Enables weighted round robin fetching optimization",
-	}
 	disableReduceAttesterStateCopy = &cli.BoolFlag{
 		Name:  "disable-reduce-attester-state-copy",
 		Usage: "Disables the feature to reduce the amount of state copies for attester rpc",
 	}
+	disableInitSyncWeightedRoundRobin = &cli.BoolFlag{
+		Name:  "disable-init-sync-wrr",
+		Usage: "Disables weighted round robin fetching optimization",
+	}
 )
 
 // devModeFlags holds list of flags that are set when development mode is on.
 var devModeFlags = []cli.Flag{
 	enableNewStateMgmt,
-	enableInitSyncWeightedRoundRobin,
 }
 
 // Deprecated flags list.
@@ -404,6 +403,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedEnableInitSyncWeightedRoundRobin = &cli.BoolFlag{
+		Name:   "enable-init-sync-wrr",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 var deprecatedFlags = []cli.Flag{
@@ -453,6 +457,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedP2PWhitelist,
 	deprecatedP2PBlacklist,
 	deprecateReduceAttesterStateCopies,
+	deprecatedEnableInitSyncWeightedRoundRobin,
 }
 
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@@ -507,7 +512,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
 	disableInitSyncBatchSaveBlocks,
 	waitForSyncedFlag,
 	skipRegenHistoricalStates,
-	enableInitSyncWeightedRoundRobin,
+	disableInitSyncWeightedRoundRobin,
 	disableFieldTrie,
 	disableStateRefCopy,
 	disableReduceAttesterStateCopy,
@@ -519,5 +524,4 @@ var E2EBeaconChainFlags = []string{
 	"--enable-state-gen-sig-verify",
 	"--check-head-state",
 	"--enable-new-state-mgmt",
-	"--enable-init-sync-wrr",
 }