From 82835307c7ae306a1bda38a90264e06bba2d4001 Mon Sep 17 00:00:00 2001 From: yihuang Date: Thu, 9 Jun 2022 17:20:50 +0800 Subject: [PATCH] imp(feemarket): min-gas-multiplier parameter should accept zero value (#1120) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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> --- CHANGELOG.md | 4 ++++ x/feemarket/types/params.go | 6 +++--- x/feemarket/types/params_test.go | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f3a3bf..f372bec2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/x/feemarket/types/params.go b/x/feemarket/types/params.go index ad998cae..55af8b77 100644 --- a/x/feemarket/types/params.go +++ b/x/feemarket/types/params.go @@ -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 } diff --git a/x/feemarket/types/params_test.go b/x/feemarket/types/params_test.go index 8664cd4c..835558f0 100644 --- a/x/feemarket/types/params_test.go +++ b/x/feemarket/types/params_test.go @@ -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, },