diff --git a/integration-tests/chain_ibc.go b/integration-tests/chain_ibc.go index cef10c224..de27b7453 100644 --- a/integration-tests/chain_ibc.go +++ b/integration-tests/chain_ibc.go @@ -273,7 +273,7 @@ func CreateIBCChannelsAndConnect( dstChainPort string, channelVersion string, channelOrder ibcchanneltypes.Order, -) { +) func() { t.Helper() log := zaptest.NewLogger(t) @@ -296,6 +296,7 @@ func CreateIBCChannelsAndConnect( t.Fatalf("Unsupported chennel order type:%d", channelOrder) } + pathName := fmt.Sprintf("%s-%s", srcChain.ChainSettings.ChainID, dstChain.ChainSettings.ChainID) require.NoError(t, relayerSrcChain.CreateOpenChannels( ctx, relayerDstChain, @@ -305,9 +306,12 @@ func CreateIBCChannelsAndConnect( channelOrderString, channelVersion, false, "", - // FIXME(v47-ibc) validate that the config is valid - fmt.Sprintf("%s-%s", srcChain.ChainSettings.ChainID, dstChain.ChainSettings.ChainID), + pathName, )) + closerFunc := func() { + require.NoError(t, relayerSrcChain.CloseChannel(ctx, relayerDstChain, 5, 5*time.Second, srcChain.ChainSettings.ChainID, srcChainPort, "", pathName)) + } + return closerFunc } func setupRelayerChain( diff --git a/integration-tests/ibc/wasm_test.go b/integration-tests/ibc/wasm_test.go index d43660809..63235cdb6 100644 --- a/integration-tests/ibc/wasm_test.go +++ b/integration-tests/ibc/wasm_test.go @@ -234,7 +234,7 @@ func TestIBCCallFromSmartContract(t *testing.T) { requireT.NotEmpty(osmosisIBCPort) t.Logf("Osmisis contrac IBC port:%s", osmosisIBCPort) - integrationtests.CreateIBCChannelsAndConnect( + closerFunc := integrationtests.CreateIBCChannelsAndConnect( ctx, t, coreumChain.Chain, @@ -244,6 +244,7 @@ func TestIBCCallFromSmartContract(t *testing.T) { channelIBCVersion, ibcchanneltypes.UNORDERED, ) + defer closerFunc() coreumToOsmosisChannelID := coreumChain.AwaitForIBCChannelID(ctx, t, coreumIBCPort, osmosisChain.ChainSettings.ChainID) osmosisToCoreumChannelID := osmosisChain.AwaitForIBCChannelID(ctx, t, osmosisIBCPort, coreumChain.ChainSettings.ChainID)