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

chore: remove OnChanUpgradeRestore callbacks and discard state changes on app upgrade callbacks (backport #5696) #5701

Merged
merged 3 commits into from
Jan 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2024

This is an automatic backport of pull request #5696 done by Mergify.
Cherry-pick of 9faaff5 has failed:

On branch mergify/bp/release/v8.1.x/pr-5696
Your branch is up to date with 'origin/release/v8.1.x'.

You are currently cherry-picking commit 9faaff5f.
  (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:   modules/apps/27-interchain-accounts/controller/ibc_middleware.go
	modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go
	modified:   modules/apps/27-interchain-accounts/host/ibc_module.go
	modified:   modules/apps/29-fee/ibc_middleware.go
	modified:   modules/apps/callbacks/ibc_middleware.go
	modified:   modules/apps/transfer/ibc_module.go
	modified:   modules/core/05-port/types/module.go
	modified:   testing/mock/events.go
	modified:   testing/mock/ibc_app.go
	modified:   testing/mock/ibc_module.go
	modified:   testing/mock/mock.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/docs/01-ibc/06-channel-upgrades.md
	both modified:   modules/core/keeper/msg_server.go
	both modified:   modules/core/keeper/msg_server_test.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

…ges on app upgrade callbacks (#5696)

* docs: remove refs to OnChanUpgradeRestore in docs

* testing: rm OnChanUpgradeRestore callback from mock app test helpers

* chore: rm OnChanUpgradeRestore application callback from ibc core and apps

* chore: discard app state changes by using a cacheCtx and discarding writeFn

* docs: add godoc notes to app callbacks discarding state changes

* test: adding unit tests for discarding app state changes

* chore: clean imports

* chore: review suggestions for in-line docstring comments

* chore: fix linting tests, add mock types for testing kv and events

* doc: add more context to in-line docstrings

(cherry picked from commit 9faaff5)

# Conflicts:
#	docs/docs/01-ibc/06-channel-upgrades.md
#	modules/core/keeper/msg_server.go
#	modules/core/keeper/msg_server_test.go
@damiannolan
Copy link
Member

waiting on #5699

@damiannolan damiannolan removed their assignment Jan 24, 2024
@colin-axner colin-axner merged commit 1f7a5fb into release/v8.1.x Jan 24, 2024
19 checks passed
@colin-axner colin-axner deleted the mergify/bp/release/v8.1.x/pr-5696 branch January 24, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants