Skip to content

Commit a5ff864

Browse files
charleenfeizmanian
charleenfei
authored and
zmanian
committed
chore: update ibctest to latest commit (cosmos#2909)
* update chainconfig * update to commit fixing broadcastTx * update to use SDK default cointype 118 * update so relayer tag isn't required
1 parent 267359b commit a5ff864

16 files changed

+33
-30
lines changed

‎.github/workflows/e2e-test-workflow-call.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
type: string
3434
relayer-tag:
3535
description: 'The tag to use for the relayer'
36-
required: true
36+
required: false
3737
default: "v2.1.2"
3838
type: string
3939
build-and-push-docker-image:

‎e2e/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/cosmos/interchain-accounts v0.4.0
1111
github.com/docker/docker v20.10.19+incompatible
1212
github.com/gogo/protobuf v1.3.3
13-
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221005154709-b642157674bc
13+
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221209152048-e8388a0b91fd
1414
github.com/stretchr/testify v1.8.1
1515
github.com/tendermint/tendermint v0.34.23
1616
go.uber.org/zap v1.23.0

‎e2e/go.sum

+4-2
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,10 @@ github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+eg
832832
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
833833
github.com/strangelove-ventures/go-subkey v1.0.7 h1:cOP/Lajg3uxV/tvspu0m6+0Cu+DJgygkEAbx/s+f35I=
834834
github.com/strangelove-ventures/go-subkey v1.0.7/go.mod h1:E34izOIEm+sZ1YmYawYRquqBQWeZBjVB4pF7bMuhc1c=
835-
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221005154709-b642157674bc h1:IIyDsxY/Rxg1aEtUUUcSKWIdgTjjJwMH6B/JggvlYbA=
836-
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221005154709-b642157674bc/go.mod h1:Z4se9RL/mP5DbZ7kEGoDrjQJU06yEs5+Bznt41Uvi5o=
835+
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221202162429-9359b061fbe5 h1:nzNdAKDDCuhDYT+Rk9SjmLOKUmg6KEMnTHm/xoHXq6Q=
836+
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221202162429-9359b061fbe5/go.mod h1:l3Q2U/8aRyZrOqXp45nhxSjeXgBB+qROwu+L0vIJmUw=
837+
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221209152048-e8388a0b91fd h1:67pNLuMmq8L8BW8WShjtMoL0KFONLpOVYQxb2HY8IlQ=
838+
github.com/strangelove-ventures/ibctest/v6 v6.0.0-20221209152048-e8388a0b91fd/go.mod h1:l3Q2U/8aRyZrOqXp45nhxSjeXgBB+qROwu+L0vIJmUw=
837839
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
838840
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
839841
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=

‎e2e/testconfig/testconfig.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636
// defaultBinary is the default binary that will be used by the chains.
3737
defaultBinary = "simd"
3838
// defaultRlyTag is the tag that will be used if no relayer tag is specified.
39-
// all images are here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
39+
// all images are here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
4040
defaultRlyTag = "v2.1.2"
4141
// defaultChainTag is the tag that will be used for the chains if none is specified.
4242
defaultChainTag = "main"
@@ -166,6 +166,7 @@ func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string) ibc.Cha
166166
},
167167
Bin: cc.Binary,
168168
Bech32Prefix: "cosmos",
169+
CoinType: fmt.Sprint(sdk.GetConfig().GetCoinType()),
169170
Denom: denom,
170171
GasPrices: fmt.Sprintf("0.00%s", denom),
171172
GasAdjustment: 1.3,

‎e2e/tests/core/03-connection/connection_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
1212
"github.com/strangelove-ventures/ibctest/v6/ibc"
13-
"github.com/strangelove-ventures/ibctest/v6/test"
13+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1414
"github.com/stretchr/testify/suite"
1515

1616
"github.com/cosmos/ibc-go/e2e/testsuite"

‎e2e/tests/core/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
"github.com/strangelove-ventures/ibctest/v6/ibc"
11-
"github.com/strangelove-ventures/ibctest/v6/test"
11+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1212
"github.com/stretchr/testify/suite"
1313

1414
"github.com/cosmos/ibc-go/e2e/testsuite"

‎e2e/tests/interchain_accounts/base_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"testing"
66
"time"
77

