diff --git a/cmd/geth/config.go b/cmd/geth/config.go index c4d0981216..befca177f7 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -197,7 +197,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { filterSystem := utils.RegisterFilterAPI(stack, backend, &cfg.Eth) // TODO: ENG191 add flag to request endpoint - utils.RegisterHealthService(stack, backend, &cfg.Node) + utils.RegisterHealthService(stack, &cfg.Node) // Configure GraphQL if requested. if ctx.IsSet(utils.GraphQLEnabledFlag.Name) { diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8186d40f7f..0f63c2e6a3 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1885,8 +1885,8 @@ func RegisterGraphQLService(stack *node.Node, backend ethapi.Backend, filterSyst } // RegisterHealthService adds the Health API to the node. -func RegisterHealthService(stack *node.Node, backend ethapi.Backend, cfg *node.Config) { - err := health.New(stack, backend, cfg.HTTPCors, cfg.HTTPVirtualHosts) +func RegisterHealthService(stack *node.Node, cfg *node.Config) { + err := health.New(stack, cfg.HTTPCors, cfg.HTTPVirtualHosts) if err != nil { Fatalf("Failed to register the health service: %v", err) } diff --git a/health/service.go b/health/service.go index c39c31d2d5..f1aba69042 100644 --- a/health/service.go +++ b/health/service.go @@ -4,7 +4,6 @@ import ( "net/http" "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/ethapi" "github.com/ethereum/go-ethereum/node" ) @@ -22,13 +21,13 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } // New constructs a new health service instance. -func New(stack *node.Node, backend ethapi.Backend, cors, vhosts []string) error { - _, err := newHandler(stack, backend, cors, vhosts) +func New(stack *node.Node, cors, vhosts []string) error { + _, err := newHandler(stack, cors, vhosts) return err } // newHandler returns a new `http.Handler` that will answer node health queries. -func newHandler(stack *node.Node, backend ethapi.Backend, cors, vhosts []string) (*handler, error) { +func newHandler(stack *node.Node, cors, vhosts []string) (*handler, error) { ec := ethclient.NewClient(stack.Attach()) h := handler{ec} handler := node.NewHTTPHandlerStack(h, cors, vhosts, nil)