diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go index f125fca533..2baca165d0 100644 --- a/cmd/geth/retesteth.go +++ b/cmd/geth/retesteth.go @@ -896,7 +896,6 @@ func retesteth(ctx *cli.Context) error { } handler := node.NewHTTPHandlerStack(srv, cors, vhosts) - // start http server var RetestethHTTPTimeouts = rpc.HTTPTimeouts{ ReadTimeout: 120 * time.Second, diff --git a/graphql/service.go b/graphql/service.go index 2a1da808c3..64a06afc31 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -20,7 +20,6 @@ import ( "fmt" "net" "net/http" - "time" "github.com/ethereum/go-ethereum/internal/ethapi" "github.com/ethereum/go-ethereum/log" @@ -73,7 +72,7 @@ func (s *Service) Start(server *p2p.Server) error { // create handler stack and wrap the graphql handler handler := node.NewHTTPHandlerStack(s.handler, s.cors, s.vhosts) // make sure timeout values are meaningful - registerTimeouts(&s.timeouts) + rpc.CheckTimeouts(&s.timeouts) // create http server httpSrv := &http.Server{ Handler: handler, @@ -86,21 +85,6 @@ func (s *Service) Start(server *p2p.Server) error { return nil } -func registerTimeouts(timeouts *rpc.HTTPTimeouts) { - if timeouts.ReadTimeout < time.Second { - log.Warn("Sanitizing invalid HTTP read timeout", "provided", timeouts.ReadTimeout, "updated", rpc.DefaultHTTPTimeouts.ReadTimeout) - timeouts.ReadTimeout = rpc.DefaultHTTPTimeouts.ReadTimeout - } - if timeouts.WriteTimeout < time.Second { - log.Warn("Sanitizing invalid HTTP write timeout", "provided", timeouts.WriteTimeout, "updated", rpc.DefaultHTTPTimeouts.WriteTimeout) - timeouts.WriteTimeout = rpc.DefaultHTTPTimeouts.WriteTimeout - } - if timeouts.IdleTimeout < time.Second { - log.Warn("Sanitizing invalid HTTP idle timeout", "provided", timeouts.IdleTimeout, "updated", rpc.DefaultHTTPTimeouts.IdleTimeout) - timeouts.IdleTimeout = rpc.DefaultHTTPTimeouts.IdleTimeout - } -} - // newHandler returns a new `http.Handler` that will answer GraphQL queries. // It additionally exports an interactive query browser on the / endpoint. func newHandler(backend ethapi.Backend) (http.Handler, error) {