updates for latest tmlibs

benchmarks/bench_test.go

@@ -143,7 +143,7 @@ func BenchmarkRandomBytes(b *testing.B) {
 }
 
 type benchmark struct {
-	dbType              string
+	dbType              db.DBBackendType
 	initSize, blockSize int
 	keyLen, dataLen     int
 }

glide.yaml

@@ -1,9 +1,9 @@
 package: github.com/tendermint/iavl
 import:
 - package: github.com/tendermint/go-wire
-  version: develop
+  version: master
 - package: github.com/tendermint/tmlibs
-  version: sdk2
+  version: develop
 - package: golang.org/x/crypto
   subpackages:
   - ripemd160

nodedb.go

@@ -76,7 +76,7 @@ func (ndb *nodeDB) GetNode(hash []byte) *Node {
 	// Doesn't exist, load.
 	buf := ndb.db.Get(ndb.nodeKey(hash))
 	if buf == nil {
-		panic(fmt.Sprintf("Value missing for key %x", hash))
+		panic(fmt.Sprintf("Value missing for hash %x corresponding to nodeKey %s", hash, ndb.nodeKey(hash)))
 	}
 
 	node, err := MakeNode(buf)
@@ -301,7 +301,7 @@ func (ndb *nodeDB) traverse(fn func(key, value []byte)) {
 
 // Traverse all keys with a certain prefix.
 func (ndb *nodeDB) traversePrefix(prefix []byte, fn func(k, v []byte)) {
-	itr := ndb.db.Iterator(nil, nil)
+	itr := dbm.IteratePrefix(ndb.db, prefix)
 	defer itr.Close()
 
 	for ; itr.Valid(); itr.Next() {

testutils_test.go

@@ -68,7 +68,7 @@ func N(l, r interface{}) *Node {
 
 // Setup a deep node
 func T(n *Node) *Tree {
-	d := db.NewDB("test", db.MemDBBackendStr, "")
+	d := db.NewDB("test", db.MemDBBackend, "")
 	t := NewTree(d, 0)
 
 	n.hashWithCount()
@@ -147,7 +147,7 @@ func testProof(t *testing.T, proof *KeyExistsProof, keyBytes, valueBytes, rootHa
 }
 
 func BenchmarkImmutableAvlTreeMemDB(b *testing.B) {
-	db := db.NewDB("test", db.MemDBBackendStr, "")
+	db := db.NewDB("test", db.MemDBBackend, "")
 	benchmarkImmutableAvlTreeWithDB(b, db)
 }
 

versioned_tree.go

@@ -91,6 +91,7 @@ func (tree *VersionedTree) LoadVersion(targetVersion int64) error {
 	// Load all roots from the database.
 	latestVersion := int64(0)
 	for version, root := range roots {
+		fmt.Printf("ROOTS %d %x\n", version, root)
 
 		// Construct a tree manually.
 		t := &Tree{}