Skip to content

Commit

Permalink
fix(config): mempool.max-txs configuration is invalid (#17649)
Browse files Browse the repository at this point in the history
(cherry picked from commit b094b65)
  • Loading branch information
zakir-code authored and mergify[bot] committed Sep 7, 2023
1 parent 59f8183 commit d1f98af
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Bug Fixes

* (baseapp) [#17518](https://github.com/cosmos/cosmos-sdk/pull/17518) Utilizing voting power from vote extensions (CometBFT) instead of the current bonded tokens (x/staking) to determine if a set of vote extensions are valid.
* (config) [#17649](https://github.com/cosmos/cosmos-sdk/pull/17649) Fix `mempool.max-txs` configuration is invalid in `app.config`.

## [v0.50.0-rc.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.0-rc.0) - 2023-08-18

Expand Down
2 changes: 1 addition & 1 deletion server/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ type MempoolConfig struct {
// the mempool is disabled entirely, zero indicates that the mempool is
// unbounded in how many txs it may contain, and a positive value indicates
// the maximum amount of txs it may contain.
MaxTxs int
MaxTxs int `mapstructure:"max-txs"`
}

// State Streaming configuration
Expand Down
18 changes: 18 additions & 0 deletions server/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,21 @@ func TestSetConfigTemplate(t *testing.T) {
actual := setBuffer.String()
require.Equal(t, expected, actual, "resulting config strings")
}

func TestAppConfig(t *testing.T) {
appConfigFile := filepath.Join(t.TempDir(), "app.toml")
defer func() {
_ = os.Remove(appConfigFile)
}()

defAppConfig := DefaultConfig()
require.NoError(t, SetConfigTemplate(DefaultConfigTemplate))

Check failure on line 219 in server/config/config_test.go

View workflow job for this annotation

GitHub Actions / Analyze

SetConfigTemplate(DefaultConfigTemplate) (no value) used as value
require.NoError(t, WriteConfigFile(appConfigFile, defAppConfig))

Check failure on line 220 in server/config/config_test.go

View workflow job for this annotation

GitHub Actions / Analyze

WriteConfigFile(appConfigFile, defAppConfig) (no value) used as value (typecheck)

v := viper.New()
v.SetConfigFile(appConfigFile)
require.NoError(t, v.ReadInConfig())
appCfg := new(Config)
require.NoError(t, v.Unmarshal(appCfg))
require.EqualValues(t, appCfg, defAppConfig)
}
2 changes: 1 addition & 1 deletion server/config/toml.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ stop-node-on-err = {{ .Streaming.ABCI.StopNodeOnErr }}
#
# Note, this configuration only applies to SDK built-in app-side mempool
# implementations.
max-txs = "{{ .Mempool.MaxTxs }}"
max-txs = {{ .Mempool.MaxTxs }}
`

var configTemplate *template.Template
Expand Down

0 comments on commit d1f98af

Please sign in to comment.