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 incentives query filtering (backport #1759) #1813

Merged
merged 2 commits into from
Jun 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2022

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

On branch mergify/bp/v10.x/pr-1759
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit b464728.
  (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:   CHANGELOG.md
	modified:   x/incentives/keeper/grpc_query.go
	modified:   x/incentives/keeper/suite_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/incentives/keeper/grpc_query_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

* fix filtering logic

* add test

* format

* fix: append element in loop

* use range

* optimize code, make filtering into a separate function

* format

* add to changelog

(cherry picked from commit b464728)

# Conflicts:
#	x/incentives/keeper/grpc_query_test.go
@mergify mergify bot requested a review from a team June 15, 2022 16:47
@mergify mergify bot added the conflicts label Jun 15, 2022
@ValarDragon ValarDragon merged commit 1ec7a9c into v10.x Jun 15, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v10.x/pr-1759 branch June 15, 2022 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants