From 2ec7657cab7af7961ccd6b772c95c53cc33cf138 Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "cmd/geth: import package catalyst once (#27803)" This reverts commit 13645bb8d5bdaa4ecd7535b460e7dc22aa7f9054. --- cmd/geth/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 1a3de04bd4..b6c8004665 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -33,6 +33,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/usbwallet" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/eth/catalyst" + ethcatalyst "github.com/ethereum/go-ethereum/eth/catalyst" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/ethereum/go-ethereum/internal/ethapi" @@ -205,7 +206,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { catalyst.RegisterSimulatedBeaconAPIs(stack, simBeacon) stack.RegisterLifecycle(simBeacon) } else if cfg.Eth.SyncMode != downloader.LightSync { - err := catalyst.Register(stack, eth) + err := ethcatalyst.Register(stack, eth) if err != nil { utils.Fatalf("failed to register catalyst service: %v", err) }