Skip to content

Commit cccee9e

Browse files
committed
fix tests, verify bench command
1 parent 026a32a commit cccee9e

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

v2/cmd/gen/gen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ func treeCommand() *cobra.Command {
144144
cmd := &cobra.Command{
145145
Use: "tree",
146146
Short: "build and save a Tree to disk, taking generated changesets as input",
147-
RunE: func(cmd *cobra.Command, args []string) error {
148-
multiTree := iavl.NewMultiTree(iavl.NewTestLogger(), dbPath, iavl.TreeOptions{StateStorage: true})
147+
RunE: func(_ *cobra.Command, _ []string) error {
148+
multiTree := iavl.NewMultiTree(iavl.NewDebugLogger(), dbPath, iavl.DefaultTreeOptions())
149149
defer func(mt *iavl.MultiTree) {
150150
err := mt.Close()
151151
if err != nil {

v2/cmd/root.go

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"github.com/cosmos/iavl/v2/cmd/bench"
45
"github.com/cosmos/iavl/v2/cmd/gen"
56
"github.com/cosmos/iavl/v2/cmd/rollback"
67
"github.com/cosmos/iavl/v2/cmd/scan"
@@ -19,6 +20,7 @@ func RootCommand() (*cobra.Command, error) {
1920
rollback.Command(),
2021
scan.Command(),
2122
latestCommand(),
23+
bench.Command(),
2224
)
2325
return cmd, nil
2426
}

v2/logger.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package iavl
22

3-
import "log/slog"
3+
import (
4+
"log/slog"
5+
"os"
6+
)
47

58
// Logger defines basic logger that IAVL expects.
69
// It is a subset of the cosmossdk.io/core/log.Logger interface.
@@ -39,6 +42,10 @@ func NewTestLogger() Logger {
3942
return &testLogger{}
4043
}
4144

45+
func NewDebugLogger() Logger {
46+
return slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
47+
}
48+
4249
type testLogger struct{}
4350

4451
func (l *testLogger) Info(msg string, keys ...any) {

v2/multitree.go

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ func (mt *MultiTree) newTree(dbPath string) (*Tree, error) {
129129
sql, err := NewSqliteDb(pool, defaultSqliteDbOptions(SqliteDbOptions{
130130
Path: dbPath,
131131
Metrics: opts.MetricsProxy,
132+
Logger: mt.logger,
132133
}))
133134
if err != nil {
134135
return nil, err

v2/tree_test.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import (
44
"crypto/sha256"
55
"encoding/hex"
66
"fmt"
7-
"log/slog"
8-
"os"
97
"sort"
108
"testing"
119
"time"
@@ -313,8 +311,7 @@ func Test_Prune_Logic(t *testing.T) {
313311

314312
pool := NewNodePool()
315313
tmpDir := t.TempDir()
316-
logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
317-
sql, err := NewSqliteDb(pool, SqliteDbOptions{Path: tmpDir, ShardTrees: false, Logger: logger})
314+
sql, err := NewSqliteDb(pool, SqliteDbOptions{Path: tmpDir, ShardTrees: false, Logger: NewDebugLogger()})
318315
require.NoError(t, err)
319316
treeOpts := DefaultTreeOptions()
320317
treeOpts.CheckpointInterval = 100

0 commit comments

Comments
 (0)