Closed mergify[bot] closed 4 months ago
Cherry-pick of 97570b2d5868b100233debc09598f00daf65aa45 has failed:
On branch mergify/bp/release/v0.49.x/pr-1372
Your branch is up to date with 'origin/release/v0.49.x'.
You are currently cherry-picking commit 97570b2d5.
(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: docs/core/proto-docs.md
modified: proto/lbm/fswap/v1/fswap.proto
modified: proto/lbm/fswap/v1/tx.proto
modified: simapp/app.go
modified: x/fswap/client/cli/tx.go
deleted: x/fswap/client/proposal_handler.go
deleted: x/fswap/codec/codec.go
deleted: x/fswap/handler.go
modified: x/fswap/keeper/keeper.go
modified: x/fswap/keeper/keeper_test.go
modified: x/fswap/keeper/msg_server.go
modified: x/fswap/keeper/msg_server_test.go
deleted: x/fswap/keeper/proposal_test.go
deleted: x/fswap/proposal_handler_test.go
modified: x/fswap/types/codec.go
modified: x/fswap/types/fswap.go
modified: x/fswap/types/fswap.pb.go
modified: x/fswap/types/genesis.go
modified: x/fswap/types/msgs.go
deleted: x/fswap/types/proposal.go
modified: x/fswap/types/tx.pb.go
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: x/fswap/keeper/proposal.go
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
Attention: Patch coverage is 38.50267%
with 115 lines
in your changes are missing coverage. Please review.
Project coverage is 68.87%. Comparing base (
defb3ad
) to head (f13f678
). Report is 1 commits behind head on release/v0.49.x.
@jaeseung-bae , please check
lint
ci error.
I've checked. This branch use different lint version(v3) to main's one(v6). I could fix it but code will be different to code in original PR.
@jaeseung-bae , please check
lint
ci error.I've checked. This branch use different lint version(v3) to main's one(v6). I could fix it but code will be different to code in original PR.
I think this is a problem pr. https://github.com/Finschia/finschia-sdk/pull/1355 :)
How about pushing and completing PR whitch matches the lint version first and then solving this?
Oh. https://github.com/Finschia/finschia-sdk/pull/1374 PR is registered.
If we want to fix golang-lint error, we need to modify the golangci setting of this file. https://github.com/Finschia/finschia-sdk/blob/release/v0.49.x/.golangci.yml
Let's fix it later PR.
Description
closes: #XXXX
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.md
client/docs/swagger-ui/swagger.yaml
This is an automatic backport of pull request #1372 done by Mergify.