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

fix: return correct types in wasm tests and add expected err (backport #5883) #5887

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2024

This is an automatic backport of pull request #5883 done by Mergify.
Cherry-pick of 6b11895 has failed:

On branch mergify/bp/08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x/pr-5883
Your branch is up to date with 'origin/08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x'.

You are currently cherry-picking commit 6b118957.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/types/querier_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

Co-authored-by: Cian Hatton cian@interchain.io

(cherry picked from commit 6b11895)

# Conflicts:
#	modules/light-clients/08-wasm/types/querier_test.go
@crodriguezvega crodriguezvega self-assigned this Feb 21, 2024
Carlos Rodriguez added 4 commits February 21, 2024 22:41
…o mergify/bp/08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x/pr-5883

# Conflicts:
#	modules/light-clients/08-wasm/types/querier_test.go
@damiannolan
Copy link
Member

Think we also need: #5878

Not sure why it hasn't popped with mergify yet!

Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

LGTM!

…o mergify/bp/08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x/pr-5883
@crodriguezvega crodriguezvega merged commit 5b36e01 into 08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x Feb 23, 2024
21 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/08-wasm/release/v0.2.x+ibc-go-v8.2.x-wasmvm-v2.0.x/pr-5883 branch February 23, 2024 12:02
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