update function signature

cosmos · Sep 26, 2023 · efe13b0 · efe13b0
1 parent acb926c
commit efe13b0
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 48 deletions.
diff --git a/modules/apps/29-fee/ibc_middleware_test.go b/modules/apps/29-fee/ibc_middleware_test.go
@@ -1097,7 +1097,7 @@ func (suite *FeeTestSuite) TestOnChanUpgradeInit() {
 
 			tc.malleate()
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 
 			expPass := tc.expError == nil
 			if expPass {
@@ -1140,7 +1140,7 @@ func (suite *FeeTestSuite) TestOnChanUpgradeTry() {
 				path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 
 				suite.coordinator.Setup(path)
-				err := path.EndpointA.ChanUpgradeInit()
+				path.EndpointA.ChanUpgradeInit()
 				suite.Require().NoError(err)
 			},
 			nil,
@@ -1205,7 +1205,7 @@ func (suite *FeeTestSuite) TestOnChanUpgradeTry() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			tc.malleate()
@@ -1302,7 +1302,7 @@ func (suite *FeeTestSuite) TestOnChanUpgradeAck() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			err = path.EndpointB.ChanUpgradeTry()
@@ -1388,7 +1388,7 @@ func (suite *FeeTestSuite) TestOnChanUpgradeOpen() {
 
 			tc.malleate()
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			err = path.EndpointB.ChanUpgradeTry()

diff --git a/modules/apps/29-fee/transfer_test.go b/modules/apps/29-fee/transfer_test.go
@@ -106,7 +106,7 @@ func (suite *FeeTestSuite) TestTransferFeeUpgrade() {
 
 			tc.malleate()
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			err = path.EndpointB.ChanUpgradeTry()

diff --git a/modules/apps/transfer/ibc_module_test.go b/modules/apps/transfer/ibc_module_test.go
@@ -299,7 +299,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeInit() {
 
 			tc.malleate()
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 
 			expPass := tc.expError == nil
 			if expPass {
@@ -362,7 +362,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeTry() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.ConnectionHops = []string{upgradePath.EndpointA.ConnectionID}
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.ConnectionHops = []string{upgradePath.EndpointB.ConnectionID}
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			counterpartyUpgrade = path.EndpointA.GetChannelUpgrade()
@@ -429,7 +429,7 @@ func (suite *TransferTestSuite) TestOnChanUpgradeAck() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.ConnectionHops = []string{upgradePath.EndpointA.ConnectionID}
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.ConnectionHops = []string{upgradePath.EndpointB.ConnectionID}
 
-			err := path.EndpointA.ChanUpgradeInit()
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(err)
 
 			err = path.EndpointB.ChanUpgradeTry()

diff --git a/modules/core/04-channel/keeper/packet_test.go b/modules/core/04-channel/keeper/packet_test.go
@@ -235,7 +235,7 @@ func (suite *KeeperTestSuite) TestSendPacket() {
 				path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = ibcmock.UpgradeVersion
 				path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = ibcmock.UpgradeVersion
 
-				err := path.EndpointB.ChanUpgradeInit()
+				path.EndpointB.ChanUpgradeInit()
 				suite.Require().NoError(err)
 
 				err = path.EndpointA.ChanUpgradeTry()

diff --git a/modules/core/04-channel/keeper/upgrade_test.go b/modules/core/04-channel/keeper/upgrade_test.go
@@ -160,8 +160,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeTry() {
 		{
 			"success: crossing hellos",
 			func() {
-				err := path.EndpointB.ChanUpgradeInit()
-				suite.Require().NoError(err)
+				path.EndpointB.ChanUpgradeInit()
 			},
 			nil,
 		},
@@ -268,8 +267,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeTry() {
 			suite.coordinator.Setup(path)
 
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			proposedUpgrade = path.EndpointB.GetProposedUpgrade()
@@ -535,8 +533,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeAck() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
 			// manually set packet commitment so that the chainB channel state is FLUSHING
 			sequence, err := path.EndpointB.SendPacket(suite.chainB.GetTimeoutHeight(), 0, ibctesting.MockPacketData)
@@ -618,7 +615,7 @@ func (suite *KeeperTestSuite) TestWriteChannelUpgradeAck() {
 			tc.malleate()
 
 			// perform the upgrade handshake.
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 
 			suite.Require().NoError(path.EndpointB.ChanUpgradeTry())
 
@@ -707,10 +704,9 @@ func (suite *KeeperTestSuite) TestChanUpgradeConfirm() {
 				path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 				path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-				err := path.EndpointA.ChanUpgradeInit()
-				suite.Require().NoError(err)
+				path.EndpointA.ChanUpgradeInit()
 
-				err = path.EndpointB.ChanUpgradeTry()
+				err := path.EndpointB.ChanUpgradeTry()
 				suite.Require().NoError(err)
 
 				seq, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
@@ -834,10 +830,9 @@ func (suite *KeeperTestSuite) TestChanUpgradeConfirm() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
-			err = path.EndpointB.ChanUpgradeTry()
+			err := path.EndpointB.ChanUpgradeTry()
 			suite.Require().NoError(err)
 
 			err = path.EndpointA.ChanUpgradeAck()
@@ -910,7 +905,7 @@ func (suite *KeeperTestSuite) TestWriteUpgradeConfirm() {
 			tc.malleate()
 
 			// perform the upgrade handshake.
-			suite.Require().NoError(path.EndpointB.ChanUpgradeInit())
+			path.EndpointB.ChanUpgradeInit()
 
 			suite.Require().NoError(path.EndpointA.ChanUpgradeTry())
 
@@ -985,8 +980,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeOpen() {
 				err = path.EndpointB.RecvPacket(packet)
 				suite.Require().NoError(err)
 
-				err = path.EndpointA.ChanUpgradeInit()
-				suite.Require().NoError(err)
+				path.EndpointA.ChanUpgradeInit()
 
 				err = path.EndpointB.ChanUpgradeTry()
 				suite.Require().NoError(err)
@@ -1070,10 +1064,9 @@ func (suite *KeeperTestSuite) TestChanUpgradeOpen() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
-			err = path.EndpointB.ChanUpgradeTry()
+			err := path.EndpointB.ChanUpgradeTry()
 			suite.Require().NoError(err)
 
 			err = path.EndpointA.ChanUpgradeAck()
@@ -1151,7 +1144,7 @@ func (suite *KeeperTestSuite) TestWriteUpgradeOpenChannel() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Ordering = types.ORDERED
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Ordering = types.ORDERED
 
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(path.EndpointB.ChanUpgradeTry())
 			suite.Require().NoError(path.EndpointA.ChanUpgradeAck())
 			suite.Require().NoError(path.EndpointB.ChanUpgradeConfirm())
@@ -1315,7 +1308,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeCancel() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 
 			// cause the upgrade to fail on chain b so an error receipt is written.
 			// if the counterparty (chain A) upgrade sequence is less than the current sequence, (chain B)
@@ -1401,7 +1394,7 @@ func (suite *KeeperTestSuite) TestWriteUpgradeCancelChannel() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 
 			// cause the upgrade to fail on chain b so an error receipt is written.
 			// if the counterparty (chain A) upgrade sequence is less than the current sequence, (chain B)
@@ -1659,7 +1652,7 @@ func (suite *KeeperTestSuite) TestChanUpgradeTimeout() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 			suite.Require().NoError(path.EndpointB.ChanUpgradeTry())
 			suite.Require().NoError(path.EndpointA.ChanUpgradeAck())
 
@@ -1737,19 +1730,17 @@ func (suite *KeeperTestSuite) TestStartFlush() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
 			// crossing hellos so that the upgrade is created on chain B.
 			// the ChanUpgradeInit sub protocol is also called when it is not a crossing hello situation.
-			err = path.EndpointB.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointB.ChanUpgradeInit()
 
 			upgrade := path.EndpointB.GetChannelUpgrade()
 
 			tc.malleate()
 
-			err = suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.StartFlushing(
+			err := suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.StartFlushing(
 				suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, &upgrade,
 			)
 
@@ -1942,7 +1933,7 @@ func (suite *KeeperTestSuite) TestAbortUpgrade() {
 			channelKeeper := suite.chainA.GetSimApp().IBCKeeper.ChannelKeeper
 
 			path.EndpointA.ChannelConfig.Version = mock.UpgradeVersion
-			suite.Require().NoError(path.EndpointA.ChanUpgradeInit())
+			path.EndpointA.ChanUpgradeInit()
 
 			// fetch the upgrade before abort for assertions later on.
 			actualUpgrade, ok := channelKeeper.GetUpgrade(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID)
@@ -2092,15 +2083,14 @@ func (suite *KeeperTestSuite) TestCheckForUpgradeCompatibility() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
 
 			upgradeFields = path.EndpointA.GetProposedUpgrade().Fields
 			counterpartyUpgradeFields = path.EndpointB.GetProposedUpgrade().Fields
 
 			tc.malleate()
 
-			err = suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.CheckForUpgradeCompatibility(suite.chainB.GetContext(), upgradeFields, counterpartyUpgradeFields)
+			err := suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.CheckForUpgradeCompatibility(suite.chainB.GetContext(), upgradeFields, counterpartyUpgradeFields)
 			if tc.expError != nil {
 				suite.Require().ErrorIs(err, tc.expError)
 			} else {
@@ -2148,17 +2138,14 @@ func (suite *KeeperTestSuite) TestSyncUpgradeSequence() {
 			path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 			path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
 
-			err := path.EndpointA.ChanUpgradeInit()
-			suite.Require().NoError(err)
-
-			err = path.EndpointB.ChanUpgradeInit()
-			suite.Require().NoError(err)
+			path.EndpointA.ChanUpgradeInit()
+			path.EndpointB.ChanUpgradeInit()
 
 			counterpartyUpgradeSequence = 1
 
 			tc.malleate()
 
-			err = suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.SyncUpgradeSequence(suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, path.EndpointB.GetChannel(), counterpartyUpgradeSequence)
+			err := suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.SyncUpgradeSequence(suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, path.EndpointB.GetChannel(), counterpartyUpgradeSequence)
 			if tc.expError != nil {
 				suite.Require().ErrorIs(err, tc.expError)
 			} else {