Merge pull request cosmos#77 from tendermint/bucky/update-for-tm0.22

remove tmlibs. use tendermint/libs and tendermint/crypto/tmhash

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.8.2
+
+* Swap `tmlibs` for `tendermint/libs`
+* Remove `sha256truncated` in favour of `tendermint/crypto/tmhash` - same hash
+  function but technically a breaking change to the API, though unlikely to effect anyone.
+
+NOTE this means IAVL is now dependent on Tendermint Core for the libs (since it
+makes heavy use of the `db` package). Ideally, that dependency would be
+abstracted away, and/or this repo will be merged into the Cosmos-SDK, which is
+currently is primary consumer. Once it achieves greater stability, we could
+consider breaking it out into it's own repo again.
+
 ## 0.8.1
 
 *July 1st, 2018*

Gopkg.toml

@@ -3,12 +3,12 @@
   version = "1.1.4"
 
 [[constraint]]
-  version = "0.10.1"
+  version = "=0.10.1"
   name = "github.com/tendermint/go-amino"
 
 [[constraint]]
-  version = "0.9.0-rc1"
-  name = "github.com/tendermint/tmlibs"
+  version = "=0.22.0-rc2"
+  name = "github.com/tendermint/tendermint"
 
 [prune]
   go-tests = true

basic_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tmlibs/db"
+	"github.com/tendermint/tendermint/libs/db"
 )
 
 func TestBasic(t *testing.T) {

benchmarks/bench_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/tendermint/iavl"
-	db "github.com/tendermint/tmlibs/db"
+	db "github.com/tendermint/tendermint/libs/db"
 )
 
 const historySize = 20

doc.go

@@ -1,7 +1,7 @@
 // Basic usage of VersionedTree.
 //
 //  import "github.com/tendermint/iavl"
-//  import "github.com/tendermint/tmlibs/db"
+//  import "github.com/tendermint/tendermint/libs/db"
 //  ...
 //
 //  tree := iavl.NewVersionedTree(db.NewMemDB(), 128)

node.go

@@ -9,8 +9,8 @@ import (
 	"io"
 
 	"github.com/tendermint/go-amino"
-	"github.com/tendermint/iavl/sha256truncated"
-	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/crypto/tmhash"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 // Node represents a node in a Tree.
@@ -199,7 +199,7 @@ func (node *Node) _hash() []byte {
 		return node.hash
 	}
 
-	h := sha256truncated.New()
+	h := tmhash.New()
 	buf := new(bytes.Buffer)
 	if err := node.writeHashBytes(buf); err != nil {
 		panic(err)
@@ -217,7 +217,7 @@ func (node *Node) hashWithCount() ([]byte, int64) {
 		return node.hash, 0
 	}
 
-	h := sha256truncated.New()
+	h := tmhash.New()
 	buf := new(bytes.Buffer)
 	hashCount, err := node.writeHashBytesRecursively(buf)
 	if err != nil {
@@ -254,7 +254,7 @@ func (node *Node) writeHashBytes(w io.Writer) cmn.Error {
 		}
 		// Indirection needed to provide proofs without values.
 		// (e.g. proofLeafNode.ValueHash)
-		valueHash := sha256truncated.Hash(node.value)
+		valueHash := tmhash.Sum(node.value)
 		err = amino.EncodeByteSlice(w, valueHash)
 		if err != nil {
 			return cmn.ErrorWrap(err, "writing value")

nodedb.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"sync"
 
-	dbm "github.com/tendermint/tmlibs/db"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 var (

proof.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/tendermint/go-amino"
-	"github.com/tendermint/iavl/sha256truncated"
-	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/crypto/tmhash"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 var (
@@ -54,7 +54,7 @@ func (pin proofInnerNode) StringIndented(indent string) string {
 }
 
 func (pin proofInnerNode) Hash(childHash []byte) []byte {
-	hasher := sha256truncated.New()
+	hasher := tmhash.New()
 	buf := new(bytes.Buffer)
 
 	err := amino.EncodeInt8(buf, pin.Height)
@@ -113,7 +113,7 @@ func (pln proofLeafNode) StringIndented(indent string) string {
 }
 
 func (pln proofLeafNode) Hash() []byte {
-	hasher := sha256truncated.New()
+	hasher := tmhash.New()
 	buf := new(bytes.Buffer)
 
 	err := amino.EncodeInt8(buf, 0)

proof_path.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 // pathWithLeaf is a path to a leaf node and the leaf node itself.

proof_range.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/tendermint/iavl/sha256truncated"
-	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/crypto/tmhash"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 type RangeProof struct {
@@ -63,7 +63,7 @@ func (proof *RangeProof) VerifyItem(i int, key, value []byte) error {
 	if !bytes.Equal(proof.Leaves[i].Key, key) {
 		return cmn.ErrorWrap(ErrInvalidProof, "leaf key not same")
 	}
-	valueHash := sha256truncated.Hash(value)
+	valueHash := tmhash.Sum(value)
 	if !bytes.Equal(proof.Leaves[i].ValueHash, valueHash) {
 		return cmn.ErrorWrap(ErrInvalidProof, "leaf value hash not same")
 	}
@@ -256,7 +256,7 @@ func (t *Tree) getRangeProof(keyStart, keyEnd []byte, limit int) (proof *RangePr
 	values = append(values, left.value)
 	var leaves = []proofLeafNode{proofLeafNode{
 		Key:       left.key,
-		ValueHash: sha256truncated.Hash(left.value),
+		ValueHash: tmhash.Sum(left.value),
 		Version:   left.version,
 	}}
 
@@ -328,7 +328,7 @@ func (t *Tree) getRangeProof(keyStart, keyEnd []byte, limit int) (proof *RangePr
 				// Append leaf to leaves.
 				leaves = append(leaves, proofLeafNode{
 					Key:       node.key,
-					ValueHash: sha256truncated.Hash(node.value),
+					ValueHash: tmhash.Sum(node.value),
 					Version:   node.version,
 				})
 				// Append value to values.

proof_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/tendermint/go-amino"
-	"github.com/tendermint/tmlibs/test"
+	"github.com/tendermint/tendermint/libs/test"
 )
 
 func TestTreeGetWithProof(t *testing.T) {

testutils_test.go

@@ -9,8 +9,8 @@ import (
 	mrand "math/rand"
 
 	"github.com/tendermint/go-amino"
-	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tmlibs/db"
+	cmn "github.com/tendermint/tendermint/libs/common"
+	"github.com/tendermint/tendermint/libs/db"
 )
 
 func dummyPathToLeaf(t *Tree, key []byte) PathToLeaf {

tree.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	dbm "github.com/tendermint/tmlibs/db"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 // Tree is a container for an immutable AVL+ Tree. Changes are performed by

tree_fuzz_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tmlibs/db"
+	cmn "github.com/tendermint/tendermint/libs/common"
+	"github.com/tendermint/tendermint/libs/db"
 )
 
 // This file implement fuzz testing by generating programs and then running

tree_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tmlibs/db"
+	"github.com/tendermint/tendermint/libs/db"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 var testLevelDB bool

version.go

@@ -1,3 +1,3 @@
 package iavl
 
-const Version = "0.8.1"
+const Version = "0.8.2"

versioned_tree.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	cmn "github.com/tendermint/tmlibs/common"
-	dbm "github.com/tendermint/tmlibs/db"
+	cmn "github.com/tendermint/tendermint/libs/common"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 var ErrVersionDoesNotExist = fmt.Errorf("version does not exist")