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

Simplify SendPacket API (backport #1703) #2482

Merged
merged 8 commits into from
Oct 11, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

This is an automatic backport of pull request #1703 done by Mergify.
Cherry-pick of 88525d2 has failed:

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

You are currently cherry-picking commit 88525d2.
  (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:   docs/ibc/apps.md
	modified:   docs/ibc/apps/ibcmodule.md
	modified:   docs/ibc/apps/packets_acks.md
	modified:   docs/ibc/middleware/develop.md
	new file:   docs/migrations/v5-to-v6.md
	modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/relay.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/relay_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/types/expected_keepers.go
	modified:   modules/apps/29-fee/ibc_middleware.go
	modified:   modules/apps/29-fee/keeper/relay.go
	modified:   modules/apps/29-fee/types/expected_keepers.go
	modified:   modules/apps/transfer/keeper/keeper.go
	modified:   modules/apps/transfer/keeper/relay.go
	modified:   modules/apps/transfer/keeper/relay_test.go
	modified:   modules/apps/transfer/types/expected_keepers.go
	modified:   modules/core/04-channel/keeper/timeout_test.go
	modified:   modules/core/05-port/types/module.go
	modified:   testing/endpoint.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/29-fee/keeper/keeper.go
	both modified:   modules/core/04-channel/keeper/packet.go
	both modified:   modules/core/04-channel/keeper/packet_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

## Description

closes: #1395

---

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

- [x] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting))
- [x] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules/structure.md).
- [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing)
- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`)
- [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).
- [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md`
- [ ] Re-reviewed `Files changed` in the Github PR explorer
- [ ] Review `Codecov Report` in the comment section below once CI passes

(cherry picked from commit 88525d2)

# Conflicts:
#	modules/apps/29-fee/keeper/keeper.go
#	modules/core/04-channel/keeper/packet.go
#	modules/core/04-channel/keeper/packet_test.go
@lgtm-com
Copy link

lgtm-com bot commented Oct 6, 2022

This pull request introduces 3 alerts when merging ec3b725 into cbf86ff - view on LGTM.com

new alerts:

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

@crodriguezvega crodriguezvega self-assigned this Oct 7, 2022
@crodriguezvega
Copy link
Contributor

I will fix the conflicts.

@@ -37,7 +38,7 @@ type Keeper struct {
// NewKeeper creates a new interchain accounts controller Keeper instance
func NewKeeper(
cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
ics4Wrapper icatypes.ICS4Wrapper, channelKeeper icatypes.ChannelKeeper, portKeeper icatypes.PortKeeper,
ics4Wrapper porttypes.ICS4Wrapper, channelKeeper icatypes.ChannelKeeper, portKeeper icatypes.PortKeeper,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I think we need to document this API breaking change in the migration docs as well.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can. It shouldn't come up as an issue unless the provided module didn't entirely fulfill the ICS4Wrapper interface as defined by 05-port

@@ -37,7 +38,7 @@ type Keeper struct {
// NewKeeper creates a new interchain accounts host Keeper instance
func NewKeeper(
cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
ics4Wrapper icatypes.ICS4Wrapper, channelKeeper icatypes.ChannelKeeper, portKeeper icatypes.PortKeeper,
ics4Wrapper porttypes.ICS4Wrapper, channelKeeper icatypes.ChannelKeeper, portKeeper icatypes.PortKeeper,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this change to migration docs as well.

cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
ics4Wrapper types.ICS4Wrapper, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper, authKeeper types.AccountKeeper, bankKeeper types.BankKeeper,
cdc codec.BinaryCodec, key storetypes.StoreKey,
ics4Wrapper porttypes.ICS4Wrapper, channelKeeper types.ChannelKeeper,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add to migration docs.

@@ -31,7 +32,7 @@ type Keeper struct {
// NewKeeper creates a new IBC transfer Keeper instance
func NewKeeper(
cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
ics4Wrapper types.ICS4Wrapper, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper,
ics4Wrapper porttypes.ICS4Wrapper, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add to migration docs.

@crodriguezvega crodriguezvega removed their assignment Oct 10, 2022
@colin-axner colin-axner merged commit 3dd5a93 into release/v6.0.x Oct 11, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v6.0.x/pr-1703 branch October 11, 2022 11:12
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.

4 participants