From 73c7aeeffaffbf875af84e8be595af828877be2b Mon Sep 17 00:00:00 2001 From: Gavin Yu Date: Tue, 9 Jul 2024 13:33:38 +0800 Subject: [PATCH] refactor(taiko-client): rm unused `L1_NODE_HTTP_ENDPOINT` (#17768) --- packages/taiko-client/cmd/flags/common.go | 7 ------- packages/taiko-client/cmd/flags/prover.go | 1 - packages/taiko-client/prover/config.go | 4 +--- packages/taiko-client/prover/config_test.go | 4 ---- packages/taiko-client/prover/prover_test.go | 2 -- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/packages/taiko-client/cmd/flags/common.go b/packages/taiko-client/cmd/flags/common.go index da6c4247122..c77c89259ad 100644 --- a/packages/taiko-client/cmd/flags/common.go +++ b/packages/taiko-client/cmd/flags/common.go @@ -35,13 +35,6 @@ var ( Category: commonCategory, EnvVars: []string{"L2_WS"}, } - L1HTTPEndpoint = &cli.StringFlag{ - Name: "l1.http", - Usage: "HTTP RPC endpoint of a L1 ethereum node", - Required: true, - Category: commonCategory, - EnvVars: []string{"L1_HTTP"}, - } L1BeaconEndpoint = &cli.StringFlag{ Name: "l1.beacon", Usage: "HTTP RPC endpoint of a L1 beacon node", diff --git a/packages/taiko-client/cmd/flags/prover.go b/packages/taiko-client/cmd/flags/prover.go index 1ee84c5b675..ac10f6bbf8f 100644 --- a/packages/taiko-client/cmd/flags/prover.go +++ b/packages/taiko-client/cmd/flags/prover.go @@ -193,7 +193,6 @@ var ( // ProverFlags All prover flags. var ProverFlags = MergeFlags(CommonFlags, []cli.Flag{ - L1HTTPEndpoint, L2WSEndpoint, L2HTTPEndpoint, RaikoHostEndpoint, diff --git a/packages/taiko-client/prover/config.go b/packages/taiko-client/prover/config.go index 8d9f7ec6051..ecb4f3369d3 100644 --- a/packages/taiko-client/prover/config.go +++ b/packages/taiko-client/prover/config.go @@ -22,7 +22,6 @@ import ( // Config contains the configurations to initialize a Taiko prover. type Config struct { L1WsEndpoint string - L1HttpEndpoint string L2WsEndpoint string L2HttpEndpoint string TaikoL1Address common.Address @@ -136,7 +135,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { return &Config{ L1WsEndpoint: c.String(flags.L1WSEndpoint.Name), - L1HttpEndpoint: c.String(flags.L1HTTPEndpoint.Name), L2WsEndpoint: c.String(flags.L2WSEndpoint.Name), L2HttpEndpoint: c.String(flags.L2HTTPEndpoint.Name), TaikoL1Address: common.HexToAddress(c.String(flags.TaikoL1Address.Name)), @@ -173,7 +171,7 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { L2NodeVersion: c.String(flags.L2NodeVersion.Name), BlockConfirmations: c.Uint64(flags.BlockConfirmations.Name), TxmgrConfigs: pkgFlags.InitTxmgrConfigsFromCli( - c.String(flags.L1HTTPEndpoint.Name), + c.String(flags.L1WSEndpoint.Name), l1ProverPrivKey, c, ), diff --git a/packages/taiko-client/prover/config_test.go b/packages/taiko-client/prover/config_test.go index ca48df691f1..fa9209c9689 100644 --- a/packages/taiko-client/prover/config_test.go +++ b/packages/taiko-client/prover/config_test.go @@ -15,7 +15,6 @@ import ( var ( l1WsEndpoint = os.Getenv("L1_NODE_WS_ENDPOINT") - l1HttpEndpoint = os.Getenv("L1_NODE_HTTP_ENDPOINT") l2WsEndpoint = os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT") l2HttpEndpoint = os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT") l1NodeVersion = "1.0.0" @@ -32,7 +31,6 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() { c, err := NewConfigFromCliContext(ctx) s.Nil(err) s.Equal(l1WsEndpoint, c.L1WsEndpoint) - s.Equal(l1HttpEndpoint, c.L1HttpEndpoint) s.Equal(l2WsEndpoint, c.L2WsEndpoint) s.Equal(l2HttpEndpoint, c.L2HttpEndpoint) s.Equal(taikoL1, c.TaikoL1Address.String()) @@ -62,7 +60,6 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() { s.Nil(app.Run([]string{ "TestNewConfigFromCliContextGuardianProver", "--" + flags.L1WSEndpoint.Name, l1WsEndpoint, - "--" + flags.L1HTTPEndpoint.Name, l1HttpEndpoint, "--" + flags.L2WSEndpoint.Name, l2WsEndpoint, "--" + flags.L2HTTPEndpoint.Name, l2HttpEndpoint, "--" + flags.TaikoL1Address.Name, taikoL1, @@ -98,7 +95,6 @@ func (s *ProverTestSuite) SetupApp() *cli.App { app := cli.NewApp() app.Flags = []cli.Flag{ &cli.StringFlag{Name: flags.L1WSEndpoint.Name}, - &cli.StringFlag{Name: flags.L1HTTPEndpoint.Name}, &cli.StringFlag{Name: flags.L2WSEndpoint.Name}, &cli.StringFlag{Name: flags.L2HTTPEndpoint.Name}, &cli.StringFlag{Name: flags.TaikoL1Address.Name}, diff --git a/packages/taiko-client/prover/prover_test.go b/packages/taiko-client/prover/prover_test.go index 5ab5c16af62..d16a25c31c0 100644 --- a/packages/taiko-client/prover/prover_test.go +++ b/packages/taiko-client/prover/prover_test.go @@ -128,7 +128,6 @@ func (s *ProverTestSuite) TestInitError() { s.NotNil(InitFromConfig(ctx, p, &Config{ L1WsEndpoint: os.Getenv("L1_NODE_WS_ENDPOINT"), - L1HttpEndpoint: os.Getenv("L1_NODE_HTTP_ENDPOINT"), L2WsEndpoint: os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"), L2HttpEndpoint: os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT"), TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")), @@ -484,7 +483,6 @@ func (s *ProverTestSuite) initProver( p := new(Prover) s.Nil(InitFromConfig(ctx, p, &Config{ L1WsEndpoint: os.Getenv("L1_NODE_WS_ENDPOINT"), - L1HttpEndpoint: os.Getenv("L1_NODE_HTTP_ENDPOINT"), L2WsEndpoint: os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"), L2HttpEndpoint: os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT"), TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),