chore: Update tests

Author: kulikthebird

tests/e2e/ica_test.go

@@ -78,15 +78,15 @@ func TestICA(t *testing.T) {
 			path.EndpointA.ChannelConfig = &ibctesting.ChannelConfig{
 				PortID:  portID,
 				Version: version,
-				Order:   channeltypes.ORDERED,
+				Order:   channeltypes.UNORDERED,
 			}
 			path.EndpointB.ChannelID = ""
 			path.EndpointB.ChannelConfig = &ibctesting.ChannelConfig{
 				PortID:  icatypes.HostPortID,
 				Version: icatypes.Version,
-				Order:   channeltypes.ORDERED,
+				Order:   channeltypes.UNORDERED,
 			}
-			coord.CreateChannels(&path.Path)
+			path.CreateChannels()
 
 			// assert ICA exists on controller
 			contApp := controllerChain.GetWasmApp()

tests/integration/ibc_integration_test.go

@@ -60,17 +60,17 @@ func TestIBCReflectContract(t *testing.T) {
 	path.EndpointA.ChannelConfig = &ibctesting.ChannelConfig{
 		PortID:  sourcePortID,
 		Version: "ibc-reflect-v1",
-		Order:   channeltypes.ORDERED,
+		Order:   channeltypes.UNORDERED,
 	}
 	path.EndpointB.ChannelConfig = &ibctesting.ChannelConfig{
 		PortID:  counterpartPortID,
 		Version: "ibc-reflect-v1",
-		Order:   channeltypes.ORDERED,
+		Order:   channeltypes.UNORDERED,
 	}
 
 	coordinator.SetupConnections(&path.Path)
 
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	// TODO: query both contracts directly to ensure they have registered the proper connection
 	// (and the chainB has created a reflect contract)
@@ -329,7 +329,7 @@ func TestOnIBCPacketReceive(t *testing.T) {
 			}
 
 			coord.SetupConnections(&path.Path)
-			coord.CreateChannels(&path.Path)
+			path.CreateChannels()
 			coord.CommitBlock(chainA.TestChain, chainB.TestChain)
 			require.Equal(t, 0, len(*chainA.PendingSendPackets))
 			require.Equal(t, 0, len(*chainB.PendingSendPackets))
@@ -404,7 +404,7 @@ func TestIBCAsyncAck(t *testing.T) {
 	}
 
 	coord.SetupConnections(&path.Path)
-	coord.CreateChannels(&path.Path)
+	path.CreateChannels()
 	coord.CommitBlock(chainA.TestChain, chainB.TestChain)
 	require.Equal(t, 0, len(*chainA.PendingSendPackets))
 	require.Equal(t, 0, len(*chainB.PendingSendPackets))

tests/integration/relay_pingpong_test.go

@@ -82,7 +82,7 @@ func TestPingPong(t *testing.T) {
 		Order:   channeltypes.ORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	// trigger start game via execute
 	const startValue uint64 = 100

tests/integration/relay_test.go

@@ -124,7 +124,7 @@ func TestFromIBCTransferToContract(t *testing.T) {
 			}
 
 			coordinator.SetupConnections(&path.Path)
-			coordinator.CreateChannels(&path.Path)
+			path.CreateChannels()
 
 			originalChainABalance := chainA.Balance(chainA.SenderAccount.GetAddress(), sdk.DefaultBondDenom)
 			// when transfer via sdk transfer from A (module) -> B (contract)
@@ -196,7 +196,7 @@ func TestContractCanInitiateIBCTransferMsg(t *testing.T) {
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	// when contract is triggered to send IBCTransferMsg
 	receiverAddress := chainB.SenderAccount.GetAddress()
@@ -268,7 +268,7 @@ func TestContractCanEmulateIBCTransferMessage(t *testing.T) {
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	// when contract is triggered to send the ibc package to chain B
 	timeout := uint64(chainB.LatestCommittedHeader.Header.Time.Add(time.Hour).UnixNano()) // enough time to not timeout
@@ -343,7 +343,7 @@ func TestContractCanEmulateIBCTransferMessageWithTimeout(t *testing.T) {
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 	coordinator.UpdateTime()
 
 	// when contract is triggered to send the ibc package to chain B
@@ -430,7 +430,7 @@ func TestContractEmulateIBCTransferMessageOnDiffContractIBCChannel(t *testing.T)
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	// when contract is triggered to send the ibc package to chain B
 	timeout := uint64(chainB.LatestCommittedHeader.Header.Time.Add(time.Hour).UnixNano()) // enough time to not timeout
@@ -491,7 +491,7 @@ func TestContractHandlesChannelClose(t *testing.T) {
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 	wasmibctesting.CloseChannel(coordinator, &path.Path)
 	assert.True(t, myContractB.closeCalled)
 }
@@ -541,7 +541,7 @@ func TestContractHandlesChannelCloseNotOwned(t *testing.T) {
 		Order:   channeltypes.UNORDERED,
 	}
 	coordinator.SetupConnections(&path.Path)
-	coordinator.CreateChannels(&path.Path)
+	path.CreateChannels()
 
 	closeIBCChannelMsg := &types.MsgExecuteContract{
 		Sender:   chainA.SenderAccount.GetAddress().String(),

x/wasm/keeper/genesis_test.go

@@ -13,7 +13,6 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	dbm "github.com/cosmos/cosmos-db"
-	ibcapi "github.com/cosmos/ibc-go/v10/modules/core/api"
 	fuzz "github.com/google/gofuzz"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -699,7 +698,6 @@ func setupKeeper(t *testing.T) (*Keeper, sdk.Context) {
 		types.VMConfig{},
 		AvailableCapabilities,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-		ibcapi.NewRouter(),
 	)
 	return &srcKeeper, ctx
 }

x/wasm/keeper/options_test.go

@@ -155,7 +155,7 @@ func TestConstructorOptions(t *testing.T) {
 			opt := spec.srcOpt
 			_, gotPostOptMarker := opt.(postOptsFn)
 			require.Equal(t, spec.isPostOpt, gotPostOptMarker)
-			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), types.VMConfig{}, AvailableCapabilities, "", nil, spec.srcOpt)
+			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), types.VMConfig{}, AvailableCapabilities, "", spec.srcOpt)
 			spec.verify(t, k)
 		})
 	}