Skip to content

Commit 2d0697f

Browse files
authored
Merge pull request #2372 from CortexFoundation/dev
new version test format fix
2 parents 0e0de7c + f2f9c73 commit 2d0697f

File tree

9 files changed

+28
-21
lines changed

9 files changed

+28
-21
lines changed

accounts/abi/unpack_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ func TestOOMMaliciousInput(t *testing.T) {
986986
}
987987
encb, err := hex.DecodeString(test.enc)
988988
if err != nil {
989-
t.Fatalf("invalid hex: %s" + test.enc)
989+
t.Fatalf("invalid hex: %s", test.enc)
990990
}
991991
_, err = abi.Methods["method"].Outputs.UnpackValues(encb)
992992
if err == nil {

core/rawdb/accessors_chain_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func TestBlockReceiptStorage(t *testing.T) {
320320
t.Fatalf("no receipts returned")
321321
} else {
322322
if err := checkReceiptsRLP(rs, receipts); err != nil {
323-
t.Fatalf(err.Error())
323+
t.Fatalf("%s", err.Error())
324324
}
325325
}
326326
// Delete the body and ensure that the receipts are no longer returned (metadata can't be recomputed)
@@ -330,7 +330,7 @@ func TestBlockReceiptStorage(t *testing.T) {
330330
}
331331
// Ensure that receipts without metadata can be returned without the block body too
332332
if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil {
333-
t.Fatalf(err.Error())
333+
t.Fatalf("%s", err.Error())
334334
}
335335
// Sanity check that body alone without the receipt is a full purge
336336
WriteBody(db, hash, 0, body)

ctxc/protocol_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestStatusMsgErrors64(t *testing.T) {
8080
},
8181
{
8282
code: ctxc.StatusMsg, data: statusData{64, DefaultConfig.NetworkId, td, head.Hash(), genesis.Hash(), forkid.ID{Hash: [4]byte{0x00, 0x01, 0x02, 0x03}}},
83-
wantError: errResp(ErrForkIDRejected, forkid.ErrLocalIncompatibleOrStale.Error()),
83+
wantError: errResp(ErrForkIDRejected, "%s", forkid.ErrLocalIncompatibleOrStale.Error()),
8484
},
8585
}
8686
for i, test := range tests {

go.mod

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/CortexFoundation/CortexTheseus
22

3-
go 1.24.0
4-
5-
toolchain go1.24.3
3+
go 1.24.3
64

75
require (
86
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1
@@ -24,7 +22,7 @@ require (
2422
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
2523
github.com/deckarep/golang-set/v2 v2.8.0
2624
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
27-
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c
25+
github.com/dop251/goja v0.0.0-20250531102226-cb187b08699c
2826
github.com/ethereum/c-kzg-4844 v1.0.3
2927
github.com/ethereum/go-ethereum v1.15.11
3028
github.com/ethereum/go-verkle v0.2.2
@@ -165,7 +163,7 @@ require (
165163
github.com/google/btree v1.1.3 // indirect
166164
github.com/google/flatbuffers v25.2.10+incompatible // indirect
167165
github.com/google/go-querystring v1.1.0 // indirect
168-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
166+
github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e // indirect
169167
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
170168
github.com/huandu/xstrings v1.5.0 // indirect
171169
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
@@ -248,7 +246,7 @@ require (
248246
go.opentelemetry.io/otel v1.36.0 // indirect
249247
go.opentelemetry.io/otel/metric v1.36.0 // indirect
250248
go.opentelemetry.io/otel/trace v1.36.0 // indirect
251-
golang.org/x/exp v0.0.0-20250530174510-65e920069ea6 // indirect
249+
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
252250
golang.org/x/mod v0.24.0 // indirect
253251
golang.org/x/net v0.40.0 // indirect
254252
golang.org/x/term v0.32.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cn
426426
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
427427
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
428428
github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
429-
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c h1:mxWGS0YyquJ/ikZOjSrRjjFIbUqIP9ojyYQ+QZTU3Rg=
430-
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
429+
github.com/dop251/goja v0.0.0-20250531102226-cb187b08699c h1:In87uFQZsuGfjDDNfWnzMVY6JVTwc8XYMl6W2DAmNjk=
430+
github.com/dop251/goja v0.0.0-20250531102226-cb187b08699c/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
431431
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
432432
github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
433433
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -618,8 +618,8 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
618618
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
619619
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
620620
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
621-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a h1:rDA3FfmxwXR+BVKKdz55WwMJ1pD2hJQNW31d+l3mPk4=
622-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
621+
github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e h1:FJta/0WsADCe1r9vQjdHbd3KuiLPu7Y9WlyLGwMUNyE=
622+
github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
623623
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
624624
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
625625
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -1372,8 +1372,8 @@ golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE
13721372
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
13731373
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
13741374
golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
1375-
golang.org/x/exp v0.0.0-20250530174510-65e920069ea6 h1:gllJVKwONftmCc4KlNbN8o/LvmbxotqQy6zzi6yDQOQ=
1376-
golang.org/x/exp v0.0.0-20250530174510-65e920069ea6/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
1375+
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA=
1376+
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
13771377
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
13781378
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
13791379
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=

metrics/json_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestRegistryMarshallJSON(t *testing.T) {
1313
r.Register("counter", NewCounter())
1414
enc.Encode(r)
1515
if s := b.String(); s != "{\"counter\":{\"count\":0}}\n" {
16-
t.Fatalf(s)
16+
t.Fatalf("%s", s)
1717
}
1818
}
1919

vendor/github.com/dop251/goja/compiler.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dop251/goja/compiler_expr.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ github.com/dgraph-io/ristretto/v2/z/simd
522522
## explicit; go 1.13
523523
github.com/dlclark/regexp2
524524
github.com/dlclark/regexp2/syntax
525-
# github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c
525+
# github.com/dop251/goja v0.0.0-20250531102226-cb187b08699c
526526
## explicit; go 1.20
527527
github.com/dop251/goja
528528
github.com/dop251/goja/ast
@@ -651,7 +651,7 @@ github.com/google/go-querystring/query
651651
## explicit; go 1.12
652652
github.com/google/gofuzz
653653
github.com/google/gofuzz/bytesource
654-
# github.com/google/pprof v0.0.0-20250501235452-c0086092b71a
654+
# github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e
655655
## explicit; go 1.23.0
656656
github.com/google/pprof/profile
657657
# github.com/google/uuid v1.6.0
@@ -1198,7 +1198,7 @@ golang.org/x/crypto/ripemd160
11981198
golang.org/x/crypto/scrypt
11991199
golang.org/x/crypto/sha3
12001200
golang.org/x/crypto/ssh/terminal
1201-
# golang.org/x/exp v0.0.0-20250530174510-65e920069ea6
1201+
# golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b
12021202
## explicit; go 1.23.0
12031203
golang.org/x/exp/constraints
12041204
golang.org/x/exp/rand

0 commit comments

Comments
 (0)