Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2024

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

This is an automatic backport of pull request #1337 done by [Mergify](https://mergify.com).

…s-sdk#18537) (#1337)

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

* chore: update changelog

* chore: add missing PR link

(cherry picked from commit 7849929)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 26, 2024
Copy link
Contributor Author

mergify bot commented Apr 26, 2024

Cherry-pick of 7849929 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

Copy link

codecov bot commented Apr 26, 2024

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

@@                 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 Coverage Δ
server/config/toml.go 20.00% <ø> (ø)
server/config/config.go 46.25% <33.33%> (+2.83%) ⬆️

... and 1 file with indirect coverage changes

@0Tech 0Tech added A: bug Something isn't working C:server and removed conflicts labels May 16, 2024
@0Tech 0Tech merged commit c07d0d0 into release/v0.47.x May 24, 2024
40 of 41 checks passed
@0Tech 0Tech deleted the mergify/bp/release/v0.47.x/pr-1337 branch May 24, 2024 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: bug Something isn't working C:server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants