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 bug where amino is not supported in fswap and fbridge (backport #1378) #1380

Merged
merged 5 commits into from
May 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Description

  • Fix bug where amino is not supported in fswap and fbridge

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 #1378 done by [Mergify](https://mergify.com).

* fix: does not support fswap and fbridge amino bug

* chore: update swagger for fbridge

* chore: update changelog

* chore: add unittest for amino msg.

* chore: add unittest for amino msg.

(cherry picked from commit ed74ee8)

# Conflicts:
#	client/docs/swagger-ui/swagger.yaml
@mergify mergify bot requested a review from tkxkd0159 as a code owner May 13, 2024 01:43
@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of ed74ee8 has failed:

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

You are currently cherry-picking commit ed74ee8a8.
  (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:   CHANGELOG.md
	modified:   x/fbridge/module/module.go
	modified:   x/fbridge/types/codec.go
	modified:   x/fbridge/types/keys.go
	modified:   x/fbridge/types/msgs.go
	new file:   x/fbridge/types/msgs_test.go
	modified:   x/fswap/types/keys.go
	modified:   x/fswap/types/msgs.go
	new file:   x/fswap/types/msgs_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/docs/swagger-ui/swagger.yaml

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

@mergify mergify bot requested review from zemyblue, 0Tech and jaeseung-bae as code owners May 13, 2024 01:43
Copy link

codecov bot commented May 13, 2024

Codecov Report

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

Project coverage is 68.93%. Comparing base (1da1023) to head (033051d).

Additional details and impacted files

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v0.49.x    #1380      +/-   ##
===================================================
+ Coverage            68.87%   68.93%   +0.06%     
===================================================
  Files                  671      671              
  Lines                69197    69256      +59     
===================================================
+ Hits                 47657    47742      +85     
+ Misses               19260    19234      -26     
  Partials              2280     2280              
Files Coverage Δ
x/fbridge/types/codec.go 57.50% <100.00%> (+1.08%) ⬆️
x/fbridge/types/keys.go 0.00% <ø> (ø)
x/fbridge/types/msgs.go 66.66% <100.00%> (+66.66%) ⬆️
x/fswap/types/msgs.go 24.32% <85.71%> (+24.32%) ⬆️

zemyblue
zemyblue previously approved these changes May 13, 2024
jaeseung-bae
jaeseung-bae previously approved these changes May 13, 2024
@zemyblue zemyblue added the A: bug Something isn't working label May 13, 2024
* release/v0.49.x:
  fix: add missing router registration (backport #1379) (#1381)

# Conflicts:
#	CHANGELOG.md
@zemyblue zemyblue dismissed stale reviews from jaeseung-bae and themself via 033051d May 13, 2024 02:57
@zemyblue zemyblue self-requested a review May 13, 2024 03:05
@zemyblue zemyblue self-assigned this May 13, 2024
@zemyblue zemyblue merged commit 2b4474c into release/v0.49.x May 13, 2024
29 checks passed
@zemyblue zemyblue deleted the mergify/bp/release/v0.49.x/pr-1378 branch May 13, 2024 03:07
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants