Merge remote-tracking branch 'origin/develop' into dev/refactor_crypto

This commit is contained in:
ValarDragon
2018-07-18 08:51:00 -07:00
34 changed files with 16733 additions and 344 deletions

View File

@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
abci "github.com/tendermint/tendermint/abci/types"
crypto "github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
"github.com/tendermint/tendermint/crypto/secp256k1"
)