Skip to content

Commit a085bb6

Browse files
committed
fix: dependency & performance issues
1 parent 34a13b0 commit a085bb6

11 files changed

Lines changed: 305 additions & 301 deletions

File tree

chain/cosmos/chain_node.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,6 @@ func (tn *ChainNode) StartContainer(ctx context.Context) error {
12491249
return err
12501250
}
12511251

1252-
time.Sleep(5 * time.Second)
12531252
return retry.Do(func() error {
12541253
stat, err := tn.Client.Status(ctx)
12551254
if err != nil {
@@ -1261,7 +1260,7 @@ func (tn *ChainNode) StartContainer(ctx context.Context) error {
12611260
stat.SyncInfo.LatestBlockHeight, stat.SyncInfo.CatchingUp)
12621261
}
12631262
return nil
1264-
}, retry.Context(ctx), retry.Attempts(40), retry.Delay(3*time.Second), retry.DelayType(retry.FixedDelay))
1263+
}, retry.Context(ctx), retry.Attempts(1000), retry.Delay(250*time.Millisecond), retry.DelayType(retry.FixedDelay))
12651264
}
12661265

12671266
func (tn *ChainNode) PauseContainer(ctx context.Context) error {

chain/internal/tendermint/tendermint_node.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ func (tn *TendermintNode) StartContainer(ctx context.Context) error {
298298
return err
299299
}
300300

301-
time.Sleep(5 * time.Second)
302301
return retry.Do(func() error {
303302
stat, err := tn.Client.Status(ctx)
304303
if err != nil {

chain/namada/namada_chain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ func (c *NamadaChain) SendIBCTransfer(ctx context.Context, channelID, keyName st
504504
return ibc.Tx{}, fmt.Errorf("checking the events failed: %v", err)
505505
}
506506
const evType = "send_packet"
507-
tendermintEvents := results.EndBlockEvents
507+
tendermintEvents := results.FinalizeBlockEvents
508508
var events []cometbft.Event
509509
for _, event := range tendermintEvents {
510510
if event.Type != evType {

chain/namada/namada_node.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"time"
1010

1111
"github.com/avast/retry-go/v4"
12+
rpcclient "github.com/cometbft/cometbft/rpc/client"
13+
rpchttp "github.com/cometbft/cometbft/rpc/client/http"
14+
libclient "github.com/cometbft/cometbft/rpc/jsonrpc/client"
1215
"github.com/docker/docker/api/types/network"
1316
volumetypes "github.com/docker/docker/api/types/volume"
1417
"github.com/docker/go-connections/nat"
1518
dockerclient "github.com/moby/moby/client"
16-
rpcclient "github.com/tendermint/tendermint/rpc/client"
17-
rpchttp "github.com/tendermint/tendermint/rpc/client/http"
18-
libclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
1919
"go.uber.org/zap"
2020

2121
"github.com/strangelove-ventures/interchaintest/v8/dockerutil"

dockerutil/filewriter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (w *FileWriter) WriteFile(ctx context.Context, volumeName, relPath string,
5959
},
6060
&container.HostConfig{
6161
Binds: []string{volumeName + ":" + mountPath},
62-
AutoRemove: true,
62+
AutoRemove: false, // with newer docker versions, having `true` would delete the container too early.
6363
},
6464
nil, // No networking necessary.
6565
nil,

go.mod

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/strangelove-ventures/interchaintest/v8
22

3-
go 1.22.5
3+
go 1.22.11
44

5-
toolchain go1.23.0
5+
toolchain go1.24.10
66

77
replace (
88
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
@@ -25,15 +25,16 @@ require (
2525
github.com/StirlingMarketingGroup/go-namecase v1.0.0
2626
github.com/atotto/clipboard v0.1.4
2727
github.com/avast/retry-go/v4 v4.5.1
28-
github.com/cometbft/cometbft v0.38.11
28+
github.com/cometbft/cometbft v0.38.19
2929
github.com/cosmos/cosmos-sdk v0.50.9
3030
github.com/cosmos/go-bip39 v1.0.0
31-
github.com/cosmos/gogoproto v1.5.0
31+
github.com/cosmos/gogoproto v1.7.0
3232
github.com/cosmos/ibc-go/modules/capability v1.0.1
3333
github.com/cosmos/ibc-go/v8 v8.4.0
3434
github.com/cosmos/interchain-security/v5 v5.1.1
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
3636
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1
37+
github.com/docker/docker v27.5.1+incompatible
3738
github.com/docker/go-connections v0.5.0
3839
github.com/ethereum/go-ethereum v1.14.8
3940
github.com/gdamore/tcell/v2 v2.7.4
@@ -49,19 +50,18 @@ require (
4950
github.com/pelletier/go-toml v1.9.5
5051
github.com/pelletier/go-toml/v2 v2.2.2
5152
github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8
52-
github.com/spf13/cobra v1.8.1
53+
github.com/spf13/cobra v1.9.1
5354
github.com/stretchr/testify v1.10.0
54-
github.com/tendermint/tendermint v0.38.0-dev
5555
github.com/tidwall/gjson v1.17.1
5656
github.com/tyler-smith/go-bip32 v1.0.0
5757
github.com/tyler-smith/go-bip39 v1.1.0
5858
go.uber.org/multierr v1.11.0
5959
go.uber.org/zap v1.27.0
60-
golang.org/x/crypto v0.32.0
60+
golang.org/x/crypto v0.33.0
6161
golang.org/x/mod v0.19.0
62-
golang.org/x/sync v0.10.0
62+
golang.org/x/sync v0.11.0
6363
golang.org/x/tools v0.23.0
64-
google.golang.org/grpc v1.69.4
64+
google.golang.org/grpc v1.70.0
6565
gopkg.in/yaml.v3 v3.0.1
6666
modernc.org/sqlite v1.31.1
6767
)
@@ -95,8 +95,8 @@ require (
9595
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
9696
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
9797
github.com/bits-and-blooms/bitset v1.10.0 // indirect
98-
github.com/btcsuite/btcd v0.22.1 // indirect
9998
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
99+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
100100
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
101101
github.com/cespare/xxhash/v2 v2.3.0 // indirect
102102
github.com/chzyer/readline v1.5.1 // indirect
@@ -107,7 +107,7 @@ require (
107107
github.com/cockroachdb/pebble v1.1.1 // indirect
108108
github.com/cockroachdb/redact v1.1.5 // indirect
109109
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
110-
github.com/cometbft/cometbft-db v0.14.0 // indirect
110+
github.com/cometbft/cometbft-db v0.14.1 // indirect
111111
github.com/consensys/bavard v0.1.13 // indirect
112112
github.com/consensys/gnark-crypto v0.12.1 // indirect
113113
github.com/containerd/log v0.1.0 // indirect
@@ -123,14 +123,13 @@ require (
123123
github.com/deckarep/golang-set v1.8.0 // indirect
124124
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
125125
github.com/decred/base58 v1.0.4 // indirect
126-
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
127-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
126+
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
127+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
128128
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
129129
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
130130
github.com/dgraph-io/ristretto v0.1.1 // indirect
131131
github.com/distribution/reference v0.6.0 // indirect
132132
github.com/docker/distribution v2.8.2+incompatible // indirect
133-
github.com/docker/docker v27.5.1+incompatible // indirect
134133
github.com/docker/go-units v0.5.0 // indirect
135134
github.com/dustin/go-humanize v1.0.1 // indirect
136135
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
@@ -141,7 +140,7 @@ require (
141140
github.com/fsnotify/fsnotify v1.7.0 // indirect
142141
github.com/gdamore/encoding v1.0.0 // indirect
143142
github.com/getsentry/sentry-go v0.27.0 // indirect
144-
github.com/go-kit/kit v0.12.0 // indirect
143+
github.com/go-kit/kit v0.13.0 // indirect
145144
github.com/go-kit/log v0.2.1 // indirect
146145
github.com/go-logfmt/logfmt v0.6.0 // indirect
147146
github.com/go-logr/logr v1.4.2 // indirect
@@ -150,21 +149,22 @@ require (
150149
github.com/gobwas/ws v1.2.1 // indirect
151150
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
152151
github.com/gogo/googleapis v1.4.1 // indirect
153-
github.com/golang/glog v1.2.2 // indirect
152+
github.com/golang/glog v1.2.3 // indirect
154153
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
155154
github.com/golang/mock v1.6.0 // indirect
156155
github.com/golang/protobuf v1.5.4 // indirect
157156
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
158-
github.com/google/btree v1.1.2 // indirect
159-
github.com/google/flatbuffers v1.12.1 // indirect
157+
github.com/google/btree v1.1.3 // indirect
158+
github.com/google/flatbuffers v23.5.26+incompatible // indirect
160159
github.com/google/orderedcode v0.0.1 // indirect
160+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
161161
github.com/google/s2a-go v0.1.7 // indirect
162162
github.com/google/uuid v1.6.0 // indirect
163163
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
164164
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
165165
github.com/gorilla/handlers v1.5.2 // indirect
166166
github.com/gorilla/mux v1.8.1 // indirect
167-
github.com/gorilla/websocket v1.5.0 // indirect
167+
github.com/gorilla/websocket v1.5.3 // indirect
168168
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
169169
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
170170
github.com/gtank/merlin v0.1.1 // indirect
@@ -190,11 +190,11 @@ require (
190190
github.com/ipfs/go-cid v0.4.1 // indirect
191191
github.com/jmespath/go-jmespath v0.4.0 // indirect
192192
github.com/jmhodges/levigo v1.0.0 // indirect
193-
github.com/klauspost/compress v1.17.7 // indirect
193+
github.com/klauspost/compress v1.17.11 // indirect
194194
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
195195
github.com/kr/pretty v0.3.1 // indirect
196196
github.com/kr/text v0.2.0 // indirect
197-
github.com/lib/pq v1.10.7 // indirect
197+
github.com/lib/pq v1.10.9 // indirect
198198
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
199199
github.com/linxGnu/grocksdb v1.8.14 // indirect
200200
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -204,13 +204,14 @@ require (
204204
github.com/mattn/go-isatty v0.0.20 // indirect
205205
github.com/mattn/go-runewidth v0.0.15 // indirect
206206
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
207-
github.com/minio/highwayhash v1.0.2 // indirect
207+
github.com/minio/highwayhash v1.0.3 // indirect
208208
github.com/minio/sha256-simd v1.0.1 // indirect
209209
github.com/mitchellh/go-homedir v1.1.0 // indirect
210210
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
211211
github.com/mitchellh/mapstructure v1.5.0 // indirect
212212
github.com/mmcloughlin/addchain v0.4.0 // indirect
213213
github.com/moby/docker-image-spec v1.3.1 // indirect
214+
github.com/morikuni/aec v1.0.0 // indirect
214215
github.com/mtibben/percent v0.2.1 // indirect
215216
github.com/multiformats/go-base32 v0.1.0 // indirect
216217
github.com/multiformats/go-base36 v0.2.0 // indirect
@@ -219,35 +220,36 @@ require (
219220
github.com/multiformats/go-multicodec v0.9.0 // indirect
220221
github.com/multiformats/go-multihash v0.2.3 // indirect
221222
github.com/multiformats/go-varint v0.0.7 // indirect
223+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
222224
github.com/ncruces/go-strftime v0.1.9 // indirect
223225
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
224226
github.com/oklog/run v1.1.0 // indirect
225-
github.com/onsi/gomega v1.27.10 // indirect
227+
github.com/onsi/gomega v1.34.1 // indirect
226228
github.com/opencontainers/go-digest v1.0.0 // indirect
227229
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
228-
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
230+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
229231
github.com/pierrec/xxHash v0.1.5 // indirect
230232
github.com/pkg/errors v0.9.1 // indirect
231233
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
232-
github.com/prometheus/client_golang v1.19.0 // indirect
234+
github.com/prometheus/client_golang v1.21.0 // indirect
233235
github.com/prometheus/client_model v0.6.1 // indirect
234-
github.com/prometheus/common v0.52.2 // indirect
235-
github.com/prometheus/procfs v0.13.0 // indirect
236+
github.com/prometheus/common v0.62.0 // indirect
237+
github.com/prometheus/procfs v0.15.1 // indirect
236238
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
237239
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
238240
github.com/rivo/uniseg v0.4.3 // indirect
239241
github.com/rogpeppe/go-internal v1.13.1 // indirect
240-
github.com/rs/cors v1.8.3 // indirect
242+
github.com/rs/cors v1.11.1 // indirect
241243
github.com/rs/zerolog v1.32.0 // indirect
242244
github.com/sagikazarmark/locafero v0.4.0 // indirect
243245
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
244-
github.com/sasha-s/go-deadlock v0.3.1 // indirect
246+
github.com/sasha-s/go-deadlock v0.3.5 // indirect
245247
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
246248
github.com/sourcegraph/conc v0.3.0 // indirect
247249
github.com/spaolacci/murmur3 v1.1.0 // indirect
248250
github.com/spf13/afero v1.11.0 // indirect
249251
github.com/spf13/cast v1.6.0 // indirect
250-
github.com/spf13/pflag v1.0.5 // indirect
252+
github.com/spf13/pflag v1.0.6 // indirect
251253
github.com/spf13/viper v1.19.0 // indirect
252254
github.com/subosito/gotenv v1.6.0 // indirect
253255
github.com/supranational/blst v0.3.11 // indirect
@@ -271,18 +273,18 @@ require (
271273
go.opentelemetry.io/otel/metric v1.34.0 // indirect
272274
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
273275
go.opentelemetry.io/otel/trace v1.34.0 // indirect
274-
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
275-
golang.org/x/net v0.34.0 // indirect
276-
golang.org/x/oauth2 v0.23.0 // indirect
277-
golang.org/x/sys v0.29.0 // indirect
278-
golang.org/x/term v0.28.0 // indirect
279-
golang.org/x/text v0.21.0 // indirect
276+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
277+
golang.org/x/net v0.35.0 // indirect
278+
golang.org/x/oauth2 v0.24.0 // indirect
279+
golang.org/x/sys v0.30.0 // indirect
280+
golang.org/x/term v0.29.0 // indirect
281+
golang.org/x/text v0.22.0 // indirect
280282
golang.org/x/time v0.5.0 // indirect
281283
google.golang.org/api v0.171.0 // indirect
282284
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
283285
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
284286
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
285-
google.golang.org/protobuf v1.36.3 // indirect
287+
google.golang.org/protobuf v1.36.5 // indirect
286288
gopkg.in/ini.v1 v1.67.0 // indirect
287289
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
288290
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)