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

Validate before calculating checksum, move private functions at end, add context to mockvm errors. (backport #5157) #5265

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2023

This is an automatic backport of pull request #5157 done by Mergify.
Cherry-pick of 4bb8edd has failed:

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5157
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 4bb8edd9.
  (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/keeper/keeper.go
	modified:   modules/light-clients/08-wasm/keeper/msg_server_test.go
	modified:   modules/light-clients/08-wasm/testing/mock_engine.go

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

…add context to mockvm errors. (#5157)

* Validate before calculating checksum, move private functions at end in vm.go, add context to mockvm errors.

* panic with errors.

(cherry picked from commit 4bb8edd)

# Conflicts:
#	modules/light-clients/08-wasm/types/vm.go
@DimitrisJim DimitrisJim force-pushed the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5157 branch from 4201a7e to 8df42fe Compare November 30, 2023 11:16
Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM

DimitrisJim
DimitrisJim approved these changes Nov 30, 2023
@DimitrisJim DimitrisJim merged commit 08a9741 into 08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x Nov 30, 2023
17 checks passed
@DimitrisJim DimitrisJim deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5157 branch November 30, 2023 11:29
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