imp: use HasInflightPackets to check if channel has finished flushing. (

#4134)
cosmos · Jul 20, 2023 · 347346b · 347346b
1 parent ac1acbb
commit 347346b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/modules/core/04-channel/keeper/keeper.go b/modules/core/04-channel/keeper/keeper.go
@@ -571,11 +571,11 @@ func (k Keeper) iterateHashes(ctx sdk.Context, iterator db.Iterator, cb func(por
 	}
 }
 
-// hasInflightPackets returns true if there are packet commitments stored at the specified
+// HasInflightPackets returns true if there are packet commitments stored at the specified
 // port and channel, and false otherwise.
 //
 //lint:ignore U1000 Ignore unused function temporarily for debugging
-func (k Keeper) hasInflightPackets(ctx sdk.Context, portID, channelID string) bool {
+func (k Keeper) HasInflightPackets(ctx sdk.Context, portID, channelID string) bool {
 	iterator := sdk.KVStorePrefixIterator(ctx.KVStore(k.storeKey), []byte(host.PacketCommitmentPrefixPath(portID, channelID)))
 	defer sdk.LogDeferred(ctx.Logger(), func() error { return iterator.Close() })
 

diff --git a/modules/core/04-channel/keeper/packet.go b/modules/core/04-channel/keeper/packet.go
@@ -477,7 +477,7 @@ func (k Keeper) AcknowledgePacket(
 	// Delete packet commitment, since the packet has been acknowledged, the commitement is no longer necessary
 	k.deletePacketCommitment(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence())
 
-	if channel.FlushStatus == types.FLUSHING && !k.hasInflightPackets(ctx, packet.GetSourcePort(), packet.GetSourceChannel()) {
+	if channel.FlushStatus == types.FLUSHING && !k.HasInflightPackets(ctx, packet.GetSourcePort(), packet.GetSourceChannel()) {
 		channel.FlushStatus = types.FLUSHCOMPLETE
 		k.SetChannel(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), channel)
 	}

diff --git a/modules/core/04-channel/keeper/timeout.go b/modules/core/04-channel/keeper/timeout.go
@@ -153,7 +153,7 @@ func (k Keeper) TimeoutExecuted(
 
 	k.deletePacketCommitment(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence())
 
-	if channel.FlushStatus == types.FLUSHING && !k.hasInflightPackets(ctx, packet.GetSourcePort(), packet.GetSourceChannel()) {
+	if channel.FlushStatus == types.FLUSHING && !k.HasInflightPackets(ctx, packet.GetSourcePort(), packet.GetSourceChannel()) {
 		channel.FlushStatus = types.FLUSHCOMPLETE
 		k.SetChannel(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), channel)
 	}

diff --git a/modules/core/04-channel/keeper/upgrade.go b/modules/core/04-channel/keeper/upgrade.go
@@ -193,7 +193,7 @@ func (k Keeper) WriteUpgradeTryChannel(ctx sdk.Context, portID, channelID string
 	channel.State = types.TRYUPGRADE
 	channel.FlushStatus = types.FLUSHING
 
-	if !k.hasInflightPackets(ctx, portID, channelID) {
+	if !k.HasInflightPackets(ctx, portID, channelID) {
 		channel.FlushStatus = types.FLUSHCOMPLETE
 	}
 
@@ -291,7 +291,7 @@ func (k Keeper) WriteUpgradeAckChannel(ctx sdk.Context, portID, channelID, upgra
 	channel.State = types.ACKUPGRADE
 	channel.FlushStatus = types.FLUSHING
 
-	if !k.hasInflightPackets(ctx, portID, channelID) {
+	if !k.HasInflightPackets(ctx, portID, channelID) {
 		channel.FlushStatus = types.FLUSHCOMPLETE
 	}
 
@@ -322,7 +322,7 @@ func (k Keeper) ChanUpgradeOpen(
 	proofCounterpartyChannel []byte,
 	proofHeight clienttypes.Height,
 ) error {
-	if k.hasInflightPackets(ctx, portID, channelID) {
+	if k.HasInflightPackets(ctx, portID, channelID) {
 		return errorsmod.Wrapf(types.ErrPendingInflightPackets, "port ID (%s) channel ID (%s)", portID, channelID)
 	}
 

diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go
@@ -854,18 +854,12 @@ func (k Keeper) ChannelUpgradeAck(goCtx context.Context, msg *channeltypes.MsgCh
 
 	// Move channel to OPEN state if both chains have finished flushing any in-flight packets. Counterparty flush status
 	// has been verified in ChanUpgradeAck.
-	if msg.CounterpartyFlushStatus == channeltypes.FLUSHCOMPLETE {
-		channel, found := k.ChannelKeeper.GetChannel(ctx, msg.PortId, msg.ChannelId)
-		if !found {
-			return nil, errorsmod.Wrapf(channeltypes.ErrChannelNotFound, "port ID (%s) channel ID (%s)", msg.PortId, msg.ChannelId)
-		}
-		if channel.FlushStatus == channeltypes.FLUSHCOMPLETE {
-			cbs.OnChanUpgradeOpen(ctx, msg.PortId, msg.ChannelId)
+	if msg.CounterpartyFlushStatus == channeltypes.FLUSHCOMPLETE && !k.ChannelKeeper.HasInflightPackets(ctx, msg.PortId, msg.ChannelId) {
+		cbs.OnChanUpgradeOpen(ctx, msg.PortId, msg.ChannelId)
 
-			k.ChannelKeeper.WriteUpgradeOpenChannel(ctx, msg.PortId, msg.ChannelId)
+		k.ChannelKeeper.WriteUpgradeOpenChannel(ctx, msg.PortId, msg.ChannelId)
 
-			ctx.Logger().Info("channel upgrade open succeeded", "port-id", msg.PortId, "channel-id", msg.ChannelId)
-		}
+		ctx.Logger().Info("channel upgrade open succeeded", "port-id", msg.PortId, "channel-id", msg.ChannelId)
 	}
 
 	return &channeltypes.MsgChannelUpgradeAckResponse{Result: channeltypes.SUCCESS}, nil