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

x/gamm: Make all internal set functions private (backport #2013) #2107

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2022

This is an automatic backport of pull request #2013 done by Mergify.
Cherry-pick of 7fb5f82 has failed:

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

You are currently cherry-picking commit 7fb5f824.
  (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:   app/apptesting/test_suite.go
	modified:   app/upgrades/v9/prop214.go
	modified:   app/upgrades/v9/prop214_test.go
	new file:   x/gamm/keeper/export_test.go
	modified:   x/gamm/keeper/params.go
	modified:   x/gamm/keeper/pool.go
	modified:   x/gamm/keeper/pool_service.go
	modified:   x/gamm/keeper/share.go
	modified:   x/gamm/keeper/swap.go
	modified:   x/gamm/keeper/total_liquidity.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/upgrades/v4/upgrade_test.go
	both modified:   app/upgrades/v4/upgrades.go
	both modified:   x/gamm/genesis.go

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

Closes: #1945

## What is the purpose of the change

I believe these functions were only public because they needed to be for an older SDK version. I think it would be appropriate to make them private now so that they aren't exposed to other modules.

## Brief Changelog

- Made the following functions private:
`SetParams`
`SetPool`
`SetTotalLiquidity`
`SetDenomLiquidity`
- Commented out old upgrade code that prevented `SetParams` and `SetPool` from being made private
- Removed use of `SetParams` in a superfluid test

## Testing and Verifying

This change is a trivial rework / code cleanup without any test coverage.

## Documentation and Release Note

  - Does this pull request introduce a new feature or user-facing behavior changes? (no)
  - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? (no)
  - How is the feature or change documented? (not documented)

(cherry picked from commit 7fb5f82)

# Conflicts:
#	CHANGELOG.md
#	app/upgrades/v4/upgrade_test.go
#	app/upgrades/v4/upgrades.go
#	x/gamm/genesis.go
@mergify mergify bot requested a review from a team July 18, 2022 02:23
@mergify mergify bot added the conflicts label Jul 18, 2022
@github-actions github-actions bot added the C:x/gamm Changes, features and bugs related to the gamm module. label Jul 18, 2022
@p0mvn p0mvn marked this pull request as draft July 19, 2022 18:41
@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2022

This pull request has been automatically marked as stale because it has not had any recent activity. It will be closed if no further activity occurs. Thank you!

@github-actions github-actions bot added the Stale label Aug 3, 2022
@p0mvn
Copy link
Member

p0mvn commented Aug 3, 2022

Closing since, we would have to be backporting to v11.x instead

@p0mvn p0mvn closed this Aug 3, 2022
@mergify mergify bot deleted the mergify/bp/v10.x/pr-2013 branch August 3, 2022 15:12
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 Stale
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants