Skip to content

Don't panic during any store operations. (backport #5294)#5303

Merged
DimitrisJim merged 2 commits into08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.xfrom
mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5294
Dec 4, 2023
Merged

Don't panic during any store operations. (backport #5294)#5303
DimitrisJim merged 2 commits into08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.xfrom
mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5294

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Dec 4, 2023

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

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5294
Your branch is up to date with 'origin/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x'.

You are currently cherry-picking commit b7d6a305.
  (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/light-clients/08-wasm/types/store.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/types/export_test.go
	both modified:   modules/light-clients/08-wasm/types/store_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

* Don't panic during any store operations.

* Panic when creating wrapped store if substores are nil.

* Address Damian's feedback.

(cherry picked from commit b7d6a30)

# Conflicts:
#	modules/light-clients/08-wasm/types/export_test.go
#	modules/light-clients/08-wasm/types/store_test.go
@DimitrisJim DimitrisJim added priority PRs that need prompt reviews and removed conflicts labels Dec 4, 2023
@DimitrisJim DimitrisJim removed their assignment Dec 4, 2023
@DimitrisJim DimitrisJim merged commit d8b03ea into 08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x Dec 4, 2023
@DimitrisJim DimitrisJim deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5294 branch December 4, 2023 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

priority PRs that need prompt reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants