diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 24cabc3f39..77ef6afe24 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -130,9 +130,6 @@ var ( utils.RPCListenAddrFlag, utils.RPCPortFlag, utils.RPCApiFlag, - utils.RPCReadTimeoutFlag, - utils.RPCWriteTimeoutFlag, - utils.RPCIdleTimeoutFlag, utils.WSEnabledFlag, utils.WSListenAddrFlag, utils.WSPortFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index fb5629be7b..6a12a66cc2 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -149,9 +149,6 @@ var AppHelpFlagGroups = []flagGroup{ utils.RPCListenAddrFlag, utils.RPCPortFlag, utils.RPCApiFlag, - utils.RPCReadTimeoutFlag, - utils.RPCWriteTimeoutFlag, - utils.RPCIdleTimeoutFlag, utils.WSEnabledFlag, utils.WSListenAddrFlag, utils.WSPortFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5c53fed55d..522ad06b61 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -57,7 +57,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/p2p/netutil" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "gopkg.in/urfave/cli.v1" ) @@ -386,21 +385,6 @@ var ( Usage: "HTTP-RPC server listening port", Value: node.DefaultHTTPPort, } - RPCReadTimeoutFlag = cli.DurationFlag{ - Name: "rpcreadtimeout", - Usage: "HTTP-RPC server read timeout", - Value: rpc.DefaultHTTPReadTimeout, - } - RPCWriteTimeoutFlag = cli.DurationFlag{ - Name: "rpcwritetimeout", - Usage: "HTTP-RPC server write timeout", - Value: rpc.DefaultHTTPWriteTimeout, - } - RPCIdleTimeoutFlag = cli.DurationFlag{ - Name: "rpcidletimeout", - Usage: "HTTP-RPC server idle timeout", - Value: rpc.DefaultHTTPIdleTimeout, - } RPCCORSDomainFlag = cli.StringFlag{ Name: "rpccorsdomain", Usage: "Comma separated list of domains from which to accept cross origin requests (browser enforced)", @@ -745,17 +729,6 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) { if ctx.GlobalIsSet(RPCVirtualHostsFlag.Name) { cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) } - - cfg.HTTPTimeouts = rpc.NewDefaultHTTPTimeouts() - if ctx.GlobalIsSet(RPCReadTimeoutFlag.Name) { - cfg.HTTPTimeouts.ReadTimeout = ctx.GlobalDuration(RPCReadTimeoutFlag.Name) - } - if ctx.GlobalIsSet(RPCWriteTimeoutFlag.Name) { - cfg.HTTPTimeouts.WriteTimeout = ctx.GlobalDuration(RPCWriteTimeoutFlag.Name) - } - if ctx.GlobalIsSet(RPCIdleTimeoutFlag.Name) { - cfg.HTTPTimeouts.IdleTimeout = ctx.GlobalDuration(RPCIdleTimeoutFlag.Name) - } } // setWS creates the WebSocket RPC listener interface string from the set