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 zero coins (backport #9229) #9242

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2021

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

On branch mergify/bp/release/v0.42.x/pr-9229
Your branch is up to date with 'origin/release/v0.42.x'.

You are currently cherry-picking commit f04b5dcb9.
  (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:   CHANGELOG.md
	both modified:   x/bank/keeper/genesis_test.go
	both modified:   x/bank/keeper/keeper.go
	both modified:   x/bank/keeper/keeper_test.go
	both modified:   x/bank/keeper/send.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://help.github.com/articles/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.io/

* fix zero coins issue

* fix tests

* udpate tests

* Review change

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* add change log

* review changes

* review changes

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit f04b5dc)

# Conflicts:
#	CHANGELOG.md
#	x/bank/keeper/genesis_test.go
#	x/bank/keeper/keeper.go
#	x/bank/keeper/keeper_test.go
#	x/bank/keeper/send.go
@mergify mergify bot added the conflicts label Apr 30, 2021
@lgtm-com
Copy link

lgtm-com bot commented Apr 30, 2021

This pull request introduces 2 alerts when merging 9e18396 into 75f84b5 - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable
  • 1 for Unreachable statement

@aaronc
Copy link
Member

aaronc commented Apr 30, 2021

I don't see how we can backport this. There was a change to supply behavior from 0.42. Closing

@aaronc aaronc closed this Apr 30, 2021
@mergify mergify bot deleted the mergify/bp/release/v0.42.x/pr-9229 branch April 30, 2021 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants