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

feat: support message based proposals (backport #1372) #1373

Merged
merged 3 commits into from
May 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 9, 2024

Description

closes: #XXXX

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

* feat: change MakeSwapProposal to foundation proposal

* chore: refactor MsgMakeSwapProposal -> MsgSetSwap

* chore: clean-up

* chore: use original proto stringer interface

* chore: remove unused proto annotations

* chore: allow gov and foundation as authority address

* chore: lint fix

* chore: remove redundant part

* chore: update changelog

(cherry picked from commit 97570b2)

# Conflicts:
#	x/fswap/keeper/proposal.go
@mergify mergify bot requested a review from tkxkd0159 as a code owner May 9, 2024 11:37
@mergify mergify bot added the conflicts label May 9, 2024
@mergify mergify bot requested a review from zemyblue as a code owner May 9, 2024 11:37
Copy link
Contributor Author

mergify bot commented May 9, 2024

Cherry-pick of 97570b2 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

@mergify mergify bot requested review from 0Tech and jaeseung-bae as code owners May 9, 2024 11:37
@jaeseung-bae jaeseung-bae self-assigned this May 9, 2024
@jaeseung-bae jaeseung-bae added A: improvement Changes in existing functionality and removed conflicts labels May 9, 2024
Copy link

codecov bot commented May 9, 2024

Codecov Report

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.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           release/v0.49.x    #1373   +/-   ##
================================================
  Coverage            68.86%   68.87%           
================================================
  Files                  675      671    -4     
  Lines                69204    69197    -7     
================================================
- Hits                 47660    47657    -3     
+ Misses               19264    19260    -4     
  Partials              2280     2280           
Files Coverage Δ
simapp/app.go 82.23% <100.00%> (-0.05%) ⬇️
x/fswap/types/fswap.go 4.76% <ø> (+0.84%) ⬆️
x/fswap/types/codec.go 57.89% <88.88%> (+17.89%) ⬆️
x/fswap/types/genesis.go 25.00% <0.00%> (-7.00%) ⬇️
x/fswap/keeper/msg_server.go 43.18% <0.00%> (-12.71%) ⬇️
x/fswap/types/msgs.go 0.00% <0.00%> (ø)
x/fswap/keeper/keeper.go 46.57% <44.92%> (-2.01%) ⬇️

... and 2 files with indirect coverage changes

Copy link
Member

@zemyblue zemyblue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaeseung-bae , please check lint ci error.

@jaeseung-bae
Copy link
Contributor

jaeseung-bae commented May 9, 2024

@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.

@zemyblue
Copy link
Member

zemyblue commented May 9, 2024

@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. #1355 :)

How about pushing and completing PR whitch matches the lint version first and then solving this?

@zemyblue
Copy link
Member

zemyblue commented May 9, 2024

Oh. #1374 PR is registered.

* release/v0.49.x:
  chore(deps): Bump golangci/golangci-lint-action from 4 to 6 (backport #1355) (#1374)
@zemyblue
Copy link
Member

zemyblue commented May 9, 2024

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.

@jaeseung-bae jaeseung-bae merged commit fb1c2b0 into release/v0.49.x May 9, 2024
35 of 37 checks passed
@jaeseung-bae jaeseung-bae deleted the mergify/bp/release/v0.49.x/pr-1372 branch May 9, 2024 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: improvement Changes in existing functionality automerge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants