Skip to content

Commit 59e2992

Browse files
julienrbrtjulienrbrt
authored
refactor: minimal logger interface (#964)
1 parent a514883 commit 59e2992

24 files changed

Lines changed: 214 additions & 206 deletions

‎basic_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"sort"
88
"testing"
99

10-
"cosmossdk.io/core/log"
1110
"github.com/stretchr/testify/assert"
1211
"github.com/stretchr/testify/require"
1312

@@ -442,14 +441,14 @@ func TestPersistence(t *testing.T) {
442441
}
443442

444443
// Construct some tree and save it
445-
t1 := NewMutableTree(db, 0, false, log.NewNopLogger())
444+
t1 := NewMutableTree(db, 0, false, NewNopLogger())
446445
for key, value := range records {
447446
t1.Set([]byte(key), []byte(value))
448447
}
449448
t1.SaveVersion()
450449

451450
// Load a tree
452-
t2 := NewMutableTree(db, 0, false, log.NewNopLogger())
451+
t2 := NewMutableTree(db, 0, false, NewNopLogger())
453452
t2.Load()
454453
for key, value := range records {
455454
t2value, err := t2.Get([]byte(key))
@@ -497,7 +496,7 @@ func TestProof(t *testing.T) {
497496

498497
func TestTreeProof(t *testing.T) {
499498
db := dbm.NewMemDB()
500-
tree := NewMutableTree(db, 100, false, log.NewNopLogger())
499+
tree := NewMutableTree(db, 100, false, NewNopLogger())
501500
hash := tree.Hash()
502501
assert.Equal(t, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", hex.EncodeToString(hash))
503502

‎benchmarks/bench_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"runtime"
99
"testing"
1010

11-
"cosmossdk.io/core/log"
1211
corestore "cosmossdk.io/core/store"
1312
"github.com/stretchr/testify/require"
1413

@@ -27,7 +26,7 @@ func randBytes(length int) []byte {
2726
}
2827

2928
func prepareTree(b *testing.B, db dbm.DB, size, keyLen, dataLen int) (*iavl.MutableTree, [][]byte) {
30-
t := iavl.NewMutableTree(db, size, false, log.NewNopLogger())
29+
t := iavl.NewMutableTree(db, size, false, iavl.NewNopLogger())
3130
keys := make([][]byte, size)
3231

3332
for i := 0; i < size; i++ {

‎benchmarks/cosmos-exim/main.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"os"
66
"time"
77

8-
"cosmossdk.io/core/log"
9-
108
"github.com/cosmos/iavl"
119
idbm "github.com/cosmos/iavl/db"
1210
)
@@ -92,7 +90,7 @@ func runExport(dbPath string) (int64, map[string][]*iavl.ExportNode, error) {
9290
if err != nil {
9391
return 0, nil, err
9492
}
95-
tree := iavl.NewMutableTree(idbm.NewPrefixDB(ldb, []byte("s/k:main/")), 0, false, log.NewNopLogger())
93+
tree := iavl.NewMutableTree(idbm.NewPrefixDB(ldb, []byte("s/k:main/")), 0, false, iavl.NewNopLogger())
9694
version, err := tree.LoadVersion(0)
9795
if err != nil {
9896
return 0, nil, err
@@ -104,7 +102,7 @@ func runExport(dbPath string) (int64, map[string][]*iavl.ExportNode, error) {
104102
totalStats := Stats{}
105103
for _, name := range stores {
106104
db := idbm.NewPrefixDB(ldb, []byte("s/k:"+name+"/"))
107-
tree := iavl.NewMutableTree(db, 0, false, log.NewNopLogger())
105+
tree := iavl.NewMutableTree(db, 0, false, iavl.NewNopLogger())
108106

109107
stats := Stats{}
110108
export := make([]*iavl.ExportNode, 0, 100000)
@@ -169,7 +167,7 @@ func runImport(version int64, exports map[string][]*iavl.ExportNode) error {
169167
if err != nil {
170168
return err
171169
}
172-
newTree := iavl.NewMutableTree(newDB, 0, false, log.NewNopLogger())
170+
newTree := iavl.NewMutableTree(newDB, 0, false, iavl.NewNopLogger())
173171
importer, err := newTree.Import(version)
174172
if err != nil {
175173
return err

‎cmd/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/cosmos/iavl/cmd
33
go 1.21
44

55
require (
6-
cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b
7-
cosmossdk.io/log v1.3.2-0.20240514205955-97c9bbb0341b
6+
cosmossdk.io/core v0.12.1-0.20240725072823-6a2d039e1212
7+
cosmossdk.io/log v1.3.1
88
github.com/cosmos/cosmos-db v1.0.2
99
github.com/cosmos/iavl v1.2.0
1010
)
@@ -18,7 +18,7 @@ require (
1818
github.com/cockroachdb/pebble v1.1.0 // indirect
1919
github.com/cockroachdb/redact v1.1.5 // indirect
2020
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
21-
github.com/cosmos/gogoproto v1.4.12 // indirect
21+
github.com/cosmos/gogoproto v1.5.0 // indirect
2222
github.com/cosmos/ics23/go v0.10.0 // indirect
2323
github.com/emicklei/dot v1.6.2 // indirect
2424
github.com/getsentry/sentry-go v0.18.0 // indirect
@@ -45,9 +45,9 @@ require (
4545
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
4646
golang.org/x/crypto v0.23.0 // indirect
4747
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
48-
golang.org/x/sys v0.20.0 // indirect
49-
golang.org/x/text v0.15.0 // indirect
50-
google.golang.org/protobuf v1.34.1 // indirect
48+
golang.org/x/sys v0.22.0 // indirect
49+
golang.org/x/text v0.16.0 // indirect
50+
google.golang.org/protobuf v1.34.2 // indirect
5151
)
5252

5353
replace github.com/cosmos/iavl => ../.

‎cmd/go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
3030
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
3131
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3232
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
33-
cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b h1:QudoITEtzaPNGltOQSyMbVopBQ2Z28h717nwLhlj6JU=
34-
cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b/go.mod h1:jJ3gjbqJyHPrTjn2Ad6wjb7Oz90G1ZjDg0JyBii41QE=
35-
cosmossdk.io/log v1.3.2-0.20240514205955-97c9bbb0341b h1:twjCK9N+p+6wEdJ33KRTXgCicmbJGoj47AEOFS0/qsg=
36-
cosmossdk.io/log v1.3.2-0.20240514205955-97c9bbb0341b/go.mod h1:FcxhbFGkwLGFr3NsnSLsfrxjpCdQQ7ow3GaYaw5Zb70=
33+
cosmossdk.io/core v0.12.1-0.20240725072823-6a2d039e1212 h1:yLjl2aq6XMa5Zb1aKfwNHn1U+fFmmAtZyWKNWm/yVH8=
34+
cosmossdk.io/core v0.12.1-0.20240725072823-6a2d039e1212/go.mod h1:sLzMwAW9HW+Nm3GltUVHDRSRZbcXLy9+2AYgi2bwt/s=
35+
cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
36+
cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
3737
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
3838
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3939
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -73,8 +73,8 @@ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:
7373
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
7474
github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAKs=
7575
github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA=
76-
github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8JpFE=
77-
github.com/cosmos/gogoproto v1.4.12/go.mod h1:LnZob1bXRdUoqMMtwYlcR3wjiElmlC+FkjaZRv1/eLY=
76+
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
77+
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
7878
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
7979
github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
8080
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -362,8 +362,8 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R
362362
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
363363
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
364364
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
365-
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
366-
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
365+
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
366+
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
367367
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
368368
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
369369
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -380,8 +380,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
380380
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
381381
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
382382
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
383-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
384-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
383+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
384+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
385385
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
386386
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
387387
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -428,17 +428,17 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
428428
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
429429
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
430430
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
431-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
432-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
431+
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
432+
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
433433
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
434434
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
435435
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
436436
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
437437
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
438438
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
439439
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
440-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
441-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
440+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
441+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
442442
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
443443
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
444444
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -563,8 +563,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
563563
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
564564
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
565565
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
566-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
567-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
566+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
567+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
568568
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
569569
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
570570
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎db/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ func main() {
2323
panic(err)
2424
}
2525

26-
tree := iavl.NewMutableTree(idbm.NewWrapper(dbm.NewPrefixDB(levelDB, []byte("s/k:main/"))), 0, false, log.NewNopLogger())
26+
tree := iavl.NewMutableTree(idbm.NewWrapper(dbm.NewPrefixDB(levelDB, []byte("s/k:main/"))), 0, false, NewNopLogger())
2727
}
2828
```

‎diff_test.go‎

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

11-
"cosmossdk.io/core/log"
1211
"github.com/stretchr/testify/require"
1312

1413
dbm "github.com/cosmos/iavl/db"
@@ -21,7 +20,7 @@ func TestDiffRoundTrip(t *testing.T) {
2120

2221
// apply changeSets to tree
2322
db := dbm.NewMemDB()
24-
tree := NewMutableTree(db, 0, true, log.NewNopLogger())
23+
tree := NewMutableTree(db, 0, true, NewNopLogger())
2524
for i := range changeSets {
2625
v, err := tree.SaveChangeSet(changeSets[i])
2726
require.NoError(t, err)
@@ -30,7 +29,7 @@ func TestDiffRoundTrip(t *testing.T) {
3029

3130
// extract change sets from db
3231
var extractChangeSets []*ChangeSet
33-
tree2 := NewImmutableTree(db, 0, true, log.NewNopLogger())
32+
tree2 := NewImmutableTree(db, 0, true, NewNopLogger())
3433
err := tree2.TraverseStateChanges(0, math.MaxInt64, func(_ int64, changeSet *ChangeSet) error {
3534
extractChangeSets = append(extractChangeSets, changeSet)
3635
return nil

‎export_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"math/rand"
66
"testing"
77

8-
"cosmossdk.io/core/log"
98
"github.com/stretchr/testify/assert"
109
"github.com/stretchr/testify/require"
1110

@@ -15,7 +14,7 @@ import (
1514
// setupExportTreeBasic sets up a basic tree with a handful of
1615
// create/update/delete operations over a few versions.
1716
func setupExportTreeBasic(t require.TestingT) *ImmutableTree {
18-
tree := NewMutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger())
17+
tree := NewMutableTree(dbm.NewMemDB(), 0, false, NewNopLogger())
1918

2019
_, err := tree.Set([]byte("x"), []byte{255})
2120
require.NoError(t, err)
@@ -74,7 +73,7 @@ func setupExportTreeRandom(t *testing.T) *ImmutableTree {
7473
)
7574

7675
r := rand.New(rand.NewSource(randSeed))
77-
tree := NewMutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger())
76+
tree := NewMutableTree(dbm.NewMemDB(), 0, false, NewNopLogger())
7877

7978
var version int64
8079
keys := make([][]byte, 0, versionOps)
@@ -134,7 +133,7 @@ func setupExportTreeSized(t require.TestingT, treeSize int) *ImmutableTree {
134133
)
135134

136135
r := rand.New(rand.NewSource(randSeed))
137-
tree := NewMutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger())
136+
tree := NewMutableTree(dbm.NewMemDB(), 0, false, NewNopLogger())
138137

139138
for i := 0; i < treeSize; i++ {
140139
key := make([]byte, keySize)
@@ -228,7 +227,7 @@ func TestExporterCompress(t *testing.T) {
228227

229228
func TestExporter_Import(t *testing.T) {
230229
testcases := map[string]*ImmutableTree{
231-
"empty tree": NewImmutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger()),
230+
"empty tree": NewImmutableTree(dbm.NewMemDB(), 0, false, NewNopLogger()),
232231
"basic tree": setupExportTreeBasic(t),
233232
}
234233
if !testing.Short() {
@@ -255,7 +254,7 @@ func TestExporter_Import(t *testing.T) {
255254
exporter = NewCompressExporter(innerExporter)
256255
}
257256

258-
newTree := NewMutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger())
257+
newTree := NewMutableTree(dbm.NewMemDB(), 0, false, NewNopLogger())
259258
innerImporter, err := newTree.Import(tree.Version())
260259
require.NoError(t, err)
261260
defer innerImporter.Close()
@@ -323,7 +322,7 @@ func TestExporter_Close(t *testing.T) {
323322
}
324323

325324
func TestExporter_DeleteVersionErrors(t *testing.T) {
326-
tree := NewMutableTree(dbm.NewMemDB(), 0, false, log.NewNopLogger())
325+
tree := NewMutableTree(dbm.NewMemDB(), 0, false, NewNopLogger())
327326

328327
_, err := tree.Set([]byte("a"), []byte{1})
329328
require.NoError(t, err)

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/cosmos/iavl
33
go 1.21
44

55
require (
6-
cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b
6+
cosmossdk.io/core v0.12.1-0.20240725072823-6a2d039e1212
77
github.com/cosmos/ics23/go v0.10.0
88
github.com/emicklei/dot v1.6.2
99
github.com/gogo/protobuf v1.3.2
@@ -14,17 +14,16 @@ require (
1414
)
1515

1616
require (
17-
github.com/cosmos/gogoproto v1.4.12 // indirect
17+
github.com/cosmos/gogoproto v1.5.0 // indirect
1818
github.com/davecgh/go-spew v1.1.1 // indirect
1919
github.com/fsnotify/fsnotify v1.5.4 // indirect
2020
github.com/golang/snappy v0.0.4 // indirect
2121
github.com/google/go-cmp v0.6.0 // indirect
22-
github.com/kr/text v0.2.0 // indirect
2322
github.com/onsi/gomega v1.26.0 // indirect
2423
github.com/pmezard/go-difflib v1.0.0 // indirect
2524
golang.org/x/crypto v0.23.0 // indirect
2625
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
27-
google.golang.org/protobuf v1.34.1 // indirect
26+
google.golang.org/protobuf v1.34.2 // indirect
2827
gopkg.in/yaml.v3 v3.0.1 // indirect
2928
)
3029

0 commit comments

Comments
 (0)