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

style: lint stableswap the same as the rest of osmosis (backport #5105) #5111

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2023

This is an automatic backport of pull request #5105 done by Mergify.
Cherry-pick of c1c96f4 has failed:

On branch mergify/bp/v15.x/pr-5105
Your branch is up to date with 'origin/v15.x'.

You are currently cherry-picking commit c1c96f44.
  (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:   .golangci.yml
	modified:   x/gamm/pool-models/stableswap/amm.go
	modified:   x/gamm/pool-models/stableswap/amm_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.sum
	deleted by us:   tests/cl-go-client/go.mod
	deleted by us:   tests/cl-go-client/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* sync

* lint stableswap in the same manner as any other component of Osmosis

* add changelog entry

(cherry picked from commit c1c96f4)

# Conflicts:
#	CHANGELOG.md
#	go.sum
#	tests/cl-go-client/go.mod
#	tests/cl-go-client/go.sum
@mergify mergify bot added the conflicts label May 7, 2023
@mergify mergify bot assigned faddat May 7, 2023
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. T:CI labels May 7, 2023
@faddat
Copy link
Member

faddat commented May 7, 2023

k :)

@faddat
Copy link
Member

faddat commented May 7, 2023

state breaking lets ditch

@faddat faddat closed this May 7, 2023
@mergify mergify bot deleted the mergify/bp/v15.x/pr-5105 branch May 7, 2023 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/gamm Changes, features and bugs related to the gamm module. conflicts T:CI
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant