From 63cb1a6d1c54aec2522c0e3e09608f8beaa03563 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Fri, 23 Sep 2022 09:51:54 +0100 Subject: [PATCH 1/3] Move SetMiddlewareEnabled call ordering (#2283) (cherry picked from commit 25d62f0a61f23f4e6f7316a16ba68180d66a90bb) # Conflicts: # modules/apps/27-interchain-accounts/controller/keeper/account.go --- .../27-interchain-accounts/controller/keeper/account.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go index 27bb4376c55..193657adef2 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/account.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/account.go @@ -22,13 +22,22 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner, return err } +<<<<<<< HEAD channelID, err := k.registerInterchainAccount(ctx, connectionID, portID, version) +======= + k.SetMiddlewareEnabled(ctx, portID, connectionID) + + _, err = k.registerInterchainAccount(ctx, connectionID, portID, version) +>>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) if err != nil { return err } +<<<<<<< HEAD k.SetMiddlewareEnabled(ctx, portID, channelID) +======= +>>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) return nil } From 11e43da303cf344aead53154b7a1a8328c4ee37d Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Fri, 23 Sep 2022 10:31:28 +0100 Subject: [PATCH 2/3] chore: handle merge conflicts --- .../27-interchain-accounts/controller/keeper/account.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go index 193657adef2..5325b1bb241 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/account.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/account.go @@ -22,22 +22,13 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner, return err } -<<<<<<< HEAD - channelID, err := k.registerInterchainAccount(ctx, connectionID, portID, version) -======= k.SetMiddlewareEnabled(ctx, portID, connectionID) _, err = k.registerInterchainAccount(ctx, connectionID, portID, version) ->>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) if err != nil { return err } -<<<<<<< HEAD - k.SetMiddlewareEnabled(ctx, portID, channelID) - -======= ->>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) return nil } From 7b53a4de6428c69d641c25e5ff47cca066828c1d Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Fri, 23 Sep 2022 10:33:42 +0100 Subject: [PATCH 3/3] Revert "chore: handle merge conflicts" This reverts commit 11e43da303cf344aead53154b7a1a8328c4ee37d. --- .../27-interchain-accounts/controller/keeper/account.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go index 5325b1bb241..193657adef2 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/account.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/account.go @@ -22,13 +22,22 @@ func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, connectionID, owner, return err } +<<<<<<< HEAD + channelID, err := k.registerInterchainAccount(ctx, connectionID, portID, version) +======= k.SetMiddlewareEnabled(ctx, portID, connectionID) _, err = k.registerInterchainAccount(ctx, connectionID, portID, version) +>>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) if err != nil { return err } +<<<<<<< HEAD + k.SetMiddlewareEnabled(ctx, portID, channelID) + +======= +>>>>>>> 25d62f0 (Move SetMiddlewareEnabled call ordering (#2283)) return nil }