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

add empty keepers checking in ibc NewKeeper (backport #1284) #1378

Merged
merged 6 commits into from
May 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 16, 2022

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

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

You are currently cherry-picking commit f2577f9.
  (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/core/keeper/keeper.go
	new file:   modules/core/keeper/keeper_test.go

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

* add empty keepers checking in ibc NewKeeper

* check for empty exported keepers instead of empty sdk-defined keeper structs

* Update modules/core/keeper/keeper.go

Co-authored-by: colin axnér <[email protected]>

* remove func checkEmptyKeepers(), check empty keepers directly within func NewKeeper()

* modules/core/keeper KeeperTestSuite -> MsgServerTestSuite; creat new modules/core/keeper KeeperTestSuite for testing ibckeeper.NewKeeper()

* update CHANGELOG.md

* DummyStakingKeeper -> MockStakingKeeper

* refactor modules/core/keeper test

* Update modules/core/keeper/keeper_test.go

Co-authored-by: colin axnér <[email protected]>

* Update modules/core/keeper/keeper.go

Co-authored-by: colin axnér <[email protected]>

Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit f2577f9)

# Conflicts:
#	CHANGELOG.md
#	modules/core/keeper/msg_server_test.go
@crodriguezvega crodriguezvega merged commit 40d2a74 into release/v2.1.x May 18, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.1.x/pr-1284 branch May 18, 2022 09:17
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