Skip to content

Commit 32fc0ca

Browse files
javaandflyjorgemmsilva
authored andcommitted
cmd/geth: remove unused parameter (ethereum#29602)
1 parent ba0469f commit 32fc0ca

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

cmd/geth/config.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/ethereum/go-ethereum/common/hexutil"
3838
"github.com/ethereum/go-ethereum/eth/catalyst"
3939
"github.com/ethereum/go-ethereum/eth/ethconfig"
40-
"github.com/ethereum/go-ethereum/internal/ethapi"
4140
"github.com/ethereum/go-ethereum/internal/flags"
4241
"github.com/ethereum/go-ethereum/internal/version"
4342
"github.com/ethereum/go-ethereum/log"
@@ -169,7 +168,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
169168
}
170169

171170
// makeFullNode loads geth configuration and creates the Ethereum backend.
172-
func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
171+
func makeFullNode(ctx *cli.Context) *node.Node {
173172
stack, cfg := makeConfigNode(ctx)
174173
if ctx.IsSet(utils.OverrideCancun.Name) {
175174
v := ctx.Uint64(utils.OverrideCancun.Name)
@@ -238,7 +237,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
238237
utils.Fatalf("failed to register catalyst service: %v", err)
239238
}
240239
}
241-
return stack, backend
240+
return stack
242241
}
243242

244243
// dumpConfig is the dumpconfig command.

cmd/geth/consolecmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ JavaScript API. See https://geth.ethereum.org/docs/interacting-with-geth/javascr
7070
func localConsole(ctx *cli.Context) error {
7171
// Create and start the node based on the CLI flags
7272
prepare(ctx)
73-
stack, backend := makeFullNode(ctx)
74-
startNode(ctx, stack, backend, true)
73+
stack := makeFullNode(ctx)
74+
startNode(ctx, stack, true)
7575
defer stack.Close()
7676

7777
// Attach to the newly started node and create the JavaScript console.

cmd/geth/main.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/ethereum/go-ethereum/eth/downloader"
3434
"github.com/ethereum/go-ethereum/ethclient"
3535
"github.com/ethereum/go-ethereum/internal/debug"
36-
"github.com/ethereum/go-ethereum/internal/ethapi"
3736
"github.com/ethereum/go-ethereum/internal/flags"
3837
"github.com/ethereum/go-ethereum/log"
3938
"github.com/ethereum/go-ethereum/metrics"
@@ -348,18 +347,18 @@ func geth(ctx *cli.Context) error {
348347
}
349348

350349
prepare(ctx)
351-
stack, backend := makeFullNode(ctx)
350+
stack := makeFullNode(ctx)
352351
defer stack.Close()
353352

354-
startNode(ctx, stack, backend, false)
353+
startNode(ctx, stack, false)
355354
stack.Wait()
356355
return nil
357356
}
358357

359358
// startNode boots up the system node and all registered protocols, after which
360359
// it unlocks any requested accounts, and starts the RPC/IPC interfaces and the
361360
// miner.
362-
func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isConsole bool) {
361+
func startNode(ctx *cli.Context, stack *node.Node, isConsole bool) {
363362
debug.Memsize.Add("node", stack)
364363

365364
// Start up the node itself

0 commit comments

Comments
 (0)