From dc69cd5c55a73cccf5cee2b253290faffd5e524c Mon Sep 17 00:00:00 2001 From: Jim Fasarakis-Hilliard Date: Mon, 19 Jun 2023 17:03:40 +0300 Subject: [PATCH] ChanUpgradeOpen callback should not return an error. (#3899) --- .../27-interchain-accounts/controller/ibc_middleware.go | 4 +--- modules/apps/27-interchain-accounts/host/ibc_module.go | 4 +--- modules/apps/29-fee/ibc_middleware.go | 4 ++-- modules/apps/transfer/ibc_module.go | 4 +--- modules/core/05-port/types/module.go | 2 +- testing/mock/ibc_app.go | 2 +- testing/mock/ibc_module.go | 6 ++---- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go index 8ecdc2810e5..a23398c77ae 100644 --- a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go +++ b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go @@ -241,9 +241,7 @@ func (im IBCMiddleware) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, cou } // OnChanUpgradeOpen implements the IBCModule interface -func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) error { - return errorsmod.Wrap(icatypes.ErrInvalidChannelFlow, "channel handshake must be initiated by controller chain") -} +func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) {} // OnChanUpgradeRestore implements the IBCModule interface func (im IBCMiddleware) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) error { diff --git a/modules/apps/27-interchain-accounts/host/ibc_module.go b/modules/apps/27-interchain-accounts/host/ibc_module.go index a2c2496af0e..cb011e338d3 100644 --- a/modules/apps/27-interchain-accounts/host/ibc_module.go +++ b/modules/apps/27-interchain-accounts/host/ibc_module.go @@ -165,9 +165,7 @@ func (im IBCModule) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, counter } // OnChanUpgradeOpen implements the IBCModule interface -func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) error { - return nil -} +func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) {} // OnChanUpgradeRestore implements the IBCModule interface func (im IBCModule) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) error { diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index cec040f91a8..0dd8cbad869 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -336,8 +336,8 @@ func (im IBCMiddleware) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, cou } // OnChanUpgradeOpen implements the IBCModule interface -func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) error { - return im.app.OnChanUpgradeOpen(ctx, portID, channelID) +func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) { + im.app.OnChanUpgradeOpen(ctx, portID, channelID) } // OnChanUpgradeRestore implements the IBCModule interface diff --git a/modules/apps/transfer/ibc_module.go b/modules/apps/transfer/ibc_module.go index 2cfbebbb08a..5b7db6a3f50 100644 --- a/modules/apps/transfer/ibc_module.go +++ b/modules/apps/transfer/ibc_module.go @@ -317,9 +317,7 @@ func (im IBCModule) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, counter } // OnChanUpgradeOpen implements the IBCModule interface -func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) error { - return nil -} +func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) {} // OnChanUpgradeRestore implements the IBCModule interface func (im IBCModule) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) error { diff --git a/modules/core/05-port/types/module.go b/modules/core/05-port/types/module.go index 525df1baa43..e370b72780a 100644 --- a/modules/core/05-port/types/module.go +++ b/modules/core/05-port/types/module.go @@ -141,7 +141,7 @@ type UpgradableModule interface { ctx sdk.Context, portID, channelID string, - ) error + ) // OnChanUpgradeRestore TODO OnChanUpgradeRestore( diff --git a/testing/mock/ibc_app.go b/testing/mock/ibc_app.go index 357a72128d1..076d014570e 100644 --- a/testing/mock/ibc_app.go +++ b/testing/mock/ibc_app.go @@ -114,7 +114,7 @@ type IBCApp struct { ctx sdk.Context, portID, channelID string, - ) error + ) OnChanUpgradeRestore func( ctx sdk.Context, diff --git a/testing/mock/ibc_module.go b/testing/mock/ibc_module.go index 161412e0bad..f93b79c30ae 100644 --- a/testing/mock/ibc_module.go +++ b/testing/mock/ibc_module.go @@ -190,12 +190,10 @@ func (im IBCModule) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, counter } // OnChanUpgradeOpen implements the IBCModule interface -func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) error { +func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) { if im.IBCApp.OnChanUpgradeOpen != nil { - return im.IBCApp.OnChanUpgradeOpen(ctx, portID, channelID) + im.IBCApp.OnChanUpgradeOpen(ctx, portID, channelID) } - - return nil } // OnChanUpgradeRestore implements the IBCModule interface