Skip to content

imp(apps): added 'WithICS4Wrapper' function to keepers (backport #4187)#4210

Merged
srdtrk merged 2 commits intorelease/v7.3.xfrom
mergify/bp/release/v7.3.x/pr-4187
Aug 1, 2023
Merged

imp(apps): added 'WithICS4Wrapper' function to keepers (backport #4187)#4210
srdtrk merged 2 commits intorelease/v7.3.xfrom
mergify/bp/release/v7.3.x/pr-4187

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #4187 done by Mergify.
Cherry-pick of 561eb36 has failed:

On branch mergify/bp/release/v7.3.x/pr-4187
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 561eb36f.
  (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:
	new file:   modules/apps/27-interchain-accounts/controller/keeper/export_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/export_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.go
	new file:   modules/apps/29-fee/keeper/export_test.go
	modified:   modules/apps/29-fee/keeper/keeper.go
	modified:   modules/apps/29-fee/keeper/keeper_test.go
	new file:   modules/apps/transfer/keeper/export_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
	both modified:   modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
	both modified:   modules/apps/transfer/keeper/keeper.go
	both modified:   modules/apps/transfer/keeper/keeper_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

* imp(ica, transfer): added WithICS4Wrapper api function

* docs(ica, transfer): updated 'WithICS4Wrapper's godocs

* docs(adr8): updated godocs for withics4wrapper

* imp(ica/host): removed withics4wrapper from icahost

* style(ica, tranfer): ran golanci-lint

* imp(ica/controller_test): added WithICS4Wrapper test

* imp(transfer_test): added WithICS4Wrapper test

* style(transfer_test, ica/controller_test): added spacing to TestWithICS4Wrapper

* feat(ica/host): implemented 'WithICS4Wrapper'

* feat(fee): implemented 'WithICS4Wrapper'

(cherry picked from commit 561eb36)

# Conflicts:
#	modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
#	modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
#	modules/apps/transfer/keeper/keeper.go
#	modules/apps/transfer/keeper/keeper_test.go
@srdtrk srdtrk merged commit 001236b into release/v7.3.x Aug 1, 2023
@srdtrk srdtrk deleted the mergify/bp/release/v7.3.x/pr-4187 branch August 1, 2023 13:56
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