Refactoring to depend on nodeDB interface

basic_test.go

@@ -20,6 +20,15 @@ func TestBasic(t *testing.T) {
 	if up {
 		t.Error("Did not expect an update (should have been create)")
 	}
+	tree.SaveVersion()
+	tree.SaveVersion()
+	err = tree.DeleteVersion(int64(1))
+	if err != nil{
+		t.Errorf("should lol")
+	}
+	proof, rangeProof, err := tree.GetVersionedWithProof([]byte("1"), int64(1))
+	print(proof)
+	print(rangeProof)
 	up = tree.Set([]byte("2"), []byte("two"))
 	if up {
 		t.Error("Did not expect an update (should have been create)")
@@ -423,23 +432,23 @@ func TestIterateRange(t *testing.T) {
 
 func TestPersistence(t *testing.T) {
 	db := db.NewMemDB()
-
+	ndb := NewNodeDb(db, 0, nil)
 	// Create some random key value pairs
 	records := make(map[string]string)
 	for i := 0; i < 10000; i++ {
 		records[randstr(20)] = randstr(20)
 	}
 
 	// Construct some tree and save it
-	t1, err := NewMutableTree(db, 0)
+	t1, err := NewMutableTree(ndb)
 	require.NoError(t, err)
 	for key, value := range records {
 		t1.Set([]byte(key), []byte(value))
 	}
 	t1.SaveVersion()
 
 	// Load a tree
-	t2, err := NewMutableTree(db, 0)
+	t2, err := NewMutableTree(ndb)
 	require.NoError(t, err)
 	t2.Load()
 	for key, value := range records {
@@ -483,7 +492,8 @@ func TestProof(t *testing.T) {
 
 func TestTreeProof(t *testing.T) {
 	db := db.NewMemDB()
-	tree, err := NewMutableTree(db, 100)
+	ndb := NewNodeDb(db, 100, nil)
+	tree, err := NewMutableTree(ndb)
 	require.NoError(t, err)
 	assert.Equal(t, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", hex.EncodeToString(tree.Hash()))
 

benchmarks/bench_test.go

@@ -25,7 +25,8 @@ func randBytes(length int) []byte {
 }
 
 func prepareTree(b *testing.B, db db.DB, size, keyLen, dataLen int) (*iavl.MutableTree, [][]byte) {
-	t, err := iavl.NewMutableTreeWithOpts(db, size, nil)
+	ndb := iavl.NewNodeDb(db, size, nil)
+	t, err := iavl.NewMutableTreeWithOpts(ndb)
 	require.NoError(b, err)
 	keys := make([][]byte, size)
 

benchmarks/cosmos-exim/main.go

@@ -91,7 +91,8 @@ func runExport(dbPath string) (int64, map[string][]*iavl.ExportNode, error) {
 	if err != nil {
 		return 0, nil, err
 	}
-	tree, err := iavl.NewMutableTree(tmdb.NewPrefixDB(ldb, []byte("s/k:main/")), 0)
+	ndb := iavl.NewNodeDb(tmdb.NewPrefixDB(ldb, []byte("s/k:main/")), 0, nil)
+	tree, err := iavl.NewMutableTree(ndb)
 	if err != nil {
 		return 0, nil, err
 	}
@@ -106,7 +107,8 @@ func runExport(dbPath string) (int64, map[string][]*iavl.ExportNode, error) {
 	totalStats := Stats{}
 	for _, name := range stores {
 		db := tmdb.NewPrefixDB(ldb, []byte("s/k:"+name+"/"))
-		tree, err := iavl.NewMutableTree(db, 0)
+		ndb := iavl.NewNodeDb(db, 0, nil)
+		tree, err := iavl.NewMutableTree(ndb)
 		if err != nil {
 			return 0, nil, err
 		}
@@ -171,7 +173,8 @@ func runImport(version int64, exports map[string][]*iavl.ExportNode) error {
 		if err != nil {
 			return err
 		}
-		newTree, err := iavl.NewMutableTree(newDB, 0)
+		ndb := iavl.NewNodeDb(newDB, 0, nil)
+		newTree, err := iavl.NewMutableTree(ndb)
 		if err != nil {
 			return err
 		}

cmd/iaviewer/main.go

@@ -5,11 +5,11 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"github.com/cosmos/iavl"
 	"os"
 	"strconv"
 	"strings"
 
-	"github.com/cosmos/iavl"
 	dbm "github.com/tendermint/tm-db"
 )
 
@@ -112,8 +112,9 @@ func ReadTree(dir string, version int, prefix []byte) (*iavl.MutableTree, error)
 	if len(prefix) != 0 {
 		db = dbm.NewPrefixDB(db, prefix)
 	}
+	ndb := iavl.NewNodeDb(db, DefaultCacheSize, nil)
 
-	tree, err := iavl.NewMutableTree(db, DefaultCacheSize)
+	tree, err := iavl.NewMutableTree(ndb)
 	if err != nil {
 		return nil, err
 	}