Skip to content

chore: set up IBCTestStakingKeeper interface (backport #2028)#2487

Merged
crodriguezvega merged 3 commits intorelease/v6.0.xfrom
mergify/bp/release/v6.0.x/pr-2028
Oct 8, 2022
Merged

chore: set up IBCTestStakingKeeper interface (backport #2028)#2487
crodriguezvega merged 3 commits intorelease/v6.0.xfrom
mergify/bp/release/v6.0.x/pr-2028

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

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

On branch mergify/bp/release/v6.0.x/pr-2028
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit 4d4dbcf.
  (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:   testing/README.md
	modified:   testing/chain_test.go
	new file:   testing/types/expected_keepers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   testing/app.go
	both modified:   testing/simapp/app.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

* initial interface definition

* update simapp

* update godocs

(cherry picked from commit 4d4dbcf)

# Conflicts:
#	CHANGELOG.md
#	testing/app.go
#	testing/simapp/app.go
@damiannolan
Copy link
Contributor

Found this was missing when upgrading icad to v6.0.0-alpha1

@crodriguezvega crodriguezvega merged commit 467fdd8 into release/v6.0.x Oct 8, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2028 branch October 8, 2022 20:32
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.

3 participants