Skip to content

Commit

Permalink
chore: remove ChanCheckTxSize and RPCIdleTimeout settings
Browse files Browse the repository at this point in the history
  • Loading branch information
zemyblue committed Nov 20, 2023
1 parent dc2ff66 commit 8fd88a0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 23 deletions.
13 changes: 0 additions & 13 deletions server/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ const (
// DefaultGRPCWebAddress defines the default address to bind the gRPC-web server to.
DefaultGRPCWebAddress = "0.0.0.0:9091"

// DefaultChanCheckTxSize defines the default size of channel check tx in Baseapp
DefaultChanCheckTxSize = 10000

// DefaultGRPCMaxRecvMsgSize defines the default gRPC max message size in
// bytes the server can receive.
DefaultGRPCMaxRecvMsgSize = 1024 * 1024 * 10
Expand Down Expand Up @@ -96,9 +93,6 @@ type BaseConfig struct {
// When true, Prometheus metrics are served under /metrics on prometheus_listen_addr in config.toml.
// It works when tendermint's prometheus option (config.toml) is set to true.
Prometheus bool `mapstructure:"prometheus"`

// ChanCheckTxSize is the size of RequestCheckTxAsync of BaseApp
ChanCheckTxSize uint `mapstructure:"chan-check-tx-size"`
}

// APIConfig defines the API listener configuration.
Expand All @@ -124,9 +118,6 @@ type APIConfig struct {
// RPCWriteTimeout defines the Tendermint RPC write timeout (in seconds)
RPCWriteTimeout uint `mapstructure:"rpc-write-timeout"`

// RPCIdleTimeout defines the Tendermint RPC idle timeout (in seconds)
RPCIdleTimeout uint `mapstructure:"rpc-idle-timeout"`

// RPCMaxBodyBytes defines the Tendermint maximum response body (in bytes)
RPCMaxBodyBytes uint `mapstructure:"rpc-max-body-bytes"`

Expand Down Expand Up @@ -253,7 +244,6 @@ func DefaultConfig() *Config {
InterBlockCacheSize: cache.DefaultCommitKVStoreCacheSize,
IAVLCacheSize: iavl.DefaultIAVLCacheSize,
IAVLDisableFastNode: true,
ChanCheckTxSize: DefaultChanCheckTxSize,
},
Telemetry: telemetry.Config{
Enabled: false,
Expand All @@ -266,7 +256,6 @@ func DefaultConfig() *Config {
MaxOpenConnections: 1000,
RPCReadTimeout: 10,
RPCWriteTimeout: 10,
RPCIdleTimeout: 60,
RPCMaxBodyBytes: 1000000,
},
GRPC: GRPCConfig{
Expand Down Expand Up @@ -326,7 +315,6 @@ func GetConfig(v *viper.Viper) (Config, error) {
MinRetainBlocks: v.GetUint64("min-retain-blocks"),
IAVLDisableFastNode: v.GetBool("iavl-disable-fastnode"),
IAVLCacheSize: v.GetUint64("iavl-cache-size"),
ChanCheckTxSize: v.GetUint("chan-check-tx-size"),
},
Telemetry: telemetry.Config{
ServiceName: v.GetString("telemetry.service-name"),
Expand All @@ -344,7 +332,6 @@ func GetConfig(v *viper.Viper) (Config, error) {
MaxOpenConnections: v.GetUint("api.max-open-connections"),
RPCReadTimeout: v.GetUint("api.rpc-read-timeout"),
RPCWriteTimeout: v.GetUint("api.rpc-write-timeout"),
RPCIdleTimeout: v.GetUint("api.rpc-idle-timeout"),
RPCMaxBodyBytes: v.GetUint("api.rpc-max-body-bytes"),
EnableUnsafeCORS: v.GetBool("api.enabled-unsafe-cors"),
},
Expand Down
7 changes: 0 additions & 7 deletions server/config/toml.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ index-events = {{ .BaseConfig.IndexEvents }}
# It works when tendermint's prometheus option (config.toml) is set to true.
prometheus = {{ .BaseConfig.Prometheus }}
# ChanCheckTxSize is the size of RequestCheckTxAsync of BaseApp.
# ChanCheckTxSize should be equals to or greater than the mempool size set in config.toml of tendermint.
chan-check-tx-size = {{ .BaseConfig.ChanCheckTxSize }}
###############################################################################
### Telemetry Configuration ###
###############################################################################
Expand Down Expand Up @@ -149,9 +145,6 @@ rpc-read-timeout = {{ .API.RPCReadTimeout }}
# RPCWriteTimeout defines the tendermint RPC write timeout (in seconds).
rpc-write-timeout = {{ .API.RPCWriteTimeout }}
# RPCIdleTimeout defines the tendermint RPC idle timeout (in seconds).
rpc-idle-timeout = {{ .API.RPCIdleTimeout }}
# RPCMaxBodyBytes defines the tendermint maximum response body (in bytes).
rpc-max-body-bytes = {{ .API.RPCMaxBodyBytes }}
Expand Down
3 changes: 0 additions & 3 deletions server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const (
FlagTrace = "trace"
FlagInvCheckPeriod = "inv-check-period"
FlagPrometheus = "prometheus"
FlagChanCheckTxSize = "chan-check-tx-size"

FlagPruning = "pruning"
FlagPruningKeepRecent = "pruning-keep-recent"
Expand Down Expand Up @@ -183,8 +182,6 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.

cmd.Flags().Bool(FlagPrometheus, false, "Enable prometheus metric for app")

cmd.Flags().Uint(FlagChanCheckTxSize, serverconfig.DefaultChanCheckTxSize, "The size of the channel check tx")

// add support for all Tendermint-specific command line options
tmcmd.AddNodeFlags(cmd)
return cmd
Expand Down

0 comments on commit 8fd88a0

Please sign in to comment.