8-
ibctest "github.com/strangelove-ventures/ibctest/v6"
8+
"github.com/strangelove-ventures/ibctest/v6"
99
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
1010
"github.com/strangelove-ventures/ibctest/v6/ibc"
11-
"github.com/strangelove-ventures/ibctest/v6/test"
11+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1212
"github.com/stretchr/testify/suite"
1313
"golang.org/x/mod/semver"
1414

‎e2e/tests/interchain_accounts/gov_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/gogo/protobuf/proto"
1212
"github.com/strangelove-ventures/ibctest/v6"
1313
"github.com/strangelove-ventures/ibctest/v6/ibc"
14-
"github.com/strangelove-ventures/ibctest/v6/test"
14+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1515
"github.com/stretchr/testify/suite"
1616

1717
"github.com/cosmos/ibc-go/e2e/testsuite"

‎e2e/tests/interchain_accounts/groups_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
1010
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
1111
"github.com/gogo/protobuf/proto"
12-
ibctest "github.com/strangelove-ventures/ibctest/v6"
12+
"github.com/strangelove-ventures/ibctest/v6"
1313
"github.com/strangelove-ventures/ibctest/v6/ibc"
14-
"github.com/strangelove-ventures/ibctest/v6/test"
14+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1515
"github.com/stretchr/testify/suite"
1616

1717
"github.com/cosmos/ibc-go/e2e/testsuite"

‎e2e/tests/interchain_accounts/incentivized_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
sdk "github.com/cosmos/cosmos-sdk/types"
99
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
1010
"github.com/gogo/protobuf/proto"
11-
ibctest "github.com/strangelove-ventures/ibctest/v6"
11+
"github.com/strangelove-ventures/ibctest/v6"
1212
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
1313
"github.com/strangelove-ventures/ibctest/v6/ibc"
14-
"github.com/strangelove-ventures/ibctest/v6/test"
14+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1515
"github.com/stretchr/testify/suite"
1616

1717
"github.com/cosmos/ibc-go/e2e/testconfig"

‎e2e/tests/interchain_accounts/intertx_incentivized_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
99
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
10-
ibctest "github.com/strangelove-ventures/ibctest/v6"
10+
"github.com/strangelove-ventures/ibctest/v6"
1111
"github.com/strangelove-ventures/ibctest/v6/ibc"
12-
"github.com/strangelove-ventures/ibctest/v6/test"
12+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1313
"github.com/stretchr/testify/suite"
1414

1515
"github.com/cosmos/ibc-go/e2e/testvalues"

‎e2e/tests/interchain_accounts/intertx_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"testing"
66

7-
ibctest "github.com/strangelove-ventures/ibctest/v6"
7+
"github.com/strangelove-ventures/ibctest/v6"
88
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
99
"github.com/strangelove-ventures/ibctest/v6/ibc"
10-
"github.com/strangelove-ventures/ibctest/v6/test"
10+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1111
"github.com/stretchr/testify/suite"
1212

1313
sdk "github.com/cosmos/cosmos-sdk/types"

‎e2e/tests/transfer/base_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
paramsproposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
1010
"github.com/strangelove-ventures/ibctest/v6/ibc"
11-
"github.com/strangelove-ventures/ibctest/v6/test"
11+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1212
"github.com/stretchr/testify/suite"
1313

1414
"github.com/cosmos/ibc-go/e2e/testsuite"
@@ -194,7 +194,7 @@ func (s *TransferTestSuite) TestMsgTransfer_Timeout_Nonincentivized() {
194194
}
195195

196196
t.Run("IBC transfer packet timesout", func(t *testing.T) {
197-
tx, err := chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, testvalues.ImmediatelyTimeout())
197+
tx, err := chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, ibc.TransferOptions{Timeout: testvalues.ImmediatelyTimeout()})
198198
s.Require().NoError(err)
199199
s.Require().NoError(tx.Validate(), "source ibc transfer tx is invalid")
200200
time.Sleep(time.Nanosecond * 1) // want it to timeout immediately

‎e2e/tests/transfer/incentivized_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
sdk "github.com/cosmos/cosmos-sdk/types"
99
"github.com/strangelove-ventures/ibctest/v6/ibc"
10-
"github.com/strangelove-ventures/ibctest/v6/test"
10+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1111
"github.com/stretchr/testify/suite"
1212

