diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52ccc44cf5..48f4e3c309 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,7 +74,7 @@ jobs: - name: test & coverage report creation if: env.GIT_DIFF run: | - cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -race -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='ledger test_ledger_mock' + cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -race -timeout 60m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='ledger test_ledger_mock' - uses: actions/upload-artifact@v3 if: env.GIT_DIFF with: @@ -256,9 +256,9 @@ jobs: if: env.GIT_DIFF run: | cd simapp - go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./... + go test -mod=readonly -timeout 60m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./... - name: tests simapp v1 if: env.GIT_DIFF run: | cd simapp - go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./... \ No newline at end of file + go test -mod=readonly -timeout 60m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./... diff --git a/x/gashub/types/gas_calculator.go b/x/gashub/types/gas_calculator.go index 382ba424f2..f01e1fbc23 100644 --- a/x/gashub/types/gas_calculator.go +++ b/x/gashub/types/gas_calculator.go @@ -63,9 +63,6 @@ func GetGasCalculatorGen(mgp MsgGasParams) (GasCalculatorGenerator, error) { func FixedGasCalculator(amount uint64) GasCalculator { return func(msg types.Msg) (uint64, error) { - if amount == 0 { - return 0, errorsmod.Wrapf(errors.ErrInvalidMsgGasParams, "msg type: %s", types.MsgTypeURL(msg)) - } return amount, nil } } diff --git a/x/gashub/types/params.go b/x/gashub/types/params.go index 8130ac0c3b..39c6931fb4 100644 --- a/x/gashub/types/params.go +++ b/x/gashub/types/params.go @@ -92,9 +92,7 @@ func (mgp MsgGasParams) Validate() error { switch p := mgp.GasParams.(type) { case *MsgGasParams_FixedType: - if p.FixedType.FixedGas == 0 { - return fmt.Errorf("invalid gas. cannot be zero") - } + return nil case *MsgGasParams_GrantType: if p.GrantType.FixedGas == 0 || p.GrantType.GasPerItem == 0 { return fmt.Errorf("invalid gas. cannot be zero")