Set channel state to NOTINFLUSH when Closing

modules/core/04-channel/keeper/handshake.go

@@ -413,7 +413,7 @@ func (k Keeper) ChanCloseInit(
 
 	defer telemetry.IncrCounter(1, "ibc", "channel", "close-init")
 
-	channel.State = types.CLOSED
+	types.CloseChannel(&channel)
 	k.SetChannel(ctx, portID, channelID, channel)
 
 	emitChannelCloseInitEvent(ctx, portID, channelID, channel)
@@ -476,7 +476,7 @@ func (k Keeper) ChanCloseConfirm(
 
 	defer telemetry.IncrCounter(1, "ibc", "channel", "close-confirm")
 
-	channel.State = types.CLOSED
+	types.CloseChannel(&channel)
 	k.SetChannel(ctx, portID, channelID, channel)
 
 	emitChannelCloseConfirmEvent(ctx, portID, channelID, channel)

modules/core/04-channel/keeper/timeout.go

@@ -154,7 +154,7 @@ func (k Keeper) TimeoutExecuted(
 	k.deletePacketCommitment(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence())
 
 	if channel.Ordering == types.ORDERED {
-		channel.State = types.CLOSED
+		types.CloseChannel(&channel)
 		k.SetChannel(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), channel)
 	}
 

modules/core/04-channel/keeper/upgrade_test.go

@@ -991,7 +991,7 @@ func (suite *KeeperTestSuite) TestStartFlushUpgradeHandshake() {
 		{
 			"failed verification for counterparty channel state due to incorrectly constructed counterparty channel",
 			func() {
-				counterpartyChannel.State = types.CLOSED
+				types.CloseChannel(&counterpartyChannel)
 			},
 			commitmenttypes.ErrInvalidProof,
 		},

modules/core/04-channel/types/channel.go

@@ -75,6 +75,12 @@ func (ch Channel) ValidateBasic() error {
 	return ch.Counterparty.ValidateBasic()
 }
 
+// CloseChannel modifies the Channel with the new State set to CLOSED and FlushStatus set to NOTINFLUSH.
+func CloseChannel(channel *Channel) {
+	channel.State = CLOSED
+	channel.FlushStatus = NOTINFLUSH
+}
+
 // NewCounterparty returns a new Counterparty instance
 func NewCounterparty(portID, channelID string) Counterparty {
 	return Counterparty{

modules/core/04-channel/types/channel_test.go

@@ -57,3 +57,13 @@ func TestCounterpartyValidateBasic(t *testing.T) {
 		}
 	}
 }
+
+func TestCloseChannel(t *testing.T) {
+	ch := types.NewChannel(types.OPEN, types.ORDERED, types.Counterparty{"portidone", "channelidone"}, connHops, version)
+	ch.FlushStatus = types.FLUSHING
+
+	types.CloseChannel(&ch)
+
+	require.Equal(t, types.CLOSED, ch.State)
+	require.Equal(t, types.NOTINFLUSH, ch.FlushStatus)
+}

modules/light-clients/09-localhost/client_state_test.go

@@ -275,7 +275,8 @@ func (suite *LocalhostTestSuite) TestVerifyMembership() {
 
 				path = merklePath
 
-				channel.State = channeltypes.CLOSED // modify the channel before marshalling to value bz
+				// modify the channel before marshalling to value bz
+				channeltypes.CloseChannel(&channel)
 				value = suite.chain.Codec.MustMarshal(&channel)
 			},
 			false,