Skip to content

Commit 7ee3cb0

Browse files
gjermundgarabagjermundgaraba
authored
chore: update interchaintest + cleanup (#7937)
1 parent 4f3c2d8 commit 7ee3cb0

16 files changed

+91
-407
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,5 @@ tmp/
6565
go.work
6666
go.work.sum
6767

68-
# E2E WASM contract
69-
!ics10_grandpa_cw.wasm
70-
7168
# Python
7269
venv

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.6-alpine as builder
1+
FROM golang:1.23.6-alpine AS builder
22
ARG IBC_GO_VERSION
33

44
RUN set -eux; apk add --no-cache gcc git libusb-dev linux-headers make musl-dev;
@@ -29,7 +29,7 @@ RUN make build
2929
FROM alpine:3.21
3030
ARG IBC_GO_VERSION
3131

32-
LABEL "org.cosmos.ibc-go" "${IBC_GO_VERSION}"
32+
LABEL "org.cosmos.ibc-go"="${IBC_GO_VERSION}"
3333

3434
COPY --from=builder /go/build/simd /bin/simd
3535

‎e2e/ci-e2e-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ relayers:
3939
- id: rly
4040
image: ghcr.io/cosmos/relayer
4141
tag: "latest"
42-
- id: hyperspace
43-
image: ghcr.io/misko9/hyperspace
44-
tag: "20231122v39"
4542

4643
cometbft:
4744
logLevel: info

‎e2e/dockerutil/dockerutil.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"path"
99

1010
dockertypes "github.com/docker/docker/api/types"
11+
"github.com/docker/docker/api/types/container"
1112
"github.com/docker/docker/api/types/filters"
1213
dockerclient "github.com/docker/docker/client"
1314
)
@@ -18,7 +19,7 @@ const testLabel = "ibc-test"
1819
// note: the test suite name must be passed as the chains are created in SetupSuite which will label
1920
// them with the name of the test suite rather than the test.
2021
func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.Client) ([]dockertypes.Container, error) {
21-
testContainers, err := dc.ContainerList(ctx, dockertypes.ContainerListOptions{
22+
testContainers, err := dc.ContainerList(ctx, container.ListOptions{
2223
All: true,
2324
Filters: filters.NewArgs(
2425
// see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
@@ -35,7 +36,7 @@ func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.C
3536

3637
// GetContainerLogs returns the logs of a container as a byte array.
3738
func GetContainerLogs(ctx context.Context, dc *dockerclient.Client, containerName string) ([]byte, error) {
38-
readCloser, err := dc.ContainerLogs(ctx, containerName, dockertypes.ContainerLogsOptions{
39+
readCloser, err := dc.ContainerLogs(ctx, containerName, container.LogsOptions{
3940
ShowStdout: true,
4041
ShowStderr: true,
4142
})

‎e2e/go.mod

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ module github.com/cosmos/ibc-go/e2e
33
go 1.23.6
44

55
// needed temporarily for v9.
6-
replace (
7-
github.com/misko9/go-substrate-rpc-client/v4 => github.com/DimitrisJim/go-substrate-rpc-client/v4 v4.0.0-20240717100841-406da076c1d5
8-
github.com/strangelove-ventures/interchaintest/v8 => github.com/DimitrisJim/interchaintest/v8 v8.0.0-20240717102845-beba523a47ff
9-
)
6+
replace github.com/strangelove-ventures/interchaintest/v8 => github.com/gjermundgaraba/interchaintest/v8 v8.0.0-20250207235834-7fa4ae7a13be
107

118
require (
129
cosmossdk.io/errors v1.0.1
@@ -17,13 +14,13 @@ require (
1714
github.com/cosmos/gogoproto v1.7.0
1815
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.0.0-00010101000000-000000000000
1916
github.com/cosmos/ibc-go/v9 v9.0.0
20-
github.com/docker/docker v24.0.7+incompatible
17+
github.com/docker/docker v27.3.1+incompatible
2118
github.com/pelletier/go-toml v1.9.5
2219
github.com/strangelove-ventures/interchaintest/v8 v8.2.1-0.20240419152858-c8b741617cd8
2320
github.com/stretchr/testify v1.10.0
2421
go.uber.org/zap v1.27.0
2522
golang.org/x/mod v0.21.0
26-
google.golang.org/grpc v1.69.0
23+
google.golang.org/grpc v1.69.4
2724
gopkg.in/yaml.v2 v2.4.0
2825
)
2926

@@ -46,16 +43,10 @@ require (
4643
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4744
github.com/99designs/keyring v1.2.2 // indirect
4845
github.com/BurntSushi/toml v1.4.0 // indirect
49-
github.com/ChainSafe/go-schnorrkel v1.1.0 // indirect
50-
github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect
51-
github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 // indirect
5246
github.com/CosmWasm/wasmvm/v2 v2.1.2 // indirect
5347
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
5448
github.com/DataDog/zstd v1.5.5 // indirect
55-
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
56-
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
5749
github.com/Microsoft/go-winio v0.6.2 // indirect
58-
github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect
5950
github.com/avast/retry-go/v4 v4.5.1 // indirect
6051
github.com/aws/aws-sdk-go v1.49.0 // indirect
6152
github.com/beorn7/perks v1.0.1 // indirect
@@ -84,16 +75,11 @@ require (
8475
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
8576
github.com/danieljoos/wincred v1.2.1 // indirect
8677
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
87-
github.com/deckarep/golang-set v1.8.0 // indirect
88-
github.com/decred/base58 v1.0.5 // indirect
89-
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
90-
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1 // indirect
9178
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
9279
github.com/desertbit/timer v1.0.1 // indirect
9380
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
9481
github.com/dgraph-io/ristretto v0.1.1 // indirect
95-
github.com/distribution/reference v0.5.0 // indirect
96-
github.com/docker/distribution v2.8.3+incompatible // indirect
82+
github.com/distribution/reference v0.6.0 // indirect
9783
github.com/docker/go-connections v0.5.0 // indirect
9884
github.com/docker/go-units v0.5.0 // indirect
9985
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -111,7 +97,7 @@ require (
11197
github.com/go-logr/stdr v1.2.2 // indirect
11298
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
11399
github.com/gogo/googleapis v1.4.1 // indirect
114-
github.com/gogo/protobuf v1.3.3 // indirect
100+
github.com/gogo/protobuf v1.3.2 // indirect
115101
github.com/golang/glog v1.2.2 // indirect
116102
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
117103
github.com/golang/mock v1.6.0 // indirect
@@ -121,6 +107,7 @@ require (
121107
github.com/google/flatbuffers v24.3.25+incompatible // indirect
122108
github.com/google/go-cmp v0.6.0 // indirect
123109
github.com/google/orderedcode v0.0.1 // indirect
110+
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
124111
github.com/google/s2a-go v0.1.7 // indirect
125112
github.com/google/uuid v1.6.0 // indirect
126113
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -131,8 +118,6 @@ require (
131118
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
132119
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
133120
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
134-
github.com/gtank/merlin v0.1.1 // indirect
135-
github.com/gtank/ristretto255 v0.1.2 // indirect
136121
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
137122
github.com/hashicorp/go-getter v1.7.4 // indirect
138123
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -153,39 +138,24 @@ require (
153138
github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 // indirect
154139
github.com/improbable-eng/grpc-web v0.15.0 // indirect
155140
github.com/inconshreveable/mousetrap v1.1.0 // indirect
156-
github.com/ipfs/go-cid v0.4.1 // indirect
157141
github.com/jmespath/go-jmespath v0.4.0 // indirect
158142
github.com/jmhodges/levigo v1.0.0 // indirect
159143
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
160144
github.com/klauspost/compress v1.17.9 // indirect
161-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
162145
github.com/kr/pretty v0.3.1 // indirect
163146
github.com/kr/text v0.2.0 // indirect
164147
github.com/lib/pq v1.10.9 // indirect
165-
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
166-
github.com/libp2p/go-libp2p v0.32.1 // indirect
167148
github.com/linxGnu/grocksdb v1.9.2 // indirect
168149
github.com/magiconair/properties v1.8.7 // indirect
169150
github.com/manifoldco/promptui v0.9.0 // indirect
170151
github.com/mattn/go-colorable v0.1.13 // indirect
171152
github.com/mattn/go-isatty v0.0.20 // indirect
172-
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
173153
github.com/minio/highwayhash v1.0.3 // indirect
174-
github.com/minio/sha256-simd v1.0.1 // indirect
175-
github.com/misko9/go-substrate-rpc-client/v4 v4.0.0-20230913220906-b988ea7da0c2 // indirect
176154
github.com/mitchellh/go-homedir v1.1.0 // indirect
177155
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
178156
github.com/mitchellh/mapstructure v1.5.0 // indirect
179-
github.com/morikuni/aec v1.0.0 // indirect
180-
github.com/mr-tron/base58 v1.2.0 // indirect
157+
github.com/moby/docker-image-spec v1.3.1 // indirect
181158
github.com/mtibben/percent v0.2.1 // indirect
182-
github.com/multiformats/go-base32 v0.1.0 // indirect
183-
github.com/multiformats/go-base36 v0.2.0 // indirect
184-
github.com/multiformats/go-multiaddr v0.12.0 // indirect
185-
github.com/multiformats/go-multibase v0.2.0 // indirect
186-
github.com/multiformats/go-multicodec v0.9.0 // indirect
187-
github.com/multiformats/go-multihash v0.2.3 // indirect
188-
github.com/multiformats/go-varint v0.0.7 // indirect
189159
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
190160
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
191161
github.com/oklog/run v1.1.0 // indirect
@@ -195,7 +165,6 @@ require (
195165
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
196166
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
197167
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
198-
github.com/pierrec/xxHash v0.1.5 // indirect
199168
github.com/pkg/errors v0.9.1 // indirect
200169
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
201170
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -204,15 +173,14 @@ require (
204173
github.com/prometheus/procfs v0.15.1 // indirect
205174
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
206175
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
207-
github.com/rogpeppe/go-internal v1.12.0 // indirect
176+
github.com/rogpeppe/go-internal v1.13.1 // indirect
208177
github.com/rs/cors v1.11.1 // indirect
209178
github.com/rs/zerolog v1.33.0 // indirect
210179
github.com/sagikazarmark/locafero v0.6.0 // indirect
211180
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
212181
github.com/sasha-s/go-deadlock v0.3.5 // indirect
213182
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
214183
github.com/sourcegraph/conc v0.3.0 // indirect
215-
github.com/spaolacci/murmur3 v1.1.0 // indirect
216184
github.com/spf13/afero v1.11.0 // indirect
217185
github.com/spf13/cast v1.7.0 // indirect
218186
github.com/spf13/cobra v1.8.1 // indirect
@@ -222,39 +190,38 @@ require (
222190
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
223191
github.com/tendermint/go-amino v0.16.0 // indirect
224192
github.com/tidwall/btree v1.7.0 // indirect
225-
github.com/tyler-smith/go-bip32 v1.0.0 // indirect
226-
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
227193
github.com/ulikunitz/xz v0.5.11 // indirect
228194
github.com/zondax/hid v0.9.2 // indirect
229195
github.com/zondax/ledger-go v0.14.3 // indirect
230196
go.etcd.io/bbolt v1.4.0-alpha.1 // indirect
231197
go.opencensus.io v0.24.0 // indirect
198+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
232199
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
233200
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
234-
go.opentelemetry.io/otel v1.31.0 // indirect
235-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
236-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
201+
go.opentelemetry.io/otel v1.34.0 // indirect
202+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
203+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
204+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
205+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
237206
go.uber.org/multierr v1.11.0 // indirect
238-
golang.org/x/crypto v0.28.0 // indirect
207+
golang.org/x/crypto v0.32.0 // indirect
239208
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
240-
golang.org/x/net v0.30.0 // indirect
209+
golang.org/x/net v0.34.0 // indirect
241210
golang.org/x/oauth2 v0.23.0 // indirect
242-
golang.org/x/sync v0.8.0 // indirect
243-
golang.org/x/sys v0.26.0 // indirect
244-
golang.org/x/term v0.25.0 // indirect
245-
golang.org/x/text v0.19.0 // indirect
211+
golang.org/x/sync v0.10.0 // indirect
212+
golang.org/x/sys v0.29.0 // indirect
213+
golang.org/x/term v0.28.0 // indirect
214+
golang.org/x/text v0.21.0 // indirect
246215
golang.org/x/time v0.5.0 // indirect
247216
golang.org/x/tools v0.24.0 // indirect
248217
google.golang.org/api v0.186.0 // indirect
249218
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect
250-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
251-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
252-
google.golang.org/protobuf v1.35.2 // indirect
219+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
220+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
221+
google.golang.org/protobuf v1.36.3 // indirect
253222
gopkg.in/ini.v1 v1.67.0 // indirect
254-
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
255223
gopkg.in/yaml.v3 v3.0.1 // indirect
256224
gotest.tools/v3 v3.5.1 // indirect
257-
lukechampine.com/blake3 v1.2.1 // indirect
258225
lukechampine.com/uint128 v1.3.0 // indirect
259226
modernc.org/cc/v3 v3.41.0 // indirect
260227
modernc.org/ccgo/v3 v3.16.15 // indirect
@@ -270,18 +237,9 @@ require (
270237
sigs.k8s.io/yaml v1.4.0 // indirect
271238
)
272239

273-
// TODO: using version v1.0.0 causes a build failure. This is the previous version which compiles successfully.
274-
replace (
275-
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
276-
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
277-
github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
278-
)
279-
280240
// uncomment to use the local version of ibc-go, you will need to run `go mod tidy` in e2e directory.
281241
replace github.com/cosmos/ibc-go/v9 => ../
282242

283243
replace github.com/cosmos/ibc-go/modules/light-clients/08-wasm => ../modules/light-clients/08-wasm
284244

285245
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
286-
287-
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

0 commit comments

Comments
 (0)