update for latest tmlibs

store/cachekvstore_test.go

@@ -1,6 +1,7 @@
 package store
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -95,7 +96,7 @@ func TestCacheKVIteratorBounds(t *testing.T) {
 	}
 
 	// iterate over all of them
-	itr := st.Iterator(dbm.BeginningKey(), dbm.EndingKey())
+	itr := st.Iterator(nil, nil)
 	var i = 0
 	for ; itr.Valid(); itr.Next() {
 		k, v := itr.Key(), itr.Value()
@@ -106,9 +107,10 @@ func TestCacheKVIteratorBounds(t *testing.T) {
 	assert.Equal(t, nItems, i)
 
 	// iterate over none
-	itr = st.Iterator(bz("money"), dbm.EndingKey())
+	itr = st.Iterator(bz("money"), nil)
 	i = 0
 	for ; itr.Valid(); itr.Next() {
+		fmt.Println(string(itr.Key()))
 		i += 1
 	}
 	assert.Equal(t, 0, i)
@@ -221,7 +223,7 @@ func TestCacheKVMergeIterator(t *testing.T) {
 
 // iterate over whole domain
 func assertIterateDomain(t *testing.T, st KVStore, expectedN int) {
-	itr := st.Iterator(dbm.BeginningKey(), dbm.EndingKey())
+	itr := st.Iterator(nil, nil)
 	var i = 0
 	for ; itr.Valid(); itr.Next() {
 		k, v := itr.Key(), itr.Value()

store/memiterator.go

@@ -1,6 +1,8 @@
 package store
 
-import dbm "github.com/tendermint/tmlibs/db"
+import (
+	dbm "github.com/tendermint/tmlibs/db"
+)
 
 // Iterates over iterKVCache items.
 // if key is nil, means it was deleted.
@@ -13,7 +15,7 @@ type memIterator struct {
 func newMemIterator(start, end []byte, items []KVPair) *memIterator {
 	itemsInDomain := make([]KVPair, 0)
 	for _, item := range items {
-		if dbm.IsKeyInDomain(item.Key, start, end) {
+		if dbm.IsKeyInDomain(item.Key, start, end, keyCompare(end, start) < 0) {
 			itemsInDomain = append(itemsInDomain, item)
 		}
 	}

store/types.go

@@ -1,6 +1,8 @@
 package store
 
 import (
+	"bytes"
+
 	"github.com/tendermint/go-wire/data"
 	"github.com/tendermint/tmlibs/db"
 )
@@ -128,3 +130,11 @@ type CommitID struct {
 func (cid CommitID) IsZero() bool {
 	return cid.Version == 0 && len(cid.Hash) == 0
 }
+
+// bytes.Compare but returns 0 if either key is nil
+func keyCompare(k1, k2 []byte) int {
+	if k1 == nil || k2 == nil {
+		return 0
+	}
+	return bytes.Compare(k1, k2)
+}