Browse Source

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

pull/456/head
Ethan Buchman 8 years ago
parent
commit
d5b524e309
6 changed files with 8 additions and 8 deletions
  1. +2
    -2
      rpc/tendermint/client/rpc_test.go
  2. +1
    -1
      types/block.go
  3. +1
    -1
      types/part_set.go
  4. +1
    -1
      types/signable.go
  5. +2
    -2
      types/tx.go
  6. +1
    -1
      types/validator_set.go

+ 2
- 2
rpc/tendermint/client/rpc_test.go View File

@ -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()


+ 1
- 1
types/block.go View File

@ -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"
)


+ 1
- 1
types/part_set.go View File

@ -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"
)


+ 1
- 1
types/signable.go View File

@ -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.


+ 2
- 2
types/tx.go View File

@ -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


+ 1
- 1
types/validator_set.go View File

@ -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"
)


Loading…
Cancel
Save