Skip to content

Commit 2d98792

Browse files
technicallytygjermundgarabaaljo242
authored
chore: switch to cosmos/interchaintest (#8486)
Co-authored-by: Gjermund Garaba <[email protected]> Co-authored-by: Alex | Interchain Labs <[email protected]>
1 parent b31bf93 commit 2d98792

34 files changed

+279
-145
lines changed

docs/docusaurus.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const config = {
198198
},
199199
{
200200
label: "interchaintest",
201-
href: "https://github.com/strangelove-ventures/interchaintest",
201+
href: "https://github.com/cosmos/interchaintest",
202202
},
203203
{
204204
label: "CosmWasm",

e2e/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ selection.
8989
make e2e-test test=TestMsgSubmitTx_SuccessfulTransfer
9090
```
9191

92-
> Note: sometimes it can be useful to make changes to [interchaintest](https://github.com/strangelove-ventures/interchaintest)
92+
> Note: sometimes it can be useful to make changes to [interchaintest](https://github.com/cosmos/interchaintest)
9393
> when running tests locally. In order to do this, add the following line to
9494
> e2e/go.mod
9595
96-
`replace github.com/strangelove-ventures/interchaintest => ../../interchaintest`
96+
`replace github.com/cosmos/interchaintest => ../../interchaintest`
9797

9898
Or point it to any local checkout you have.
9999

@@ -122,7 +122,7 @@ This should be set to the path of a valid config file you want to use, setting t
122122

123123
### interchaintest
124124

125-
These E2E tests use the [interchaintest framework](https://github.com/strangelove-ventures/interchaintest). This framework creates chains and relayers in containers and allows for arbitrary commands to be executed in the chain containers,
125+
These E2E tests use the [interchaintest framework](https://github.com/cosmos/interchaintest). This framework creates chains and relayers in containers and allows for arbitrary commands to be executed in the chain containers,
126126
as well as allowing us to broadcast arbitrary messages which are signed on behalf of a user created in the test.
127127

128128
### Test Suites

e2e/dockerutil/dockerutil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
dockertypes "github.com/docker/docker/api/types"
1111
"github.com/docker/docker/api/types/container"
1212
"github.com/docker/docker/api/types/filters"
13-
dockerclient "github.com/docker/docker/client"
13+
dockerclient "github.com/moby/moby/client"
1414
)
1515

1616
const testLabel = "ibc-test"
@@ -22,7 +22,7 @@ func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.C
2222
testContainers, err := dc.ContainerList(ctx, container.ListOptions{
2323
All: true,
2424
Filters: filters.NewArgs(
25-
// see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
25+
// see: https://github.com/cosmos/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
2626
// for the suiteName needed to identify test containers.
2727
filters.Arg("label", testLabel+"="+suiteName),
2828
),

e2e/go.mod

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ replace (
66
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 => ../modules/light-clients/08-wasm
77
// uncomment to use the local version of ibc-go, you will need to run `go mod tidy` in e2e directory.
88
github.com/cosmos/ibc-go/v10 => ../
9-
10-
github.com/strangelove-ventures/interchaintest/v8 => github.com/gjermundgaraba/interchaintest/v8 v8.0.0-20250302163936-9fca2b7de400
11-
9+
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
1210
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
1311
)
1412

@@ -22,10 +20,11 @@ require (
2220
github.com/cosmos/gogoproto v1.7.0
2321
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.3.0
2422
github.com/cosmos/ibc-go/v10 v10.3.0
25-
github.com/docker/docker v27.3.1+incompatible
23+
github.com/cosmos/interchaintest/v10 v10.0.0
24+
github.com/docker/docker v28.0.0+incompatible
2625
github.com/iancoleman/orderedmap v0.3.0
26+
github.com/moby/moby v27.5.1+incompatible
2727
github.com/pelletier/go-toml v1.9.5
28-
github.com/strangelove-ventures/interchaintest/v8 v8.2.1-0.20240419152858-c8b741617cd8
2928
github.com/stretchr/testify v1.10.0
3029
go.uber.org/zap v1.27.0
3130
golang.org/x/mod v0.25.0
@@ -49,6 +48,7 @@ require (
4948
cosmossdk.io/log v1.6.0 // indirect
5049
cosmossdk.io/schema v1.1.0 // indirect
5150
cosmossdk.io/store v1.1.2 // indirect
51+
cosmossdk.io/x/evidence v0.2.0 // indirect
5252
cosmossdk.io/x/feegrant v0.2.0 // indirect
5353
cosmossdk.io/x/tx v0.14.0 // indirect
5454
filippo.io/edwards25519 v1.1.0 // indirect
@@ -62,12 +62,14 @@ require (
6262
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
6363
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
6464
github.com/Microsoft/go-winio v0.6.2 // indirect
65+
github.com/StackExchange/wmi v1.2.1 // indirect
6566
github.com/avast/retry-go/v4 v4.5.1 // indirect
6667
github.com/aws/aws-sdk-go v1.49.0 // indirect
6768
github.com/beorn7/perks v1.0.1 // indirect
6869
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
6970
github.com/bgentry/speakeasy v0.2.0 // indirect
7071
github.com/bits-and-blooms/bitset v1.22.0 // indirect
72+
github.com/btcsuite/btcd v0.22.1 // indirect
7173
github.com/bytedance/sonic v1.13.2 // indirect
7274
github.com/bytedance/sonic/loader v0.2.4 // indirect
7375
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -83,16 +85,22 @@ require (
8385
github.com/cockroachdb/redact v1.1.6 // indirect
8486
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
8587
github.com/cometbft/cometbft-db v0.14.1 // indirect
88+
github.com/consensys/bavard v0.1.27 // indirect
89+
github.com/consensys/gnark-crypto v0.16.0 // indirect
8690
github.com/cosmos/btcutil v1.0.5 // indirect
8791
github.com/cosmos/cosmos-db v1.1.3 // indirect
8892
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
8993
github.com/cosmos/go-bip39 v1.0.0 // indirect
9094
github.com/cosmos/gogogateway v1.2.0 // indirect
91-
github.com/cosmos/iavl v1.2.2 // indirect
95+
github.com/cosmos/iavl v1.2.4 // indirect
9296
github.com/cosmos/ics23/go v0.11.0 // indirect
97+
github.com/cosmos/interchain-security/v7 v7.0.0-20250408210344-06e0dc6bf6d6 // indirect
9398
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
99+
github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect
100+
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
94101
github.com/danieljoos/wincred v1.2.1 // indirect
95102
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
103+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
96104
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
97105
github.com/desertbit/timer v1.0.1 // indirect
98106
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
@@ -105,7 +113,9 @@ require (
105113
github.com/emicklei/dot v1.6.2 // indirect
106114
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
107115
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
116+
github.com/ethereum/c-kzg-4844/v2 v2.1.0 // indirect
108117
github.com/ethereum/go-ethereum v1.15.11 // indirect
118+
github.com/ethereum/go-verkle v0.2.2 // indirect
109119
github.com/fatih/color v1.17.0 // indirect
110120
github.com/felixge/httpsnoop v1.0.4 // indirect
111121
github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -116,10 +126,11 @@ require (
116126
github.com/go-logfmt/logfmt v0.6.0 // indirect
117127
github.com/go-logr/logr v1.4.2 // indirect
118128
github.com/go-logr/stdr v1.2.2 // indirect
129+
github.com/go-ole/go-ole v1.3.0 // indirect
119130
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
120131
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
121132
github.com/gogo/googleapis v1.4.1 // indirect
122-
github.com/gogo/protobuf v1.3.2 // indirect
133+
github.com/gogo/protobuf v1.3.3 // indirect
123134
github.com/golang/glog v1.2.4 // indirect
124135
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
125136
github.com/golang/protobuf v1.5.4 // indirect
@@ -139,14 +150,15 @@ require (
139150
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
140151
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
141152
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
153+
github.com/gtank/merlin v0.1.1 // indirect
142154
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
143155
github.com/hashicorp/go-getter v1.7.8 // indirect
144156
github.com/hashicorp/go-hclog v1.6.3 // indirect
145157
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
146158
github.com/hashicorp/go-metrics v0.5.4 // indirect
147159
github.com/hashicorp/go-plugin v1.6.3 // indirect
148160
github.com/hashicorp/go-safetemp v1.0.0 // indirect
149-
github.com/hashicorp/go-version v1.6.0 // indirect
161+
github.com/hashicorp/go-version v1.7.0 // indirect
150162
github.com/hashicorp/golang-lru v1.0.2 // indirect
151163
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
152164
github.com/hashicorp/yamux v0.1.2 // indirect
@@ -159,22 +171,25 @@ require (
159171
github.com/inconshreveable/mousetrap v1.1.0 // indirect
160172
github.com/jmespath/go-jmespath v0.4.0 // indirect
161173
github.com/jmhodges/levigo v1.0.0 // indirect
162-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
163174
github.com/klauspost/compress v1.18.0 // indirect
164175
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
165176
github.com/kr/pretty v0.3.1 // indirect
166177
github.com/kr/text v0.2.0 // indirect
167178
github.com/lib/pq v1.10.9 // indirect
179+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
168180
github.com/linxGnu/grocksdb v1.9.2 // indirect
169181
github.com/manifoldco/promptui v0.9.0 // indirect
170182
github.com/mattn/go-colorable v0.1.14 // indirect
171183
github.com/mattn/go-isatty v0.0.20 // indirect
184+
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
172185
github.com/minio/highwayhash v1.0.3 // indirect
173186
github.com/mitchellh/go-homedir v1.1.0 // indirect
174187
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
188+
github.com/mmcloughlin/addchain v0.4.0 // indirect
175189
github.com/moby/docker-image-spec v1.3.1 // indirect
176190
github.com/mtibben/percent v0.2.1 // indirect
177191
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
192+
github.com/ncruces/go-strftime v0.1.9 // indirect
178193
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
179194
github.com/oklog/run v1.1.0 // indirect
180195
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -196,6 +211,7 @@ require (
196211
github.com/sagikazarmark/locafero v0.7.0 // indirect
197212
github.com/sasha-s/go-deadlock v0.3.5 // indirect
198213
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
214+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
199215
github.com/sourcegraph/conc v0.3.0 // indirect
200216
github.com/spf13/afero v1.12.0 // indirect
201217
github.com/spf13/cast v1.9.2 // indirect
@@ -204,9 +220,16 @@ require (
204220
github.com/spf13/viper v1.20.1 // indirect
205221
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
206222
github.com/subosito/gotenv v1.6.0 // indirect
223+
github.com/supranational/blst v0.3.14 // indirect
207224
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
208225
github.com/tendermint/go-amino v0.16.0 // indirect
226+
github.com/tendermint/tendermint v0.38.0-dev // indirect
209227
github.com/tidwall/btree v1.7.0 // indirect
228+
github.com/tidwall/gjson v1.18.0 // indirect
229+
github.com/tidwall/match v1.1.1 // indirect
230+
github.com/tidwall/pretty v1.2.0 // indirect
231+
github.com/tklauser/go-sysconf v0.3.12 // indirect
232+
github.com/tklauser/numcpus v0.6.1 // indirect
210233
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
211234
github.com/ulikunitz/xz v0.5.11 // indirect
212235
github.com/zeebo/errs v1.4.0 // indirect
@@ -244,17 +267,15 @@ require (
244267
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
245268
gopkg.in/yaml.v3 v3.0.1 // indirect
246269
gotest.tools/v3 v3.5.2 // indirect
247-
lukechampine.com/uint128 v1.3.0 // indirect
248-
modernc.org/cc/v3 v3.41.0 // indirect
249-
modernc.org/ccgo/v3 v3.16.15 // indirect
250-
modernc.org/libc v1.37.1 // indirect
270+
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
271+
modernc.org/libc v1.55.3 // indirect
251272
modernc.org/mathutil v1.6.0 // indirect
252-
modernc.org/memory v1.7.2 // indirect
253-
modernc.org/opt v0.1.3 // indirect
254-
modernc.org/sqlite v1.28.0 // indirect
273+
modernc.org/memory v1.8.0 // indirect
274+
modernc.org/sqlite v1.31.1 // indirect
255275
modernc.org/strutil v1.2.0 // indirect
256276
modernc.org/token v1.1.0 // indirect
257-
nhooyr.io/websocket v1.8.11 // indirect
277+
nhooyr.io/websocket v1.8.17 // indirect
258278
pgregory.net/rapid v1.2.0 // indirect
279+
rsc.io/tmplfunc v0.0.3 // indirect
259280
sigs.k8s.io/yaml v1.4.0 // indirect
260281
)

0 commit comments

Comments
 (0)