1313
"github.com/cosmos/ibc-go/e2e/testvalues"
@@ -73,7 +73,7 @@ func (s *IncentivizedTransferTestSuite) TestMsgPayPacketFee_AsyncSingleSender_Su
7373
}
7474

7575
t.Run("send IBC transfer", func(t *testing.T) {
76-
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, walletAmount, nil)
76+
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, walletAmount, ibc.TransferOptions{})
7777
s.Require().NoError(err)
7878
s.Require().NoError(chainATx.Validate(), "chain-a ibc transfer tx is invalid")
7979
})
@@ -417,7 +417,7 @@ func (s *IncentivizedTransferTestSuite) TestMsgPayPacketFee_SingleSender_TimesOu
417417
}
418418

419419
t.Run("Send IBC transfer", func(t *testing.T) {
420-
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, testvalues.ImmediatelyTimeout())
420+
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, ibc.TransferOptions{Timeout: testvalues.ImmediatelyTimeout()})
421421
s.Require().NoError(err)
422422
s.Require().NoError(chainATx.Validate(), "source ibc transfer tx is invalid")
423423
time.Sleep(time.Nanosecond * 1) // want it to timeout immediately
@@ -516,7 +516,7 @@ func (s *IncentivizedTransferTestSuite) TestPayPacketFeeAsync_SingleSender_NoCou
516516

517517
t.Run("send IBC transfer", func(t *testing.T) {
518518
var err error
519-
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, nil)
519+
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet.KeyName, chainBWalletAmount, ibc.TransferOptions{})
520520
s.Require().NoError(err)
521521
s.Require().NoError(chainATx.Validate(), "source ibc transfer tx is invalid")
522522
})
@@ -636,7 +636,7 @@ func (s *IncentivizedTransferTestSuite) TestMsgPayPacketFee_AsyncMultipleSenders
636636
}
637637

638638
t.Run("send IBC transfer", func(t *testing.T) {
639-
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet1.KeyName, walletAmount1, nil)
639+
chainATx, err = chainA.SendIBCTransfer(ctx, channelA.ChannelID, chainAWallet1.KeyName, walletAmount1, ibc.TransferOptions{})
640640
s.Require().NoError(err)
641641
s.Require().NoError(chainATx.Validate(), "chain-a ibc transfer tx is invalid")
642642
})

‎e2e/tests/upgrades/upgrade_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
v6upgrades "github.com/cosmos/interchain-accounts/app/upgrades/v6"
1313
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
1414
"github.com/gogo/protobuf/proto"
15-
ibctest "github.com/strangelove-ventures/ibctest/v6"
15+
"github.com/strangelove-ventures/ibctest/v6"
1616
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
1717
"github.com/strangelove-ventures/ibctest/v6/ibc"
18-
"github.com/strangelove-ventures/ibctest/v6/test"
18+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
1919
"github.com/stretchr/testify/suite"
2020
"golang.org/x/mod/semver"
2121

‎e2e/testsuite/testsuite.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/strangelove-ventures/ibctest/v6"
2121
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
2222
"github.com/strangelove-ventures/ibctest/v6/ibc"
23-
"github.com/strangelove-ventures/ibctest/v6/test"
2423
"github.com/strangelove-ventures/ibctest/v6/testreporter"
24+
test "github.com/strangelove-ventures/ibctest/v6/testutil"
2525
"github.com/stretchr/testify/suite"
2626
"go.uber.org/zap"
2727
"go.uber.org/zap/zaptest"
@@ -76,8 +76,8 @@ type GRPCClients struct {
7676
InterTxQueryClient intertxtypes.QueryClient
7777

7878
// SDK query clients
79-
GovQueryClient govtypesv1beta1.QueryClient
80-
GovQueryClientV1 govtypesv1.QueryClient
79+
GovQueryClient govtypesv1beta1.QueryClient
80+
GovQueryClientV1 govtypesv1.QueryClient
8181
GroupsQueryClient grouptypes.QueryClient
8282
ParamsQueryClient paramsproposaltypes.QueryClient
8383
AuthQueryClient authtypes.QueryClient

0 commit comments

Comments
 (0)