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 mock module acc balance and refactor test case (backport #1942) #1952

Merged
merged 3 commits into from
Aug 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2022

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

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

You are currently cherry-picking commit f0f7ce4.
  (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/apps/29-fee/keeper/escrow_test.go
	modified:   testing/chain.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/apps/29-fee/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 mock module acc balance and refactor test case

* add changelog entry

(cherry picked from commit f0f7ce4)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/29-fee/keeper/msg_server_test.go
Carlos Rodriguez added 2 commits August 9, 2022 22:47
@crodriguezvega crodriguezvega merged commit a3941f0 into release/v4.0.x Aug 9, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v4.0.x/pr-1942 branch August 9, 2022 21:10
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
) (cosmos#1952)

* add mock module acc balance and refactor test case (cosmos#1942)

* add mock module acc balance and refactor test case

* add changelog entry

(cherry picked from commit f0f7ce4)

* fix conflict

* fix conflict

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
) (cosmos#1952)

* add mock module acc balance and refactor test case (cosmos#1942)

* add mock module acc balance and refactor test case

* add changelog entry

(cherry picked from commit f0f7ce4)

* fix conflict

* fix conflict

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
) (cosmos#1952)

* add mock module acc balance and refactor test case (cosmos#1942)

* add mock module acc balance and refactor test case

* add changelog entry

(cherry picked from commit f0f7ce4)

* fix conflict

* fix conflict

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
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