Skip to content

Commit ad235e2

Browse files
authored
Merge pull request #26374 from cosmos/mergify/bp/release/v0.54.x/pr-26360
build(deps): Bump github.com/cockroachdb/errors from 1.12.0 to 1.13.0 in /client/v2 (backport #26360)
2 parents c789536 + ee635fa commit ad235e2

4 files changed

Lines changed: 25 additions & 12 deletions

File tree

client/v2/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
cosmossdk.io/core v1.1.0
88
cosmossdk.io/depinject v1.2.1
99
cosmossdk.io/math v1.5.3
10-
github.com/cockroachdb/errors v1.12.0
10+
github.com/cockroachdb/errors v1.13.0
1111
github.com/cosmos/cosmos-proto v1.0.0-beta.5
1212
github.com/cosmos/cosmos-sdk v0.54.0
1313
github.com/cosmos/gogoproto v1.7.2
@@ -75,7 +75,7 @@ require (
7575
github.com/felixge/httpsnoop v1.0.4 // indirect
7676
github.com/flynn/noise v1.1.0 // indirect
7777
github.com/fsnotify/fsnotify v1.9.0 // indirect
78-
github.com/getsentry/sentry-go v0.44.1 // indirect
78+
github.com/getsentry/sentry-go v0.46.0 // indirect
7979
github.com/go-kit/kit v0.13.0 // indirect
8080
github.com/go-kit/log v0.2.1 // indirect
8181
github.com/go-logfmt/logfmt v0.6.1 // indirect

client/v2/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
120120
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
121121
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
122122
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
123-
github.com/cockroachdb/errors v1.12.0 h1:d7oCs6vuIMUQRVbi6jWWWEJZahLCfJpnJSVobd1/sUo=
124-
github.com/cockroachdb/errors v1.12.0/go.mod h1:SvzfYNNBshAVbZ8wzNc/UPK3w1vf0dKDUP41ucAIf7g=
123+
github.com/cockroachdb/errors v1.13.0 h1:BoCcJeiP9hpBJDETkX19qi8Tb8So37srSsp3stTaDMQ=
124+
github.com/cockroachdb/errors v1.13.0/go.mod h1:bjxt/4E5+OyuAnacpTIU9rn2mzPu1VlthvHP+xpROq0=
125125
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 h1:pU88SPhIFid6/k0egdR5V6eALQYq2qbSmukrkgIh/0A=
126126
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
127127
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILMqgNeV5jiqR4j+sTuvQNHdf2chuKj1M5k=
@@ -238,8 +238,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
238238
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
239239
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
240240
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
241-
github.com/getsentry/sentry-go v0.44.1 h1:/cPtrA5qB7uMRrhgSn9TYtcEF36auGP3Y6+ThvD/yaI=
242-
github.com/getsentry/sentry-go v0.44.1/go.mod h1:XDotiNZbgf5U8bPDUAfvcFmOnMQQceESxyKaObSssW0=
241+
github.com/getsentry/sentry-go v0.46.0 h1:mbdDaarbUdOt9X+dx6kDdntkShLEX3/+KyOsVDTPDj0=
242+
github.com/getsentry/sentry-go v0.46.0/go.mod h1:evVbw2qotNUdYG8KxXbAdjOQWWvWIwKxpjdZZIvcIPw=
243243
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
244244
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
245245
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=

tests/e2e/distribution/withdraw_all_suite.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ func (s *WithdrawAllTestSuite) TestNewWithdrawAllRewardsGenerateOnly() {
7777
)
7878
require.NoError(err)
7979
require.NoError(s.network.WaitForNextBlock())
80+
// Ensure the funded account is committed before delegate uses it (CI timing).
81+
require.NoError(s.network.WaitForNextBlock())
8082

8183
// delegate 500 tokens to validator1
8284
args := []string{

tests/e2e/tx/service_test.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,23 @@ func (s *E2ETestSuite) TestQueryBySig() {
139139
// encode, format, query
140140
b64Sig := base64.StdEncoding.EncodeToString(sig.Signature)
141141
sigFormatted := fmt.Sprintf("%s.%s='%s'", sdk.EventTypeTx, sdk.AttributeKeySignature, b64Sig)
142-
res, err := s.queryClient.GetTxsEvent(context.Background(), &tx.GetTxsEventRequest{
143-
Query: sigFormatted,
144-
OrderBy: 0,
145-
Page: 0,
146-
Limit: 10,
147-
})
142+
var res *tx.GetTxsEventResponse
143+
err = s.network.RetryForBlocks(func() error {
144+
var inner error
145+
res, inner = s.queryClient.GetTxsEvent(context.Background(), &tx.GetTxsEventRequest{
146+
Query: sigFormatted,
147+
OrderBy: 0,
148+
Page: 0,
149+
Limit: 10,
150+
})
151+
if inner != nil {
152+
return inner
153+
}
154+
if len(res.Txs) == 0 {
155+
return fmt.Errorf("tx not indexed yet for signature query")
156+
}
157+
return nil
158+
}, 10)
148159
s.Require().NoError(err)
149160
s.Require().Len(res.Txs, 1)
150161
s.Require().Len(res.Txs[0].Signatures, 1)

0 commit comments

Comments
 (0)