Resolve commented out testcases for Channel Upgrades

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

@@ -931,6 +931,43 @@ func (suite *KeeperTestSuite) TestChanUpgradeOpen() {
 			func() {},
 			nil,
 		},
+		{
+			"success: counterparty in flushcomplete",
+			func() {
+				path = ibctesting.NewPath(suite.chainA, suite.chainB)
+				suite.coordinator.Setup(path)
+
+				path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
+				path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
+
+				// Need to create a packet commitment on A so as to keep it from going to FLUSHCOMPLETE if no inflight packets exist.
+				sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, disabledTimeoutTimestamp, ibctesting.MockPacketData)
+				suite.Require().NoError(err)
+				packet := types.NewPacket(ibctesting.MockPacketData, sequence, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, defaultTimeoutHeight, disabledTimeoutTimestamp)
+				err = path.EndpointB.RecvPacket(packet)
+				suite.Require().NoError(err)
+
+				err = path.EndpointA.ChanUpgradeInit()
+				suite.Require().NoError(err)
+
+				err = path.EndpointB.ChanUpgradeTry()
+				suite.Require().NoError(err)
+
+				err = path.EndpointA.ChanUpgradeAck()
+				suite.Require().NoError(err)
+
+				err = path.EndpointB.ChanUpgradeConfirm()
+				suite.Require().NoError(err)
+
+				err = path.EndpointA.AcknowledgePacket(packet, ibctesting.MockAcknowledgement)
+				suite.Require().NoError(err)
+
+				// cause the packet commitment on chain A to be deleted and the channel state to be updated to FLUSHCOMPLETE.
+				suite.coordinator.CommitBlock(suite.chainA, suite.chainB)
+				suite.Require().NoError(path.EndpointA.UpdateClient())
+			},
+			nil,
+		},
 		{
 			"channel not found",
 			func() {
@@ -1027,98 +1064,6 @@ func (suite *KeeperTestSuite) TestChanUpgradeOpen() {
 	}
 }
 
-// TestChanUpgradeOpenCounterPartyStates tests the handshake in the cases where
-// the counterparty is in a state other than OPEN.
-// func (suite *KeeperTestSuite) TestChanUpgradeOpenCounterpartyStates() {
-// 	var path *ibctesting.Path
-// 	testCases := []struct {
-// 		name     string
-// 		malleate func()
-// 		expError error
-// 	}{
-// 		{
-// 			"success, counterparty in OPEN",
-// 			func() {
-// 				err := path.EndpointB.ChanUpgradeInit()
-// 				suite.Require().NoError(err)
-
-// 				err = path.EndpointA.ChanUpgradeTry()
-// 				suite.Require().NoError(err)
-
-// 				err = path.EndpointB.ChanUpgradeAck()
-// 				suite.Require().NoError(err)
-
-// 				suite.coordinator.CommitBlock(suite.chainA, suite.chainB)
-// 				suite.Require().NoError(path.EndpointA.UpdateClient())
-// 			},
-// 			nil,
-// 		},
-// 		{
-// 			"success, counterparty in TRYUPGRADE",
-// 			func() {
-// 				// Need to create a packet commitment on A so as to keep it from going to OPEN if no inflight packets exist.
-// 				sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, disabledTimeoutTimestamp, ibctesting.MockPacketData)
-// 				suite.Require().NoError(err)
-// 				packet := types.NewPacket(ibctesting.MockPacketData, sequence, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, defaultTimeoutHeight, disabledTimeoutTimestamp)
-// 				err = path.EndpointB.RecvPacket(packet)
-// 				suite.Require().NoError(err)
-
-// 				err = path.EndpointA.ChanUpgradeInit()
-// 				suite.Require().NoError(err)
-
-// 				err = path.EndpointB.ChanUpgradeTry()
-// 				suite.Require().NoError(err)
-
-// 				err = path.EndpointA.ChanUpgradeAck()
-// 				suite.Require().NoError(err)
-
-// 				// Ack packet to delete packet commitment before calling ChanUpgradeOpen
-// 				err = path.EndpointA.AcknowledgePacket(packet, ibctesting.MockAcknowledgement)
-// 				suite.Require().NoError(err)
-// 			},
-// 			nil,
-// 		},
-// 	}
-
-// 	// Create an initial path used only to invoke ConnOpenInit/ChanOpenInit handlers.
-// 	// This bumps the connection/channel identifiers generated for chain A on the
-// 	// next path used to run the upgrade handshake.
-// 	// See issue 4062.
-// 	path = ibctesting.NewPath(suite.chainA, suite.chainB)
-// 	suite.coordinator.SetupClients(path)
-// 	suite.Require().NoError(path.EndpointA.ConnOpenInit())
-// 	suite.coordinator.SetupConnections(path)
-// 	suite.Require().NoError(path.EndpointA.ChanOpenInit())
-
-// 	for _, tc := range testCases {
-// 		tc := tc
-// 		suite.Run(tc.name, func() {
-// 			suite.SetupTest()
-
-// 			path = ibctesting.NewPath(suite.chainA, suite.chainB)
-// 			suite.coordinator.Setup(path)
-
-// 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
-// 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
-
-// 			tc.malleate()
-
-// 			proofCounterpartyChannel, _, proofHeight := path.EndpointA.QueryChannelUpgradeProof()
-// 			err := suite.chainA.GetSimApp().IBCKeeper.ChannelKeeper.ChanUpgradeOpen(
-// 				suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID,
-// 				path.EndpointB.GetChannel().State, proofCounterpartyChannel, proofHeight,
-// 			)
-
-// 			expPass := tc.expError == nil
-// 			if expPass {
-// 				suite.Require().NoError(err)
-// 			} else {
-// 				suite.Require().ErrorIs(err, tc.expError)
-// 			}
-// 		})
-// 	}
-// }
-
 func (suite *KeeperTestSuite) TestWriteUpgradeOpenChannel() {
 	var path *ibctesting.Path