Change types for IAVL refactor, fix rootMultiStore test helper

Gopkg.toml

@@ -53,7 +53,7 @@
 
 [[override]]
   name = "github.com/tendermint/iavl"
-  version = "=v0.9.2"
+  revision = "3d7299fe3f92617b0191bb4767fcbf6d90caab21"
 
 [[override]]
   name = "github.com/tendermint/tendermint"

store/iavlstore.go

@@ -20,7 +20,7 @@ const (
 
 // load the iavl store
 func LoadIAVLStore(db dbm.DB, id CommitID, pruning sdk.PruningStrategy) (CommitStore, error) {
-	tree := iavl.NewVersionedTree(db, defaultIAVLCacheSize)
+	tree := iavl.NewMutableTree(db, defaultIAVLCacheSize)
 	_, err := tree.LoadVersion(id.Version)
 	if err != nil {
 		return nil, err
@@ -40,7 +40,7 @@ var _ Queryable = (*iavlStore)(nil)
 type iavlStore struct {
 
 	// The underlying tree.
-	tree *iavl.VersionedTree
+	tree *iavl.MutableTree
 
 	// How many old versions we hold onto.
 	// A value of 0 means keep no recent states.
@@ -56,7 +56,7 @@ type iavlStore struct {
 }
 
 // CONTRACT: tree should be fully loaded.
-func newIAVLStore(tree *iavl.VersionedTree, numRecent int64, storeEvery int64) *iavlStore {
+func newIAVLStore(tree *iavl.MutableTree, numRecent int64, storeEvery int64) *iavlStore {
 	st := &iavlStore{
 		tree:       tree,
 		numRecent:  numRecent,
@@ -167,16 +167,16 @@ func (st *iavlStore) Gas(meter GasMeter, config GasConfig) KVStore {
 
 // Implements KVStore.
 func (st *iavlStore) Iterator(start, end []byte) Iterator {
-	return newIAVLIterator(st.tree.Tree(), start, end, true)
+	return newIAVLIterator(st.tree.ImmutableTree, start, end, true)
 }
 
 // Implements KVStore.
 func (st *iavlStore) ReverseIterator(start, end []byte) Iterator {
-	return newIAVLIterator(st.tree.Tree(), start, end, false)
+	return newIAVLIterator(st.tree.ImmutableTree, start, end, false)
 }
 
 // Handle gatest the latest height, if height is 0
-func getHeight(tree *iavl.VersionedTree, req abci.RequestQuery) int64 {
+func getHeight(tree *iavl.MutableTree, req abci.RequestQuery) int64 {
 	height := req.Height
 	if height == 0 {
 		latest := tree.Version64()
@@ -255,7 +255,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 // Implements Iterator.
 type iavlIterator struct {
 	// Underlying store
-	tree *iavl.Tree
+	tree *iavl.ImmutableTree
 
 	// Domain
 	start, end []byte
@@ -286,7 +286,7 @@ var _ Iterator = (*iavlIterator)(nil)
 // newIAVLIterator will create a new iavlIterator.
 // CONTRACT: Caller must release the iavlIterator, as each one creates a new
 // goroutine.
-func newIAVLIterator(tree *iavl.Tree, start, end []byte, ascending bool) *iavlIterator {
+func newIAVLIterator(tree *iavl.ImmutableTree, start, end []byte, ascending bool) *iavlIterator {
 	iter := &iavlIterator{
 		tree:      tree,
 		start:     cp(start),

store/iavlstore_test.go

@@ -29,8 +29,8 @@ var (
 )
 
 // make a tree and save it
-func newTree(t *testing.T, db dbm.DB) (*iavl.VersionedTree, CommitID) {
-	tree := iavl.NewVersionedTree(db, cacheSize)
+func newTree(t *testing.T, db dbm.DB) (*iavl.MutableTree, CommitID) {
+	tree := iavl.NewMutableTree(db, cacheSize)
 	for k, v := range treeData {
 		tree.Set([]byte(k), []byte(v))
 	}
@@ -322,7 +322,7 @@ type pruneState struct {
 
 func testPruning(t *testing.T, numRecent int64, storeEvery int64, states []pruneState) {
 	db := dbm.NewMemDB()
-	tree := iavl.NewVersionedTree(db, cacheSize)
+	tree := iavl.NewMutableTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, numRecent, storeEvery)
 	for step, state := range states {
 		for _, ver := range state.stored {
@@ -341,7 +341,7 @@ func testPruning(t *testing.T, numRecent int64, storeEvery int64, states []prune
 
 func TestIAVLNoPrune(t *testing.T) {
 	db := dbm.NewMemDB()
-	tree := iavl.NewVersionedTree(db, cacheSize)
+	tree := iavl.NewMutableTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, numRecent, int64(1))
 	nextVersion(iavlStore)
 	for i := 1; i < 100; i++ {
@@ -356,7 +356,7 @@ func TestIAVLNoPrune(t *testing.T) {
 
 func TestIAVLPruneEverything(t *testing.T) {
 	db := dbm.NewMemDB()
-	tree := iavl.NewVersionedTree(db, cacheSize)
+	tree := iavl.NewMutableTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, int64(0), int64(0))
 	nextVersion(iavlStore)
 	for i := 1; i < 100; i++ {
@@ -374,7 +374,7 @@ func TestIAVLPruneEverything(t *testing.T) {
 
 func TestIAVLStoreQuery(t *testing.T) {
 	db := dbm.NewMemDB()
-	tree := iavl.NewVersionedTree(db, cacheSize)
+	tree := iavl.NewMutableTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, numRecent, storeEvery)
 
 	k1, v1 := []byte("key1"), []byte("val1")

store/prefixstore_test.go

@@ -66,7 +66,7 @@ func testPrefixStore(t *testing.T, baseStore KVStore, prefix []byte) {
 
 func TestIAVLStorePrefix(t *testing.T) {
 	db := dbm.NewMemDB()
-	tree := iavl.NewVersionedTree(db, cacheSize)
+	tree := iavl.NewMutableTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, numRecent, storeEvery)
 
 	testPrefixStore(t, iavlStore, []byte("test"))