Skip to content

Commit d79c819

Browse files
authored
Update cosmos-sdk version in system tests (#1636)
1 parent d5305e8 commit d79c819

File tree

3 files changed

+233
-155
lines changed

3 files changed

+233
-155
lines changed

tests/system/cli.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
1414
"github.com/cosmos/cosmos-sdk/std"
1515

16-
"github.com/cosmos/cosmos-sdk/client/rpc"
16+
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
1717
"github.com/cosmos/cosmos-sdk/codec"
1818
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
1919
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -354,7 +354,7 @@ func (c WasmdCli) QueryTotalSupply(denom string) int64 {
354354
return gjson.Get(raw, fmt.Sprintf("supply.#(denom==%q).amount", denom)).Int()
355355
}
356356

357-
func (c WasmdCli) GetTendermintValidatorSet() rpc.ResultValidatorsOutput {
357+
func (c WasmdCli) GetTendermintValidatorSet() cmtservice.GetLatestValidatorSetResponse {
358358
args := []string{"q", "comet-validator-set"}
359359
got := c.CustomQuery(args...)
360360

@@ -363,17 +363,17 @@ func (c WasmdCli) GetTendermintValidatorSet() rpc.ResultValidatorsOutput {
363363
std.RegisterLegacyAminoCodec(amino)
364364
std.RegisterInterfaces(codectypes.NewInterfaceRegistry())
365365

366-
var res rpc.ResultValidatorsOutput
366+
var res cmtservice.GetLatestValidatorSetResponse
367367
require.NoError(c.t, amino.UnmarshalJSON([]byte(got), &res), got)
368368
return res
369369
}
370370

371371
// IsInTendermintValset returns true when the given pub key is in the current active tendermint validator set
372-
func (c WasmdCli) IsInTendermintValset(valPubKey cryptotypes.PubKey) (rpc.ResultValidatorsOutput, bool) {
372+
func (c WasmdCli) IsInTendermintValset(valPubKey cryptotypes.PubKey) (cmtservice.GetLatestValidatorSetResponse, bool) {
373373
valResult := c.GetTendermintValidatorSet()
374374
var found bool
375375
for _, v := range valResult.Validators {
376-
if v.PubKey.Equals(valPubKey) {
376+
if v.PubKey.Equal(valPubKey) {
377377
found = true
378378
break
379379
}

tests/system/go.mod

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,77 @@
11
module github.com/CosmWasm/wasmd/tests/system
22

3-
go 1.19
3+
go 1.21
44

55
require (
6-
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
7-
github.com/cosmos/cosmos-sdk v0.47.5
6+
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
7+
github.com/cosmos/cosmos-sdk v0.50.0-rc.0.0.20230921092356-3d9ce99e4eee
88
github.com/cosmos/gogogateway v1.2.0 // indirect
9-
github.com/cosmos/gogoproto v1.4.10 // indirect
10-
github.com/cosmos/iavl v0.20.0 // indirect
9+
github.com/cosmos/gogoproto v1.4.11 // indirect
10+
github.com/cosmos/iavl v1.0.0-rc.1 // indirect
1111
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
1212
github.com/golang/protobuf v1.5.3 // indirect
1313
github.com/gorilla/mux v1.8.0 // indirect
1414
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
1515
github.com/pkg/errors v0.9.1 // indirect
16-
github.com/prometheus/client_golang v1.15.0 // indirect
17-
github.com/rakyll/statik v0.1.7 // indirect
16+
github.com/prometheus/client_golang v1.16.0 // indirect
1817
github.com/spf13/cast v1.5.1 // indirect
19-
github.com/spf13/cobra v1.6.1 // indirect
18+
github.com/spf13/cobra v1.7.0 // indirect
2019
github.com/spf13/pflag v1.0.5 // indirect
2120
github.com/stretchr/testify v1.8.4
2221
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
23-
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
24-
google.golang.org/grpc v1.56.2 // indirect
22+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
23+
google.golang.org/grpc v1.58.1 // indirect
2524
gopkg.in/yaml.v2 v2.4.0 // indirect
2625
)
2726

2827
require (
2928
cosmossdk.io/math v1.1.2
30-
github.com/cometbft/cometbft v0.37.2
29+
github.com/cometbft/cometbft v0.38.0
3130
github.com/tidwall/gjson v1.14.2
3231
github.com/tidwall/sjson v1.2.5
33-
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
32+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
3433
)
3534

3635
require (
37-
cosmossdk.io/api v0.3.1 // indirect
38-
cosmossdk.io/core v0.5.1 // indirect
36+
cosmossdk.io/api v0.7.1 // indirect
37+
cosmossdk.io/collections v0.4.0 // indirect
38+
cosmossdk.io/core v0.11.0 // indirect
3939
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
4040
cosmossdk.io/errors v1.0.0 // indirect
4141
cosmossdk.io/log v1.2.1 // indirect
42-
cosmossdk.io/tools/rosetta v0.2.1 // indirect
42+
cosmossdk.io/store v1.0.0-rc.0 // indirect
43+
cosmossdk.io/x/tx v0.10.0 // indirect
4344
filippo.io/edwards25519 v1.0.0 // indirect
4445
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4546
github.com/99designs/keyring v1.2.1 // indirect
46-
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
47-
github.com/armon/go-metrics v0.4.1 // indirect
47+
github.com/DataDog/zstd v1.5.5 // indirect
4848
github.com/beorn7/perks v1.0.1 // indirect
4949
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
5050
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
5151
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
5252
github.com/cespare/xxhash v1.1.0 // indirect
5353
github.com/cespare/xxhash/v2 v2.2.0 // indirect
54-
github.com/cockroachdb/errors v1.10.0 // indirect
54+
github.com/cockroachdb/errors v1.11.1 // indirect
5555
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
56+
github.com/cockroachdb/pebble v0.0.0-20230817233644-564b068800e0 // indirect
5657
github.com/cockroachdb/redact v1.1.5 // indirect
57-
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
58+
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
5859
github.com/cometbft/cometbft-db v0.7.0 // indirect
59-
github.com/confio/ics23/go v0.9.0 // indirect
6060
github.com/cosmos/btcutil v1.0.5 // indirect
61+
github.com/cosmos/cosmos-db v1.0.0 // indirect
6162
github.com/cosmos/go-bip39 v1.0.0 // indirect
62-
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
63-
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
64-
github.com/creachadair/taskgroup v0.4.2 // indirect
63+
github.com/cosmos/ics23/go v0.10.0 // indirect
64+
github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect
6565
github.com/danieljoos/wincred v1.1.2 // indirect
6666
github.com/davecgh/go-spew v1.1.1 // indirect
67-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
67+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
6868
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
6969
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
7070
github.com/dgraph-io/ristretto v0.1.1 // indirect
7171
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
7272
github.com/dustin/go-humanize v1.0.1 // indirect
73+
github.com/emicklei/dot v1.5.0 // indirect
74+
github.com/fatih/color v1.15.0 // indirect
7375
github.com/felixge/httpsnoop v1.0.2 // indirect
7476
github.com/fsnotify/fsnotify v1.6.0 // indirect
7577
github.com/getsentry/sentry-go v0.23.0 // indirect
@@ -86,45 +88,51 @@ require (
8688
github.com/google/orderedcode v0.0.1 // indirect
8789
github.com/gorilla/handlers v1.5.1 // indirect
8890
github.com/gorilla/websocket v1.5.0 // indirect
89-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
91+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
9092
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
91-
github.com/gtank/merlin v0.1.1 // indirect
92-
github.com/gtank/ristretto255 v0.1.2 // indirect
93+
github.com/hashicorp/go-hclog v1.5.0 // indirect
9394
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
94-
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
95+
github.com/hashicorp/go-metrics v0.5.1 // indirect
96+
github.com/hashicorp/go-plugin v1.4.10 // indirect
97+
github.com/hashicorp/golang-lru v1.0.2 // indirect
9598
github.com/hashicorp/hcl v1.0.0 // indirect
99+
github.com/hashicorp/yamux v0.1.1 // indirect
96100
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
97101
github.com/huandu/skiplist v1.2.0 // indirect
102+
github.com/iancoleman/strcase v0.3.0 // indirect
98103
github.com/improbable-eng/grpc-web v0.15.0 // indirect
99104
github.com/inconshreveable/mousetrap v1.1.0 // indirect
100105
github.com/jmhodges/levigo v1.0.0 // indirect
101-
github.com/klauspost/compress v1.16.3 // indirect
106+
github.com/klauspost/compress v1.16.7 // indirect
102107
github.com/kr/pretty v0.3.1 // indirect
103108
github.com/kr/text v0.2.0 // indirect
104109
github.com/lib/pq v1.10.7 // indirect
105110
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
111+
github.com/linxGnu/grocksdb v1.8.0 // indirect
106112
github.com/magiconair/properties v1.8.7 // indirect
107113
github.com/mattn/go-colorable v0.1.13 // indirect
108114
github.com/mattn/go-isatty v0.0.19 // indirect
109115
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
110-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
111116
github.com/minio/highwayhash v1.0.2 // indirect
117+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
112118
github.com/mitchellh/mapstructure v1.5.0 // indirect
113119
github.com/mtibben/percent v0.2.1 // indirect
114-
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
115-
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
120+
github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect
121+
github.com/oklog/run v1.1.0 // indirect
122+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
123+
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
116124
github.com/pmezard/go-difflib v1.0.0 // indirect
117-
github.com/prometheus/client_model v0.3.0 // indirect
118-
github.com/prometheus/common v0.42.0 // indirect
119-
github.com/prometheus/procfs v0.9.0 // indirect
125+
github.com/prometheus/client_model v0.4.0 // indirect
126+
github.com/prometheus/common v0.44.0 // indirect
127+
github.com/prometheus/procfs v0.11.1 // indirect
120128
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
121129
github.com/rogpeppe/go-internal v1.11.0 // indirect
122130
github.com/rs/cors v1.8.3 // indirect
123131
github.com/rs/zerolog v1.30.0 // indirect
124132
github.com/sasha-s/go-deadlock v0.3.1 // indirect
125-
github.com/spf13/afero v1.9.3 // indirect
133+
github.com/spf13/afero v1.9.5 // indirect
126134
github.com/spf13/jwalterweatherman v1.1.0 // indirect
127-
github.com/spf13/viper v1.15.0 // indirect
135+
github.com/spf13/viper v1.16.0 // indirect
128136
github.com/subosito/gotenv v1.4.2 // indirect
129137
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
130138
github.com/tendermint/go-amino v0.16.0 // indirect
@@ -134,18 +142,20 @@ require (
134142
github.com/zondax/hid v0.9.1 // indirect
135143
github.com/zondax/ledger-go v0.14.1 // indirect
136144
go.etcd.io/bbolt v1.3.7 // indirect
137-
golang.org/x/crypto v0.11.0 // indirect
138-
golang.org/x/net v0.12.0 // indirect
139-
golang.org/x/sys v0.11.0 // indirect
140-
golang.org/x/term v0.10.0 // indirect
141-
golang.org/x/text v0.12.0 // indirect
142-
google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
145+
golang.org/x/crypto v0.13.0 // indirect
146+
golang.org/x/net v0.15.0 // indirect
147+
golang.org/x/sync v0.3.0 // indirect
148+
golang.org/x/sys v0.12.0 // indirect
149+
golang.org/x/term v0.12.0 // indirect
150+
golang.org/x/text v0.13.0 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
144153
google.golang.org/protobuf v1.31.0 // indirect
145154
gopkg.in/ini.v1 v1.67.0 // indirect
146155
gopkg.in/yaml.v3 v3.0.1 // indirect
156+
gotest.tools/v3 v3.5.0 // indirect
147157
nhooyr.io/websocket v1.8.6 // indirect
148-
pgregory.net/rapid v0.5.5 // indirect
158+
pgregory.net/rapid v1.1.0 // indirect
149159
sigs.k8s.io/yaml v1.3.0 // indirect
150160
)
151161

0 commit comments

Comments
 (0)