Apply suggestions from code review

Co-authored-by: Damian Nolan <[email protected]>
cosmos · Jul 5, 2023 · 9c6b97e · 9c6b97e
1 parent 77c771e
commit 9c6b97e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go
@@ -877,15 +877,15 @@ func (k Keeper) ChannelUpgradeOpen(goCtx context.Context, msg *channeltypes.MsgC
 	}
 
 	if err = k.ChannelKeeper.ChanUpgradeOpen(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyChannelState, msg.ProofChannel, msg.ProofHeight); err != nil {
-		ctx.Logger().Error("channel upgrade open failed", "error", errorsmod.Wrap(err, "channel handshake upgrade open failed"))
-		return nil, errorsmod.Wrap(err, "channel handshake upgrade open failed")
+		ctx.Logger().Error("channel upgrade open failed", "error", errorsmod.Wrap(err, "channel upgrade open failed"))
+		return nil, errorsmod.Wrap(err, "channel upgrade open failed")
 	}
 
 	cbs.OnChanUpgradeOpen(ctx, msg.PortId, msg.ChannelId)
 
 	k.ChannelKeeper.WriteUpgradeOpenChannel(ctx, msg.PortId, msg.ChannelId)
 
-	ctx.Logger().Info("channel upgrade open succeeded", "channel-id", msg.ChannelId, "port-id", msg.PortId)
+	ctx.Logger().Info("channel upgrade open succeeded", "port-id", msg.PortId, "channel-id", msg.ChannelId)
 
 	return &channeltypes.MsgChannelUpgradeOpenResponse{}, nil
 }

diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go
@@ -1135,8 +1135,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeOpen() {
 			err = path.EndpointA.UpdateClient()
 			suite.Require().NoError(err)
 
-			suite.coordinator.CommitBlock(suite.chainA, suite.chainB)
-			suite.Require().NoError(path.EndpointA.UpdateClient())
 
 			counterpartyChannel := path.EndpointB.GetChannel()
 			proofChannel, _, proofHeight := path.EndpointA.QueryChannelUpgradeProof()