Skip to content

Commit 6fbd71a

Browse files
mergify[bot]chattondamiannolan
authored
Fix E2E Tests: Update ibctest (Cosmos SDK 0.46) (backport #1949) (#2101)
* Fix E2E Tests: Update ibctest (Cosmos SDK 0.46) (#1949) (cherry picked from commit c304a7c) # Conflicts: # e2e/testsuite/testsuite.go * resolving conflicts Co-authored-by: Cian Hatton <[email protected]> Co-authored-by: Damian Nolan <[email protected]>
1 parent 4546ea4 commit 6fbd71a

File tree

5 files changed

+706
-299
lines changed

5 files changed

+706
-299
lines changed

‎e2e/fee_middleware_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ import (
66
"time"
77

88
sdk "github.com/cosmos/cosmos-sdk/types"
9-
"github.com/strangelove-ventures/ibctest/broadcast"
9+
"github.com/strangelove-ventures/ibctest"
1010
"github.com/strangelove-ventures/ibctest/chain/cosmos"
1111
"github.com/strangelove-ventures/ibctest/ibc"
1212
"github.com/strangelove-ventures/ibctest/test"
1313
"github.com/stretchr/testify/suite"
1414

1515
"github.com/cosmos/ibc-go/e2e/testsuite"
1616
"github.com/cosmos/ibc-go/e2e/testvalues"
17-
feetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types"
18-
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
19-
clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
20-
channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
17+
feetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
18+
transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
19+
clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
20+
channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
2121
)
2222

2323
func TestFeeMiddlewareTestSuite(t *testing.T) {
@@ -30,7 +30,7 @@ type FeeMiddlewareTestSuite struct {
3030

3131
// RegisterCounterPartyPayee broadcasts a MsgRegisterCounterpartyPayee message.
3232
func (s *FeeMiddlewareTestSuite) RegisterCounterPartyPayee(ctx context.Context, chain *cosmos.CosmosChain,
33-
user broadcast.User, portID, channelID, relayerAddr, counterpartyPayeeAddr string,
33+
user *ibctest.User, portID, channelID, relayerAddr, counterpartyPayeeAddr string,
3434
) (sdk.TxResponse, error) {
3535
msg := feetypes.NewMsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr)
3636
return s.BroadcastMessages(ctx, chain, user, msg)
@@ -53,7 +53,7 @@ func (s *FeeMiddlewareTestSuite) QueryCounterPartyPayee(ctx context.Context, cha
5353
func (s *FeeMiddlewareTestSuite) PayPacketFeeAsync(
5454
ctx context.Context,
5555
chain *cosmos.CosmosChain,
56-
user broadcast.User,
56+
user *ibctest.User,
5757
packetID channeltypes.PacketId,
5858
packetFee feetypes.PacketFee,
5959
) (sdk.TxResponse, error) {
@@ -148,7 +148,7 @@ func (s *FeeMiddlewareTestSuite) TestMsgPayPacketFee_AsyncSingleSender_Succeeds(
148148
s.Require().Empty(packets)
149149
})
150150

151-
packetId := channeltypes.NewPacketId(channelA.PortID, channelA.ChannelID, 1)
151+
packetId := channeltypes.NewPacketID(channelA.PortID, channelA.ChannelID, 1)
152152
packetFee := feetypes.NewPacketFee(testFee, chainAWallet.Bech32Address(chainA.Config().Bech32Prefix), nil)
153153

154154
t.Run("should succeed", func(t *testing.T) {
@@ -371,7 +371,7 @@ func (s *FeeMiddlewareTestSuite) TestMsgPayPacketFee_SingleSender_TimesOut() {
371371
})
372372

373373
t.Run("pay packet fee", func(t *testing.T) {
374-
packetId := channeltypes.NewPacketId(channelA.PortID, channelA.ChannelID, 1)
374+
packetId := channeltypes.NewPacketID(channelA.PortID, channelA.ChannelID, 1)
375375
packetFee := feetypes.NewPacketFee(testFee, chainAWallet.Bech32Address(chainA.Config().Bech32Prefix), nil)
376376

377377
t.Run("no incentivized packets", func(t *testing.T) {

‎e2e/go.mod‎

Lines changed: 72 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,71 @@ go 1.18
55
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
66

77
require (
8-
github.com/cosmos/cosmos-sdk v0.45.6
9-
github.com/cosmos/ibc-go/v4 v4.0.0-rc0
8+
github.com/cosmos/cosmos-sdk v0.46.0
9+
github.com/cosmos/ibc-go/v5 v5.0.0-beta1
1010
github.com/docker/docker v20.10.17+incompatible
11-
github.com/strangelove-ventures/ibctest v0.0.0-20220713213153-930886d8db30
11+
github.com/strangelove-ventures/ibctest v0.0.0-20220808203516-6cbd3743756d
1212
github.com/stretchr/testify v1.8.0
1313
go.uber.org/zap v1.21.0
14-
google.golang.org/grpc v1.47.0
14+
google.golang.org/grpc v1.48.0
1515
)
1616

1717
require (
18-
filippo.io/edwards25519 v1.0.0-beta.2 // indirect
19-
github.com/99designs/keyring v1.1.6 // indirect
20-
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
21-
github.com/DataDog/zstd v1.4.5 // indirect
22-
github.com/Microsoft/go-winio v0.5.1 // indirect
18+
cloud.google.com/go v0.100.2 // indirect
19+
cloud.google.com/go/compute v1.6.1 // indirect
20+
cloud.google.com/go/iam v0.3.0 // indirect
21+
cloud.google.com/go/storage v1.14.0 // indirect
22+
cosmossdk.io/errors v1.0.0-beta.7 // indirect
23+
cosmossdk.io/math v1.0.0-beta.2 // indirect
24+
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
25+
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
26+
github.com/99designs/keyring v1.2.1 // indirect
27+
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
28+
github.com/Microsoft/go-winio v0.5.2 // indirect
2329
github.com/armon/go-metrics v0.4.0 // indirect
2430
github.com/avast/retry-go/v4 v4.0.4 // indirect
25-
github.com/benbjohnson/clock v1.1.0 // indirect
31+
github.com/aws/aws-sdk-go v1.40.45 // indirect
32+
github.com/benbjohnson/clock v1.3.0 // indirect
2633
github.com/beorn7/perks v1.0.1 // indirect
34+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2735
github.com/bgentry/speakeasy v0.1.0 // indirect
28-
github.com/btcsuite/btcd v0.22.0-beta // indirect
36+
github.com/btcsuite/btcd v0.22.1 // indirect
2937
github.com/cespare/xxhash v1.1.0 // indirect
3038
github.com/cespare/xxhash/v2 v2.1.2 // indirect
39+
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
3140
github.com/confio/ics23/go v0.7.0 // indirect
3241
github.com/cosmos/btcutil v1.0.4 // indirect
42+
github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect
3343
github.com/cosmos/go-bip39 v1.0.0 // indirect
34-
github.com/cosmos/iavl v0.17.3 // indirect
44+
github.com/cosmos/gorocksdb v1.2.0 // indirect
45+
github.com/cosmos/iavl v0.19.0 // indirect
3546
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
3647
github.com/cosmos/ledger-go v0.9.2 // indirect
37-
github.com/danieljoos/wincred v1.0.2 // indirect
48+
github.com/danieljoos/wincred v1.1.2 // indirect
3849
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
40-
github.com/dgraph-io/ristretto v0.0.3 // indirect
50+
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
51+
github.com/dgraph-io/ristretto v0.1.0 // indirect
4152
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
4253
github.com/docker/distribution v2.8.1+incompatible // indirect
4354
github.com/docker/go-connections v0.4.0 // indirect
4455
github.com/docker/go-units v0.4.0 // indirect
4556
github.com/dustin/go-humanize v1.0.0 // indirect
46-
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
57+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
4758
github.com/felixge/httpsnoop v1.0.1 // indirect
4859
github.com/fsnotify/fsnotify v1.5.4 // indirect
4960
github.com/go-kit/kit v0.12.0 // indirect
50-
github.com/go-kit/log v0.2.0 // indirect
61+
github.com/go-kit/log v0.2.1 // indirect
5162
github.com/go-logfmt/logfmt v0.5.1 // indirect
5263
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
5364
github.com/gogo/gateway v1.1.0 // indirect
5465
github.com/gogo/protobuf v1.3.3 // indirect
66+
github.com/golang/glog v1.0.0 // indirect
67+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5568
github.com/golang/protobuf v1.5.2 // indirect
56-
github.com/golang/snappy v0.0.3 // indirect
57-
github.com/google/btree v1.0.0 // indirect
69+
github.com/golang/snappy v0.0.4 // indirect
70+
github.com/google/btree v1.0.1 // indirect
5871
github.com/google/uuid v1.3.0 // indirect
72+
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
5973
github.com/gorilla/handlers v1.5.1 // indirect
6074
github.com/gorilla/mux v1.8.0 // indirect
6175
github.com/gorilla/websocket v1.5.0 // indirect
@@ -64,32 +78,39 @@ require (
6478
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
6579
github.com/gtank/merlin v0.1.1 // indirect
6680
github.com/gtank/ristretto255 v0.1.2 // indirect
81+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
82+
github.com/hashicorp/go-getter v1.6.1 // indirect
6783
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
68-
github.com/hashicorp/golang-lru v0.5.4 // indirect
84+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
85+
github.com/hashicorp/go-version v1.4.0 // indirect
86+
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
6987
github.com/hashicorp/hcl v1.0.0 // indirect
70-
github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
88+
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
7189
github.com/inconshreveable/mousetrap v1.0.0 // indirect
90+
github.com/jmespath/go-jmespath v0.4.0 // indirect
7291
github.com/jmhodges/levigo v1.0.0 // indirect
7392
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
74-
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
75-
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
93+
github.com/klauspost/compress v1.15.1 // indirect
94+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
7695
github.com/magiconair/properties v1.8.6 // indirect
7796
github.com/mattn/go-isatty v0.0.14 // indirect
7897
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
79-
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
98+
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
8099
github.com/mitchellh/go-homedir v1.1.0 // indirect
100+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
81101
github.com/mitchellh/mapstructure v1.5.0 // indirect
102+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
82103
github.com/mtibben/percent v0.2.1 // indirect
83104
github.com/opencontainers/go-digest v1.0.0 // indirect
84105
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
85106
github.com/pelletier/go-toml v1.9.5 // indirect
86-
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
107+
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
87108
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
88109
github.com/pkg/errors v0.9.1 // indirect
89110
github.com/pmezard/go-difflib v1.0.0 // indirect
90-
github.com/prometheus/client_golang v1.12.1 // indirect
111+
github.com/prometheus/client_golang v1.12.2 // indirect
91112
github.com/prometheus/client_model v0.2.0 // indirect
92-
github.com/prometheus/common v0.32.1 // indirect
113+
github.com/prometheus/common v0.34.0 // indirect
93114
github.com/prometheus/procfs v0.7.3 // indirect
94115
github.com/rakyll/statik v0.1.7 // indirect
95116
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
@@ -103,32 +124,37 @@ require (
103124
github.com/spf13/jwalterweatherman v1.1.0 // indirect
104125
github.com/spf13/pflag v1.0.5 // indirect
105126
github.com/spf13/viper v1.12.0 // indirect
106-
github.com/subosito/gotenv v1.3.0 // indirect
107-
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
108-
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
127+
github.com/subosito/gotenv v1.4.0 // indirect
128+
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
109129
github.com/tendermint/btcd v0.1.1 // indirect
110130
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
111131
github.com/tendermint/go-amino v0.16.0 // indirect
112-
github.com/tendermint/tendermint v0.34.19 // indirect
113-
github.com/tendermint/tm-db v0.6.6 // indirect
114-
github.com/zondax/hid v0.9.0 // indirect
132+
github.com/tendermint/tendermint v0.34.20 // indirect
133+
github.com/tendermint/tm-db v0.6.7 // indirect
134+
github.com/ulikunitz/xz v0.5.8 // indirect
135+
github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect
115136
go.etcd.io/bbolt v1.3.6 // indirect
137+
go.opencensus.io v0.23.0 // indirect
116138
go.uber.org/atomic v1.9.0 // indirect
117-
go.uber.org/multierr v1.7.0 // indirect
118-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
119-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
120-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
139+
go.uber.org/multierr v1.8.0 // indirect
140+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
141+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
142+
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
143+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
121144
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
122-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
123-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
145+
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
146+
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
124147
golang.org/x/text v0.3.7 // indirect
125-
golang.org/x/tools v0.1.10 // indirect
148+
golang.org/x/tools v0.1.11 // indirect
126149
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
150+
google.golang.org/api v0.81.0 // indirect
151+
google.golang.org/appengine v1.6.7 // indirect
127152
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
128-
google.golang.org/protobuf v1.28.0 // indirect
129-
gopkg.in/ini.v1 v1.66.4 // indirect
153+
google.golang.org/protobuf v1.28.1 // indirect
154+
gopkg.in/ini.v1 v1.66.6 // indirect
130155
gopkg.in/yaml.v2 v2.4.0 // indirect
131156
gopkg.in/yaml.v3 v3.0.1 // indirect
157+
gotest.tools/v3 v3.3.0 // indirect
132158
lukechampine.com/uint128 v1.1.1 // indirect
133159
modernc.org/cc/v3 v3.36.0 // indirect
134160
modernc.org/ccgo/v3 v3.16.6 // indirect
@@ -139,4 +165,8 @@ require (
139165
modernc.org/sqlite v1.17.3 // indirect
140166
modernc.org/strutil v1.1.1 // indirect
141167
modernc.org/token v1.0.0 // indirect
168+
sigs.k8s.io/yaml v1.3.0 // indirect
142169
)
170+
171+
// TODO: using version v1.0.0 causes a build failure. This is the previous version which compiles successfully.
172+
replace github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d

0 commit comments

Comments
 (0)