From 7b531b9061a8004a0ccd8a7e3701b62f802a2370 Mon Sep 17 00:00:00 2001 From: Daniyal98 Date: Sat, 5 Nov 2022 02:17:32 +0500 Subject: [PATCH 1/4] removed unused variables --- CHANGELOG.md | 1 + modules/core/04-channel/keeper/handshake_test.go | 1 - modules/core/04-channel/keeper/packet_test.go | 9 ++------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6762c22598f..ea0ce72745a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,6 +109,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#2434](https://github.com/cosmos/ibc-go/pull/2478) Removed all `TypeMsg` constants * (modules/core/exported) [#1689] (https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface. * (testing) [\#2657](https://github.com/cosmos/ibc-go/pull/2657) Carry `ProposerAddress` through commited blocks. Allow `DefaultGenTxGas` to be modified. +* [\#2486] Removed unused variables from `core/04-channel/keeper/packet_test.go` and `core/04-channel/keeper/handshake_test.go`. ### Features diff --git a/modules/core/04-channel/keeper/handshake_test.go b/modules/core/04-channel/keeper/handshake_test.go index 63ccef31510..7478576596a 100644 --- a/modules/core/04-channel/keeper/handshake_test.go +++ b/modules/core/04-channel/keeper/handshake_test.go @@ -638,7 +638,6 @@ func (suite *KeeperTestSuite) TestChanCloseInit() { // create channel in init path.SetChannelOrdered() - err = path.EndpointA.ChanOpenInit() // ensure channel capability check passes suite.chainA.CreateChannelCapability(suite.chainA.GetSimApp().ScopedIBCMockKeeper, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) diff --git a/modules/core/04-channel/keeper/packet_test.go b/modules/core/04-channel/keeper/packet_test.go index c5007ee9c5a..754d1c80e74 100644 --- a/modules/core/04-channel/keeper/packet_test.go +++ b/modules/core/04-channel/keeper/packet_test.go @@ -23,13 +23,8 @@ var ( defaultTimeoutHeight = clienttypes.NewHeight(1, 100) // for when the testing package cannot be used - clientIDA = "clientA" - clientIDB = "clientB" - connIDA = "connA" - connIDB = "connB" - portID = "portid" - channelIDA = "channelidA" - channelIDB = "channelidB" + connIDA = "connA" + connIDB = "connB" ) // TestSendPacket tests SendPacket from chainA to chainB From bfae30fced2d6dc5d25f24e756ac16c033e457c3 Mon Sep 17 00:00:00 2001 From: Daniyal98 Date: Sat, 5 Nov 2022 02:20:13 +0500 Subject: [PATCH 2/4] changelog fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0ce72745a..731d07ffa72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,7 +109,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#2434](https://github.com/cosmos/ibc-go/pull/2478) Removed all `TypeMsg` constants * (modules/core/exported) [#1689] (https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface. * (testing) [\#2657](https://github.com/cosmos/ibc-go/pull/2657) Carry `ProposerAddress` through commited blocks. Allow `DefaultGenTxGas` to be modified. -* [\#2486] Removed unused variables from `core/04-channel/keeper/packet_test.go` and `core/04-channel/keeper/handshake_test.go`. +* [\#2486] (https://github.com/cosmos/ibc-go/pull/pull/2692) Removed unused variables from `core/04-channel/keeper/packet_test.go` and `core/04-channel/keeper/handshake_test.go`. ### Features From 7aea49d3b1c9f83cfd10fafa7739b55036e4f8f2 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 8 Nov 2022 13:08:42 +0100 Subject: [PATCH 3/4] add chanopeninit back and check for no error --- modules/core/04-channel/keeper/handshake_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/core/04-channel/keeper/handshake_test.go b/modules/core/04-channel/keeper/handshake_test.go index 7478576596a..4592e9efe7c 100644 --- a/modules/core/04-channel/keeper/handshake_test.go +++ b/modules/core/04-channel/keeper/handshake_test.go @@ -638,7 +638,9 @@ func (suite *KeeperTestSuite) TestChanCloseInit() { // create channel in init path.SetChannelOrdered() - + err = path.EndpointA.ChanOpenInit() + suite.Require().NoError(err) + // ensure channel capability check passes suite.chainA.CreateChannelCapability(suite.chainA.GetSimApp().ScopedIBCMockKeeper, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) channelCap = suite.chainA.GetChannelCapability(path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) From 8873babe4a0fb5a9c5520b8a5721d5aaba1cd534 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 8 Nov 2022 13:11:00 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 731d07ffa72..6762c22598f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,7 +109,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#2434](https://github.com/cosmos/ibc-go/pull/2478) Removed all `TypeMsg` constants * (modules/core/exported) [#1689] (https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface. * (testing) [\#2657](https://github.com/cosmos/ibc-go/pull/2657) Carry `ProposerAddress` through commited blocks. Allow `DefaultGenTxGas` to be modified. -* [\#2486] (https://github.com/cosmos/ibc-go/pull/pull/2692) Removed unused variables from `core/04-channel/keeper/packet_test.go` and `core/04-channel/keeper/handshake_test.go`. ### Features