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

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

mergify[bot] commented 4 months ago

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

codecov[bot] commented 4 months ago

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](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380/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/1380?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.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](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [x/fbridge/types/codec.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380?src=pr&el=tree&filepath=x%2Ffbridge%2Ftypes%2Fcodec.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mYnJpZGdlL3R5cGVzL2NvZGVjLmdv) | `57.50% <100.00%> (+1.08%)` | :arrow_up: | | [x/fbridge/types/keys.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380?src=pr&el=tree&filepath=x%2Ffbridge%2Ftypes%2Fkeys.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mYnJpZGdlL3R5cGVzL2tleXMuZ28=) | `0.00% <ø> (ø)` | | | [x/fbridge/types/msgs.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380?src=pr&el=tree&filepath=x%2Ffbridge%2Ftypes%2Fmsgs.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mYnJpZGdlL3R5cGVzL21zZ3MuZ28=) | `66.66% <100.00%> (+66.66%)` | :arrow_up: | | [x/fswap/types/msgs.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1380?src=pr&el=tree&filepath=x%2Ffswap%2Ftypes%2Fmsgs.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC90eXBlcy9tc2dzLmdv) | `24.32% <85.71%> (+24.32%)` | :arrow_up: |