From c96b27136f5f41f571c7f9f22205045c85b91f15 Mon Sep 17 00:00:00 2001 From: Liamsi Date: Wed, 20 Jun 2018 21:05:38 -0700 Subject: [PATCH] remove go-crypto from go-crypto: use tendermint/crypto :-) --- crypto/merkle/simple_map.go | 2 +- crypto/merkle/simple_map_test.go | 2 +- crypto/merkle/simple_tree.go | 2 +- crypto/merkle/simple_tree_test.go | 2 +- crypto/pub_key.go | 2 +- crypto/tmhash/hash_test.go | 2 +- types/heartbeat_test.go | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/crypto/merkle/simple_map.go b/crypto/merkle/simple_map.go index 24863267b..86a9bad9c 100644 --- a/crypto/merkle/simple_map.go +++ b/crypto/merkle/simple_map.go @@ -1,7 +1,7 @@ package merkle import ( - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/crypto/merkle/simple_map_test.go b/crypto/merkle/simple_map_test.go index d9d635115..34febcf16 100644 --- a/crypto/merkle/simple_map_test.go +++ b/crypto/merkle/simple_map_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" ) type strHasher string diff --git a/crypto/merkle/simple_tree.go b/crypto/merkle/simple_tree.go index c23f84264..35a6eaa7c 100644 --- a/crypto/merkle/simple_tree.go +++ b/crypto/merkle/simple_tree.go @@ -1,7 +1,7 @@ package merkle import ( - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" ) // SimpleHashFromTwoHashes is the basic operation of the Merkle tree: Hash(left | right). diff --git a/crypto/merkle/simple_tree_test.go b/crypto/merkle/simple_tree_test.go index db8e3d7ff..a721bccea 100644 --- a/crypto/merkle/simple_tree_test.go +++ b/crypto/merkle/simple_tree_test.go @@ -7,7 +7,7 @@ import ( . "github.com/tendermint/tmlibs/test" "testing" - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" ) type testItem []byte diff --git a/crypto/pub_key.go b/crypto/pub_key.go index c509ff8de..51ef6c54e 100644 --- a/crypto/pub_key.go +++ b/crypto/pub_key.go @@ -14,7 +14,7 @@ import ( cmn "github.com/tendermint/tmlibs/common" - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" ) // An address is a []byte, but hex-encoded even in JSON. diff --git a/crypto/tmhash/hash_test.go b/crypto/tmhash/hash_test.go index abf0247ab..27938039a 100644 --- a/crypto/tmhash/hash_test.go +++ b/crypto/tmhash/hash_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tendermint/go-crypto/tmhash" + "github.com/tendermint/tendermint/crypto/tmhash" ) func TestHash(t *testing.T) { diff --git a/types/heartbeat_test.go b/types/heartbeat_test.go index de56e2d2e..174c3ba97 100644 --- a/types/heartbeat_test.go +++ b/types/heartbeat_test.go @@ -31,7 +31,6 @@ func TestHeartbeatString(t *testing.T) { sig, err := key.Sign([]byte("Tendermint")) require.NoError(t, err) hb.Signature = sig - require.Equal(t, hb.String(), "Heartbeat{1:000000000000 11/02 (0) /FF41E371B9BF.../}") }