Skip to content

Commit

Permalink
imp(feemarket): min-gas-multiplier parameter should accept zero value (
Browse files Browse the repository at this point in the history
…evmos#1120)

* min-gas-multiplier parameter should accept zero value

update min-gas-multiplier validation logic

* fix unit test

* changelog

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
  • Loading branch information
yihuang and fedekunze authored Jun 9, 2022
1 parent b3fa23e commit 8283530
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (evm) [tharsis#1118](https://github.com/tharsis/ethermint/pull/1118) Fix `Type()` `Account` method `EmptyCodeHash` comparison

### Improvements

- (feemarket) [tharsis#1120](https://github.com/tharsis/ethermint/pull/1120) Make `min-gas-multiplier` parameter accept zero value

## [v0.16.0] - 2022-06-06

### State Machine Breaking
Expand Down
6 changes: 3 additions & 3 deletions x/feemarket/types/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ func validateMinGasMultiplier(i interface{}) error {
return fmt.Errorf("invalid parameter: nil")
}

if v.IsZero() || v.IsNegative() {
return fmt.Errorf("value cannot be zero or negative: %T", i)
if v.IsNegative() {
return fmt.Errorf("value cannot be negative: %s", v)
}

if v.GT(sdk.OneDec()) {
return fmt.Errorf("value cannot be greater than 1: %T", i)
return fmt.Errorf("value cannot be greater than 1: %s", v)
}
return nil
}
9 changes: 7 additions & 2 deletions x/feemarket/types/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,17 @@ func (suite *ParamsTestSuite) TestParamsValidate() {
true,
},
{
"invalid: min gas multiplier zero",
"valid: min gas multiplier zero",
NewParams(true, 7, 3, 2000000000, int64(544435345345435345), DefaultMinGasPrice, sdk.ZeroDec()),
false,
},
{
"invalid: min gas multiplier is negative",
NewParams(true, 7, 3, 2000000000, int64(544435345345435345), DefaultMinGasPrice, sdk.NewDecWithPrec(-5, 1)),
true,
},
{
"invalid: min gas multiplier",
"invalid: min gas multiplier bigger than 1",
NewParams(true, 7, 3, 2000000000, int64(544435345345435345), sdk.NewDecWithPrec(20, 4), sdk.NewDec(2)),
true,
},
Expand Down

0 comments on commit 8283530

Please sign in to comment.