ChanUpgradeOpen callback should not return an error. (#3899)

cosmos · Jun 19, 2023 · dc69cd5 · dc69cd5
1 parent ccb00fc
commit dc69cd5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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