fixes

cosmos · Jun 11, 2024 · ad72436 · ad72436
1 parent 2832657
commit ad72436
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/cmd/go.mod b/cmd/go.mod
@@ -3,13 +3,13 @@ module github.com/cosmos/iavl/cmd
 go 1.21
 
 require (
+	cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b
 	cosmossdk.io/log v1.3.2-0.20240514205955-97c9bbb0341b
 	github.com/cosmos/cosmos-db v1.0.2
 	github.com/cosmos/iavl v1.2.0
 )
 
 require (
-	cosmossdk.io/core v0.12.1-0.20240514205955-97c9bbb0341b // indirect
 	github.com/DataDog/zstd v1.4.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

diff --git a/cmd/go.sum b/cmd/go.sum
@@ -380,8 +380,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

diff --git a/cmd/iaviewer/main.go b/cmd/iaviewer/main.go
@@ -122,7 +122,7 @@ func ReadTree(dir string, version int, prefix []byte) (*iavl.MutableTree, error)
 		db = dbm.NewPrefixDB(db, prefix)
 	}
 
-	tree := iavl.NewMutableTree(NewWrapper(db), DefaultCacheSize, false, log.NewLogger(os.Stdout))
+	tree := iavl.NewMutableTree(newWrapper(db), DefaultCacheSize, false, log.NewLogger(os.Stdout))
 	ver, err := tree.LoadVersion(int64(version))
 	fmt.Printf("Got version: %d\n", ver)
 	return tree, err

diff --git a/cmd/iaviewer/wrapper.go b/cmd/iaviewer/wrapper.go
@@ -10,8 +10,8 @@ type Wrapper struct {
 	dbm.DB
 }
 
-// NewWrapper returns a new Wrapper.
-func NewWrapper(db dbm.DB) *Wrapper {
+// newWrapper returns a new Wrapper.
+func newWrapper(db dbm.DB) *Wrapper {
 	return &Wrapper{DB: db}
 }
 
@@ -34,12 +34,3 @@ func (db *Wrapper) NewBatch() corestore.Batch {
 func (db *Wrapper) NewBatchWithSize(size int) corestore.Batch {
 	return db.DB.NewBatchWithSize(size)
 }
-
-// NewDB returns a new Wrapper.
-func NewDB(name, backendType, dir string) (*Wrapper, error) {
-	db, err := dbm.NewDB(name, dbm.BackendType(backendType), dir)
-	if err != nil {
-		return nil, err
-	}
-	return NewWrapper(db), nil
-}