Finschia / finschia-sdk

A framework for building blockchains based Finschia Mainnet that is forked from cosmos-sdk
Apache License 2.0
62 stars 29 forks source link

fix(server): properly parse multiple gas config(backport cosmos/cosmos-sdk#18537) (backport #1337) #1344

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 5 months ago

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

mergify[bot] commented 5 months ago

Cherry-pick of 78499290a7616449f22aaf6991c0c0cb80432aa7 has failed:

On branch mergify/bp/release/v0.47.x/pr-1337
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 78499290a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   server/config/config.go
    modified:   server/config/config_test.go
    modified:   server/config/toml.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

codecov[bot] commented 5 months ago

Codecov Report

Attention: Patch coverage is 33.33333% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 62.15%. Comparing base (92d75cf) to head (84ef175). Report is 10 commits behind head on release/v0.47.x.

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344/graphs/tree.svg?width=650&height=150&src=pr&token=m16qfzIPO7&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) ```diff @@ Coverage Diff @@ ## release/v0.47.x #1344 +/- ## =================================================== + Coverage 62.04% 62.15% +0.10% =================================================== Files 655 655 Lines 78983 78863 -120 =================================================== + Hits 49004 49014 +10 + Misses 27293 27162 -131 - Partials 2686 2687 +1 ``` | [Files](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [server/config/toml.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344?src=pr&el=tree&filepath=server%2Fconfig%2Ftoml.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-c2VydmVyL2NvbmZpZy90b21sLmdv) | `20.00% <ø> (ø)` | | | [server/config/config.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344?src=pr&el=tree&filepath=server%2Fconfig%2Fconfig.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-c2VydmVyL2NvbmZpZy9jb25maWcuZ28=) | `46.25% <33.33%> (+2.83%)` | :arrow_up: | ... and [1 file with indirect coverage changes](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1344/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)