Remove current deprecated flags (#7512)

* Remove deprecated flags * Remove usages in config * Gazelle Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
2024-12-22 03:30:35 +00:00 · 2020-10-12 23:38:41 -07:00 · 2020-10-12 23:38:41 -07:00 · aaabec5cb7
commit aaabec5cb7
parent e9c23673c5
5 changed files with 21 additions and 469 deletions
--- a/shared/featureconfig/BUILD.bazel
+++ b/shared/featureconfig/BUILD.bazel
@ -5,13 +5,13 @@ go_library(
    name = "go_default_library",
    srcs = [
        "config.go",
+        "deprecated_flags.go",
        "filter_flags.go",
        "flags.go",
    ],
    importpath = "github.com/prysmaticlabs/prysm/shared/featureconfig",
    visibility = ["//visibility:public"],
    deps = [
-        "//shared/cmd:go_default_library",
        "//shared/params:go_default_library",
        "@com_github_sirupsen_logrus//:go_default_library",
        "@com_github_urfave_cli_v2//:go_default_library",
@ -23,7 +23,7 @@ go_test(
    size = "small",
    srcs = [
        "config_test.go",
-        "flags_test.go",
+        "deprecated_flags_test.go",
    ],
    embed = [":go_default_library"],
    deps = [
--- a/shared/featureconfig/config.go
+++ b/shared/featureconfig/config.go
@ -22,7 +22,6 @@ package featureconfig
 import (
 	"sync"

-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@ -231,18 +230,6 @@ func ConfigureBeaconChain(ctx *cli.Context) {
 		log.Warn("Disabling slashing broadcasting to p2p network")
 		cfg.DisableBroadcastSlashings = true
 	}
-	if ctx.IsSet(deprecatedP2PWhitelist.Name) {
-		log.Warnf("--%s is deprecated, please use --%s", deprecatedP2PWhitelist.Name, cmd.P2PAllowList.Name)
-		if err := ctx.Set(cmd.P2PAllowList.Name, ctx.String(deprecatedP2PWhitelist.Name)); err != nil {
-			log.WithError(err).Error("Failed to update P2PAllowList flag")
-		}
-	}
-	if ctx.IsSet(deprecatedP2PBlacklist.Name) {
-		log.Warnf("--%s is deprecated, please use --%s", deprecatedP2PBlacklist.Name, cmd.P2PDenyList.Name)
-		if err := ctx.Set(cmd.P2PDenyList.Name, ctx.String(deprecatedP2PBlacklist.Name)); err != nil {
-			log.WithError(err).Error("Failed to update P2PDenyList flag")
-		}
-	}
 	cfg.ReduceAttesterStateCopy = true
 	if ctx.Bool(disableReduceAttesterStateCopy.Name) {
 		log.Warn("Disabling reducing attester state copy")
--- a/shared/featureconfig/deprecated_flags.go
+++ b/shared/featureconfig/deprecated_flags.go
@ -0,0 +1,19 @@
+package featureconfig
+
+import "github.com/urfave/cli/v2"
+
+// Deprecated flags list.
+const deprecatedUsage = "DEPRECATED. DO NOT USE."
+
+var (
+	// To deprecate a feature flag, first copy the example below, then insert deprecated flag in `deprecatedFlags`.
+	exampleDeprecatedFeatureFlag = &cli.StringFlag{
+		Name:   "name",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+)
+
+var deprecatedFlags = []cli.Flag{
+	exampleDeprecatedFeatureFlag,
+}
--- a/shared/featureconfig/deprecated_flags_test.go
+++ b/shared/featureconfig/deprecated_flags_test.go
--- a/shared/featureconfig/flags.go
+++ b/shared/featureconfig/flags.go
@ -193,460 +193,6 @@ var devModeFlags = []cli.Flag{
 	enablePruningDepositProofs,
 }

-// Deprecated flags list.
-const deprecatedUsage = "DEPRECATED. DO NOT USE."
-
-var (
-	deprecatedP2PEncoding = &cli.StringFlag{
-		Name:   "p2p-encoding",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedP2PPubsub = &cli.StringFlag{
-		Name:   "p2p-pubsub",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableKadDht = &cli.BoolFlag{
-		Name:   "enable-kad-dht",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedWeb3ProviderFlag = &cli.StringFlag{
-		Name:   "web3provider",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableDynamicCommitteeSubnets = &cli.BoolFlag{
-		Name:   "enable-dynamic-committee-subnets",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedNoCustomConfigFlag = &cli.BoolFlag{
-		Name:   "no-custom-config",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableInitSyncQueue = &cli.BoolFlag{
-		Name:   "enable-initial-sync-queue",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableFinalizedBlockRootIndexFlag = &cli.BoolFlag{
-		Name:   "enable-finalized-block-root-index",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedOptimizeProcessEpochFlag = &cli.BoolFlag{
-		Name:   "optimize-process-epoch",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedPruneFinalizedStatesFlag = &cli.BoolFlag{
-		Name:   "prune-finalized-states",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedScatterFlag = &cli.BoolFlag{
-		Name:   "scatter",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableSnappyDBCompressionFlag = &cli.BoolFlag{
-		Name:   "snappy",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableSkipSlotsCacheFlag = &cli.BoolFlag{
-		Name:   "enable-skip-slots-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnablePruneBoundaryStateFlag = &cli.BoolFlag{
-		Name:   "prune-states",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableActiveIndicesCacheFlag = &cli.BoolFlag{
-		Name:   "enable-active-indices-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableActiveCountCacheFlag = &cli.BoolFlag{
-		Name:   "enable-active-count-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-
-	deprecatedEnableCustomStateSSZFlag = &cli.BoolFlag{
-		Name:   "enable-custom-state-ssz",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableCommitteeCacheFlag = &cli.BoolFlag{
-		Name:   "enable-committee-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableBLSPubkeyCacheFlag = &cli.BoolFlag{
-		Name:   "enable-bls-pubkey-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedFastCommitteeAssignmentsFlag = &cli.BoolFlag{
-		Name:   "fast-assignments",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedGenesisDelayFlag = &cli.BoolFlag{
-		Name:   "genesis-delay",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedNewCacheFlag = &cli.BoolFlag{
-		Name:   "new-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableShuffledIndexCacheFlag = &cli.BoolFlag{
-		Name:   "enable-shuffled-index-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedSaveDepositDataFlag = &cli.BoolFlag{
-		Name:   "save-deposit-data",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedCacheProposerIndicesFlag = &cli.BoolFlag{
-		Name:   "cache-proposer-indices",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedprotoArrayForkChoice = &cli.BoolFlag{
-		Name:   "proto-array-forkchoice",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedForkchoiceAggregateAttestations = &cli.BoolFlag{
-		Name:   "forkchoice-aggregate-attestations",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableAttestationCacheFlag = &cli.BoolFlag{
-		Name:   "enable-attestation-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedInitSyncCacheStateFlag = &cli.BoolFlag{
-		Name:   "initial-sync-cache-state",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedProtectProposerFlag = &cli.BoolFlag{
-		Name:   "protect-proposer",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedProtectAttesterFlag = &cli.BoolFlag{
-		Name:   "protect-attester",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDiscv5Flag = &cli.BoolFlag{
-		Name:   "enable-discv5",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableSSZCache = &cli.BoolFlag{
-		Name:   "enable-ssz-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedUseSpanCacheFlag = &cli.BoolFlag{
-		Name:   "span-map-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableProtectProposerFlag = &cli.BoolFlag{
-		Name:   "disable-protect-proposer",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableProtectAttesterFlag = &cli.BoolFlag{
-		Name:   "disable-protect-attester",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableCustomBlockHTR = &cli.BoolFlag{
-		Name:   "enable-custom-block-htr",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableInitSyncQueueFlag = &cli.BoolFlag{
-		Name:   "disable-init-sync-queue",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableEth1DataVoteCacheFlag = &cli.BoolFlag{
-		Name:   "enable-eth1-data-vote-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedAccountMetricsFlag = &cli.BoolFlag{
-		Name:   "enable-account-metrics",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableDomainDataCacheFlag = &cli.BoolFlag{
-		Name:   "enable-domain-data-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableByteMempool = &cli.BoolFlag{
-		Name:   "enable-byte-mempool",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedBroadcastSlashingFlag = &cli.BoolFlag{
-		Name:   "broadcast-slashing",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableHistoricalDetectionFlag = &cli.BoolFlag{
-		Name:   "disable-historical-detection",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecateEnableStateRefCopy = &cli.BoolFlag{
-		Name:   "enable-state-ref-copy",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecateEnableFieldTrie = &cli.BoolFlag{
-		Name:   "enable-state-field-trie",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecateEnableNewStateMgmt = &cli.BoolFlag{
-		Name:   "enable-new-state-mgmt",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedP2PWhitelist = &cli.StringFlag{
-		Name:   "p2p-whitelist",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedP2PBlacklist = &cli.StringFlag{
-		Name:   "p2p-blacklist",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedSchlesiTestnetFlag = &cli.BoolFlag{
-		Name:   "schlesi-testnet",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecateReduceAttesterStateCopies = &cli.BoolFlag{
-		Name:   "reduce-attester-state-copy",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableStateRefCopy = &cli.BoolFlag{
-		Name:   "disable-state-ref-copy",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableFieldTrie = &cli.BoolFlag{
-		Name:   "disable-state-field-trie",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecateddisableInitSyncBatchSaveBlocks = &cli.BoolFlag{
-		Name:   "disable-init-sync-batch-save-blocks",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableInitSyncWeightedRoundRobin = &cli.BoolFlag{
-		Name:   "disable-init-sync-wrr",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableNoise = &cli.BoolFlag{
-		Name:   "enable-noise",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedArchival = &cli.BoolFlag{
-		Name:   "archive",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedArchiveValiatorSetChanges = &cli.BoolFlag{
-		Name:   "archive-validator-set-changes",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedArchiveBlocks = &cli.BoolFlag{
-		Name:   "archive-blocks",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedArchiveAttestation = &cli.BoolFlag{
-		Name:   "archive-attestations",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableProtectProposerFlag = &cli.BoolFlag{
-		Name:   "enable-protect-proposer",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableProtectAttesterFlag = &cli.BoolFlag{
-		Name:   "enable-protect-attester",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedInitSyncVerifyEverythingFlag = &cli.BoolFlag{
-		Name:   "initial-sync-verify-all-signatures",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedSkipRegenHistoricalStates = &cli.BoolFlag{
-		Name:   "skip-regen-historical-states",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableAccountsV2 = &cli.BoolFlag{
-		Name:   "enable-accounts-v2",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedCustomGenesisDelay = &cli.BoolFlag{
-		Name:   "custom-genesis-delay",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedNewBeaconStateLocks = &cli.BoolFlag{
-		Name:   "new-beacon-state-locks",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprectedForceMaxCoverAttestationAggregation = &cli.BoolFlag{
-		Name:   "attestation-aggregation-force-maxcover",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedNewStateMgmtFlag = &cli.BoolFlag{
-		Name:   "disable-new-state-mgmt",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedSlasherProviderFlag = &cli.StringFlag{
-		Name:   "slasher-provider",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableSlasherFlag = &cli.BoolFlag{
-		Name:   "enable-slasher",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableFinalizedDepositsCache = &cli.BoolFlag{
-		Name:   "enable-finalized-deposits-cache",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedBatchBlockVerify = &cli.BoolFlag{
-		Name:   "batch-block-verify",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableRoughtime = &cli.BoolFlag{
-		Name:   "enable-roughtime",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-)
-
-var deprecatedFlags = []cli.Flag{
-	deprecatedP2PEncoding,
-	deprecatedP2PPubsub,
-	deprecatedEnableKadDht,
-	deprecatedWeb3ProviderFlag,
-	deprecatedEnableDynamicCommitteeSubnets,
-	deprecatedNoCustomConfigFlag,
-	deprecatedEnableInitSyncQueue,
-	deprecatedEnableFinalizedBlockRootIndexFlag,
-	deprecatedScatterFlag,
-	deprecatedPruneFinalizedStatesFlag,
-	deprecatedOptimizeProcessEpochFlag,
-	deprecatedEnableSnappyDBCompressionFlag,
-	deprecatedEnableSkipSlotsCacheFlag,
-	deprecatedEnablePruneBoundaryStateFlag,
-	deprecatedEnableActiveIndicesCacheFlag,
-	deprecatedEnableActiveCountCacheFlag,
-	deprecatedEnableCustomStateSSZFlag,
-	deprecatedEnableCommitteeCacheFlag,
-	deprecatedEnableBLSPubkeyCacheFlag,
-	deprecatedFastCommitteeAssignmentsFlag,
-	deprecatedGenesisDelayFlag,
-	deprecatedNewCacheFlag,
-	deprecatedEnableShuffledIndexCacheFlag,
-	deprecatedSaveDepositDataFlag,
-	deprecatedCacheProposerIndicesFlag,
-	deprecatedprotoArrayForkChoice,
-	deprecatedForkchoiceAggregateAttestations,
-	deprecatedEnableAttestationCacheFlag,
-	deprecatedInitSyncCacheStateFlag,
-	deprecatedProtectAttesterFlag,
-	deprecatedProtectProposerFlag,
-	deprecatedDiscv5Flag,
-	deprecatedEnableSSZCache,
-	deprecatedUseSpanCacheFlag,
-	deprecatedDisableProtectProposerFlag,
-	deprecatedDisableProtectAttesterFlag,
-	deprecatedDisableInitSyncQueueFlag,
-	deprecatedEnableCustomBlockHTR,
-	deprecatedEnableEth1DataVoteCacheFlag,
-	deprecatedAccountMetricsFlag,
-	deprecatedEnableDomainDataCacheFlag,
-	deprecatedEnableByteMempool,
-	deprecatedBroadcastSlashingFlag,
-	deprecatedDisableHistoricalDetectionFlag,
-	deprecateEnableStateRefCopy,
-	deprecateEnableFieldTrie,
-	deprecateEnableNewStateMgmt,
-	deprecatedP2PWhitelist,
-	deprecatedP2PBlacklist,
-	deprecatedSchlesiTestnetFlag,
-	deprecateReduceAttesterStateCopies,
-	deprecatedDisableInitSyncWeightedRoundRobin,
-	deprecatedDisableStateRefCopy,
-	deprecatedDisableFieldTrie,
-	deprecateddisableInitSyncBatchSaveBlocks,
-	deprecatedEnableNoise,
-	deprecatedArchival,
-	deprecatedArchiveBlocks,
-	deprecatedArchiveValiatorSetChanges,
-	deprecatedArchiveAttestation,
-	deprecatedEnableProtectProposerFlag,
-	deprecatedEnableProtectAttesterFlag,
-	deprecatedInitSyncVerifyEverythingFlag,
-	deprecatedSkipRegenHistoricalStates,
-	deprecatedEnableAccountsV2,
-	deprecatedCustomGenesisDelay,
-	deprecatedNewBeaconStateLocks,
-	deprectedForceMaxCoverAttestationAggregation,
-	deprecatedNewStateMgmtFlag,
-	deprecatedSlasherProviderFlag,
-	deprecatedEnableSlasherFlag,
-	deprecatedEnableFinalizedDepositsCache,
-	deprecatedBatchBlockVerify,
-	deprecatedEnableRoughtime,
-}
-
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.
 var ValidatorFlags = append(deprecatedFlags, []cli.Flag{
 	enableLocalProtectionFlag,