go-merkle -> merkleeyes/iavl and tmlibs/merkle

rpc/tendermint/client/rpc_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	merkle "github.com/tendermint/go-merkle"
+	"github.com/tendermint/merkleeyes/iavl"
 	merktest "github.com/tendermint/merkleeyes/testutil"
 	"github.com/tendermint/tendermint/rpc/tendermint/client"
 	rpctest "github.com/tendermint/tendermint/rpc/tendermint/test"
@@ -175,7 +175,7 @@ func TestAppCalls(t *testing.T) {
 		// and we got a proof that works!
 		pres, err := c.ABCIQuery("/key", k, true)
 		if assert.Nil(err) && assert.True(pres.Response.Code.IsOK()) {
-			proof, err := merkle.ReadProof(pres.Response.GetProof())
+			proof, err := iavl.ReadProof(pres.Response.GetProof())
 			if assert.Nil(err) {
 				key := pres.Response.GetKey()
 				value := pres.Response.GetValue()

types/block.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/tmlibs/merkle"
 	"github.com/tendermint/go-wire"
 )
 

types/part_set.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/crypto/ripemd160"
 
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/tmlibs/merkle"
 	"github.com/tendermint/go-wire"
 )
 

types/signable.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/tmlibs/merkle"
 )
 
 // Signable is an interface for all signable things.

types/tx.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	abci "github.com/tendermint/abci/types"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/tmlibs/merkle"
 )
 
 type Tx []byte
@@ -22,7 +22,7 @@ type Txs []Tx
 
 func (txs Txs) Hash() []byte {
 	// Recursive impl.
-	// Copied from go-merkle to avoid allocations
+	// Copied from tmlibs/merkle to avoid allocations
 	switch len(txs) {
 	case 0:
 		return nil

types/validator_set.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/tmlibs/merkle"
 	"github.com/tendermint/go-wire"
 )