Remove deprecated flags for v7 release (#15986)

* Delete deprecated flags

* Changelog fragment

* E2E: Remove delete flag usage.

---------

Co-authored-by: Manu NALEPA <enalepa@offchainlabs.com>

changelog/remove-deprecated-flags.md

@@ -0,0 +1,21 @@
+### Removed
+
+- Deprecated flag `--enable-optional-engine-methods` has been removed.
+- Deprecated flag `--disable-build-block-parallel` has been removed.
+- Deprecated flag `--disable-reorg-late-blocks` has been removed.
+- Deprecated flag `--disable-optional-engine-methods` has been removed.
+- Deprecated flag `--disable-aggregate-parallel` has been removed.
+- Deprecated flag `--enable-eip-4881` has been removed.
+- Deprecated flag `--disable-eip-4881` has been removed.
+- Deprecated flag `--enable-verbose-sig-verification` has been removed.
+- Deprecated flag `--enable-debug-rpc-endpoints` has been removed.
+- Deprecated flag `--beacon-rpc-gateway-provider` has been removed.
+- Deprecated flag `--disable-grpc-gateway` has been removed.
+- Deprecated flag `--enable-experimental-state` has been removed.
+- Deprecated flag `--enable-committee-aware-packing` has been removed.
+- Deprecated flag `--interop-genesis-time` has been removed.
+- Deprecated flag `--interop-num-validators` has been removed (from beacon-chain only; still available in validator client).
+- Deprecated flag `--enable-quic` has been removed.
+- Deprecated flag `--attest-timely` has been removed.
+- Deprecated flag `--disable-experimental-state` has been removed.
+- Deprecated flag `--p2p-metadata` has been removed.

config/features/deprecated_flags.go

@@ -14,129 +14,10 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
-	deprecatedEnableOptionalEngineMethods = &cli.BoolFlag{
-		Name:   "enable-optional-engine-methods",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableBuildBlockParallel = &cli.BoolFlag{
-		Name:   "disable-build-block-parallel",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableReorgLateBlocks = &cli.BoolFlag{
-		Name:   "disable-reorg-late-blocks",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableOptionalEngineMethods = &cli.BoolFlag{
-		Name:   "disable-optional-engine-methods",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableAggregateParallel = &cli.BoolFlag{
-		Name:   "disable-aggregate-parallel",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableEIP4881 = &cli.BoolFlag{
-		Name:   "enable-eip-4881",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableEIP4881 = &cli.BoolFlag{
-		Name:   "disable-eip-4881",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedVerboseSigVerification = &cli.BoolFlag{
-		Name:   "enable-verbose-sig-verification",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableDebugRPCEndpoints = &cli.BoolFlag{
-		Name:   "enable-debug-rpc-endpoints",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-
-	deprecatedBeaconRPCGatewayProviderFlag = &cli.StringFlag{
-		Name:   "beacon-rpc-gateway-provider",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-
-	deprecatedDisableGRPCGateway = &cli.BoolFlag{
-		Name:   "disable-grpc-gateway",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-
-	deprecatedEnableExperimentalState = &cli.BoolFlag{
-		Name:   "enable-experimental-state",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-
-	deprecatedEnableCommitteeAwarePacking = &cli.BoolFlag{
-		Name:   "enable-committee-aware-packing",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedInteropGenesisTimeFlag = &cli.Uint64Flag{
-		Name:   "interop-genesis-time",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedInteropNumValidatorsFlag = &cli.Uint64Flag{
-		Name:   "interop-num-validators",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedEnableQuic = &cli.BoolFlag{
-		Name:   "enable-quic",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedAttestTimely = &cli.BoolFlag{
-		Name:   "attest-timely",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedDisableExperimentalState = &cli.BoolFlag{
-		Name:   "disable-experimental-state",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
-	deprecatedP2PMetadata = &cli.StringFlag{
-		Name:   "p2p-metadata",
-		Usage:  deprecatedUsage,
-		Hidden: true,
-	}
 )
 
 // Deprecated flags for both the beacon node and validator client.
-var deprecatedFlags = []cli.Flag{
+var deprecatedFlags = []cli.Flag{}
-	exampleDeprecatedFeatureFlag,
-	deprecatedEnableOptionalEngineMethods,
-	deprecatedDisableBuildBlockParallel,
-	deprecatedDisableReorgLateBlocks,
-	deprecatedDisableOptionalEngineMethods,
-	deprecatedDisableAggregateParallel,
-	deprecatedEnableEIP4881,
-	deprecatedDisableEIP4881,
-	deprecatedVerboseSigVerification,
-	deprecatedEnableDebugRPCEndpoints,
-	deprecatedBeaconRPCGatewayProviderFlag,
-	deprecatedDisableGRPCGateway,
-	deprecatedEnableExperimentalState,
-	deprecatedEnableCommitteeAwarePacking,
-	deprecatedInteropGenesisTimeFlag,
-	deprecatedEnableQuic,
-	deprecatedAttestTimely,
-	deprecatedDisableExperimentalState,
-	deprecatedP2PMetadata,
-}
 
 var upcomingDeprecation = []cli.Flag{
 	enableHistoricalSpaceRepresentation,
@@ -144,6 +25,4 @@ var upcomingDeprecation = []cli.Flag{
 
 // deprecatedBeaconFlags contains flags that are still used by other components
 // and therefore cannot be added to deprecatedFlags
-var deprecatedBeaconFlags = []cli.Flag{
+var deprecatedBeaconFlags = []cli.Flag{}
-	deprecatedInteropNumValidatorsFlag,
-}

testing/endtoend/component_handler_test.go

@@ -136,10 +136,6 @@ func (c *componentHandler) setup() {
 	})
 	c.eth1Nodes = eth1Nodes
 
-	if config.TestCheckpointSync {
-		appendDebugEndpoints(config)
-	}
-
 	var builders *components.BuilderSet
 	var proxies *eth1.ProxySet
 	if config.UseBuilder {
@@ -290,10 +286,3 @@ func PIDsFromMultiComponentRunner(runner e2etypes.MultipleComponentRunners) []in
 	}
 	return pids
 }
-
-func appendDebugEndpoints(cfg *e2etypes.E2EConfig) {
-	debug := []string{
-		"--enable-debug-rpc-endpoints",
-	}
-	cfg.BeaconFlags = append(cfg.BeaconFlags, debug...)
-}