Remove Deprecated HTTP Provider Flag (#12140)

* remove deprecated http provider flag

* test

---------

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>

cmd/beacon-chain/execution/options.go

@@ -68,8 +68,7 @@ func parseJWTSecretFromFile(c *cli.Context) ([]byte, error) {
 }
 
 func parseExecutionChainEndpoint(c *cli.Context) (string, error) {
-	aliasUsed := c.IsSet(flags.HTTPWeb3ProviderFlag.Name)
-	if c.String(flags.ExecutionEngineEndpoint.Name) == "" && !aliasUsed {
+	if c.String(flags.ExecutionEngineEndpoint.Name) == "" {
 		return "", fmt.Errorf(
 			"you need to specify %s to provide a connection endpoint to an Ethereum execution client "+
 				"for your Prysm beacon node. This is a requirement for running a node. You can read more about "+
@@ -78,12 +77,5 @@ func parseExecutionChainEndpoint(c *cli.Context) (string, error) {
 			flags.ExecutionEngineEndpoint.Name,
 		)
 	}
-	// If users only declare the deprecated flag without setting the execution engine
-	// flag, we fallback to using the deprecated flag value.
-	if aliasUsed && !c.IsSet(flags.ExecutionEngineEndpoint.Name) {
-		log.Warnf("The %s flag has been deprecated and will be removed in a future release,"+
-			"please use the execution endpoint flag instead %s", flags.HTTPWeb3ProviderFlag.Name, flags.ExecutionEngineEndpoint.Name)
-		return c.String(flags.HTTPWeb3ProviderFlag.Name), nil
-	}
 	return c.String(flags.ExecutionEngineEndpoint.Name), nil
 }

cmd/beacon-chain/flags/base.go

@@ -39,13 +39,6 @@ var (
 		Usage: "A comma separated list of key value pairs to pass as HTTP headers for all execution " +
 			"client calls. Example: --execution-headers=key1=value1,key2=value2",
 	}
-	// Deprecated: HTTPWeb3ProviderFlag is a deprecated flag and is an alias for the ExecutionEngineEndpoint flag.
-	HTTPWeb3ProviderFlag = &cli.StringFlag{
-		Name:   "http-web3provider",
-		Usage:  "DEPRECATED: A mainchain web3 provider string http endpoint. Can contain auth header as well in the format --http-web3provider=\"https://goerli.infura.io/v3/xxxx,Basic xxx\" for project secret (base64 encoded) and --http-web3provider=\"https://goerli.infura.io/v3/xxxx,Bearer xxx\" for jwt use",
-		Value:  "http://localhost:8551",
-		Hidden: true,
-	}
 	// ExecutionJWTSecretFlag provides a path to a file containing a hex-encoded string representing a 32 byte secret
 	// used to authenticate with an execution node via HTTP. This is required if using an HTTP connection, otherwise all requests
 	// to execution nodes for consensus-related calls will fail. This is not required if using an IPC connection.

cmd/beacon-chain/main.go

@@ -39,7 +39,6 @@ var appFlags = []cli.Flag{
 	flags.DepositContractFlag,
 	flags.ExecutionEngineEndpoint,
 	flags.ExecutionEngineHeaders,
-	flags.HTTPWeb3ProviderFlag,
 	flags.ExecutionJWTSecretFlag,
 	flags.RPCHost,
 	flags.RPCPort,
@@ -195,9 +194,6 @@ func main() {
 		if err := cmd.ExpandSingleEndpointIfFile(ctx, flags.ExecutionEngineEndpoint); err != nil {
 			return err
 		}
-		if err := cmd.ExpandSingleEndpointIfFile(ctx, flags.HTTPWeb3ProviderFlag); err != nil {
-			return err
-		}
 		if ctx.IsSet(flags.SetGCPercent.Name) {
 			runtimeDebug.SetGCPercent(ctx.Int(flags.SetGCPercent.Name))
 		}

cmd/beacon-chain/usage.go

@@ -107,7 +107,6 @@ var appHelpFlagGroups = []flagGroup{
 			flags.GPRCGatewayCorsDomain,
 			flags.ExecutionEngineEndpoint,
 			flags.ExecutionEngineHeaders,
-			flags.HTTPWeb3ProviderFlag,
 			flags.ExecutionJWTSecretFlag,
 			flags.SetGCPercent,
 			flags.SlotsPerArchivedPoint,

cmd/helpers_test.go

@@ -84,30 +84,30 @@ func TestEnterPassword(t *testing.T) {
 func TestExpandSingleEndpointIfFile(t *testing.T) {
 	app := cli.App{}
 	set := flag.NewFlagSet("test", 0)
-	HTTPWeb3ProviderFlag := &cli.StringFlag{Name: "http-web3provider", Value: ""}
-	set.String(HTTPWeb3ProviderFlag.Name, "", "")
+	ExecutionEndpointFlag := &cli.StringFlag{Name: "execution-endpoint", Value: ""}
+	set.String(ExecutionEndpointFlag.Name, "", "")
 	context := cli.NewContext(&app, set, nil)
 
 	// with nothing set
-	require.NoError(t, ExpandSingleEndpointIfFile(context, HTTPWeb3ProviderFlag))
-	require.Equal(t, "", context.String(HTTPWeb3ProviderFlag.Name))
+	require.NoError(t, ExpandSingleEndpointIfFile(context, ExecutionEndpointFlag))
+	require.Equal(t, "", context.String(ExecutionEndpointFlag.Name))
 
 	// with url scheme
-	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "http://localhost:8545"))
-	require.NoError(t, ExpandSingleEndpointIfFile(context, HTTPWeb3ProviderFlag))
-	require.Equal(t, "http://localhost:8545", context.String(HTTPWeb3ProviderFlag.Name))
+	require.NoError(t, context.Set(ExecutionEndpointFlag.Name, "http://localhost:8545"))
+	require.NoError(t, ExpandSingleEndpointIfFile(context, ExecutionEndpointFlag))
+	require.Equal(t, "http://localhost:8545", context.String(ExecutionEndpointFlag.Name))
 
 	// relative user home path
 	usr, err := user.Current()
 	require.NoError(t, err)
-	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "~/relative/path.ipc"))
-	require.NoError(t, ExpandSingleEndpointIfFile(context, HTTPWeb3ProviderFlag))
-	require.Equal(t, usr.HomeDir+"/relative/path.ipc", context.String(HTTPWeb3ProviderFlag.Name))
+	require.NoError(t, context.Set(ExecutionEndpointFlag.Name, "~/relative/path.ipc"))
+	require.NoError(t, ExpandSingleEndpointIfFile(context, ExecutionEndpointFlag))
+	require.Equal(t, usr.HomeDir+"/relative/path.ipc", context.String(ExecutionEndpointFlag.Name))
 
 	// current dir path
 	curentdir, err := os.Getwd()
 	require.NoError(t, err)
-	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "./path.ipc"))
-	require.NoError(t, ExpandSingleEndpointIfFile(context, HTTPWeb3ProviderFlag))
-	require.Equal(t, curentdir+"/path.ipc", context.String(HTTPWeb3ProviderFlag.Name))
+	require.NoError(t, context.Set(ExecutionEndpointFlag.Name, "./path.ipc"))
+	require.NoError(t, ExpandSingleEndpointIfFile(context, ExecutionEndpointFlag))
+	require.Equal(t, curentdir+"/path.ipc", context.String(ExecutionEndpointFlag.Name))
 }