From 9016390a6e4d957b909650dbfa63b81510c3a68d Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 19 Apr 2017 16:55:15 +0200 Subject: [PATCH] Moved crypto code to top level again --- crypto/LICENSE => LICENSE | 0 crypto/Makefile => Makefile | 0 crypto/README.md => README.md | 0 crypto/armor.go => armor.go | 0 crypto/armor_test.go => armor_test.go | 0 {crypto/bcrypt => bcrypt}/base64.go | 0 {crypto/bcrypt => bcrypt}/bcrypt.go | 0 crypto/crypto.go => crypto.go | 0 crypto/embed_test.go => embed_test.go | 0 crypto/encode_test.go => encode_test.go | 0 crypto/glide.yaml => glide.yaml | 0 crypto/hash.go => hash.go | 0 {crypto/hd => hd}/address.go | 0 {crypto/hd => hd}/address_test.go | 0 {crypto/hd => hd}/hd_test.go | 0 {crypto/hd => hd}/test.json | 0 keys/cmd/keys/main.go | 2 +- keys/cmd/root.go | 6 +++--- keys/cmd/serve.go | 2 +- keys/cmd/utils.go | 2 +- keys/cryptostore/enc_storage.go | 2 +- keys/cryptostore/encoder_test.go | 2 +- keys/cryptostore/holder.go | 2 +- keys/cryptostore/holder_test.go | 4 ++-- keys/cryptostore/storage_test.go | 2 +- keys/server/helpers.go | 2 +- keys/server/keys.go | 4 ++-- keys/server/keys_test.go | 10 +++++----- keys/storage/filestorage/main.go | 2 +- keys/storage/filestorage/main_test.go | 2 +- keys/storage/memstorage/main.go | 2 +- keys/storage/memstorage/main_test.go | 2 +- keys/tx/multi_test.go | 6 +++--- keys/tx/one_test.go | 6 +++--- keys/tx/reader.go | 2 +- keys/tx/reader_test.go | 4 ++-- crypto/priv_key.go => priv_key.go | 0 crypto/pub_key.go => pub_key.go | 0 crypto/pub_key_test.go => pub_key_test.go | 0 crypto/random.go => random.go | 0 crypto/signature.go => signature.go | 0 crypto/signature_test.go => signature_test.go | 0 crypto/symmetric.go => symmetric.go | 0 crypto/symmetric_test.go => symmetric_test.go | 0 44 files changed, 33 insertions(+), 33 deletions(-) rename crypto/LICENSE => LICENSE (100%) rename crypto/Makefile => Makefile (100%) rename crypto/README.md => README.md (100%) rename crypto/armor.go => armor.go (100%) rename crypto/armor_test.go => armor_test.go (100%) rename {crypto/bcrypt => bcrypt}/base64.go (100%) rename {crypto/bcrypt => bcrypt}/bcrypt.go (100%) rename crypto/crypto.go => crypto.go (100%) rename crypto/embed_test.go => embed_test.go (100%) rename crypto/encode_test.go => encode_test.go (100%) rename crypto/glide.yaml => glide.yaml (100%) rename crypto/hash.go => hash.go (100%) rename {crypto/hd => hd}/address.go (100%) rename {crypto/hd => hd}/address_test.go (100%) rename {crypto/hd => hd}/hd_test.go (100%) rename {crypto/hd => hd}/test.json (100%) rename crypto/priv_key.go => priv_key.go (100%) rename crypto/pub_key.go => pub_key.go (100%) rename crypto/pub_key_test.go => pub_key_test.go (100%) rename crypto/random.go => random.go (100%) rename crypto/signature.go => signature.go (100%) rename crypto/signature_test.go => signature_test.go (100%) rename crypto/symmetric.go => symmetric.go (100%) rename crypto/symmetric_test.go => symmetric_test.go (100%) diff --git a/crypto/LICENSE b/LICENSE similarity index 100% rename from crypto/LICENSE rename to LICENSE diff --git a/crypto/Makefile b/Makefile similarity index 100% rename from crypto/Makefile rename to Makefile diff --git a/crypto/README.md b/README.md similarity index 100% rename from crypto/README.md rename to README.md diff --git a/crypto/armor.go b/armor.go similarity index 100% rename from crypto/armor.go rename to armor.go diff --git a/crypto/armor_test.go b/armor_test.go similarity index 100% rename from crypto/armor_test.go rename to armor_test.go diff --git a/crypto/bcrypt/base64.go b/bcrypt/base64.go similarity index 100% rename from crypto/bcrypt/base64.go rename to bcrypt/base64.go diff --git a/crypto/bcrypt/bcrypt.go b/bcrypt/bcrypt.go similarity index 100% rename from crypto/bcrypt/bcrypt.go rename to bcrypt/bcrypt.go diff --git a/crypto/crypto.go b/crypto.go similarity index 100% rename from crypto/crypto.go rename to crypto.go diff --git a/crypto/embed_test.go b/embed_test.go similarity index 100% rename from crypto/embed_test.go rename to embed_test.go diff --git a/crypto/encode_test.go b/encode_test.go similarity index 100% rename from crypto/encode_test.go rename to encode_test.go diff --git a/crypto/glide.yaml b/glide.yaml similarity index 100% rename from crypto/glide.yaml rename to glide.yaml diff --git a/crypto/hash.go b/hash.go similarity index 100% rename from crypto/hash.go rename to hash.go diff --git a/crypto/hd/address.go b/hd/address.go similarity index 100% rename from crypto/hd/address.go rename to hd/address.go diff --git a/crypto/hd/address_test.go b/hd/address_test.go similarity index 100% rename from crypto/hd/address_test.go rename to hd/address_test.go diff --git a/crypto/hd/hd_test.go b/hd/hd_test.go similarity index 100% rename from crypto/hd/hd_test.go rename to hd/hd_test.go diff --git a/crypto/hd/test.json b/hd/test.json similarity index 100% rename from crypto/hd/test.json rename to hd/test.json diff --git a/keys/cmd/keys/main.go b/keys/cmd/keys/main.go index 8b92b3f49..995df845b 100644 --- a/keys/cmd/keys/main.go +++ b/keys/cmd/keys/main.go @@ -17,7 +17,7 @@ package main import ( "os" - "github.com/tendermint/go-keys/cmd" + "github.com/tendermint/go-crypto/keys/cmd" ) func main() { diff --git a/keys/cmd/root.go b/keys/cmd/root.go index 64adf2b0b..401e7ec38 100644 --- a/keys/cmd/root.go +++ b/keys/cmd/root.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - keys "github.com/tendermint/go-keys" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/storage/filestorage" + keys "github.com/tendermint/go-crypto/keys" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/storage/filestorage" ) const KeySubdir = "keys" diff --git a/keys/cmd/serve.go b/keys/cmd/serve.go index c3f7dbe39..5ea96db3f 100644 --- a/keys/cmd/serve.go +++ b/keys/cmd/serve.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/go-keys/server" + "github.com/tendermint/go-crypto/keys/server" ) // serveCmd represents the serve command diff --git a/keys/cmd/utils.go b/keys/cmd/utils.go index 31a3a8df3..c61383004 100644 --- a/keys/cmd/utils.go +++ b/keys/cmd/utils.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" data "github.com/tendermint/go-data" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) const PassLength = 10 diff --git a/keys/cryptostore/enc_storage.go b/keys/cryptostore/enc_storage.go index 9589f4cc1..70e212138 100644 --- a/keys/cryptostore/enc_storage.go +++ b/keys/cryptostore/enc_storage.go @@ -2,7 +2,7 @@ package cryptostore import ( crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) // encryptedStorage needs passphrase to get private keys diff --git a/keys/cryptostore/encoder_test.go b/keys/cryptostore/encoder_test.go index 8b72509ed..0535737d7 100644 --- a/keys/cryptostore/encoder_test.go +++ b/keys/cryptostore/encoder_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/go-keys/cryptostore" + "github.com/tendermint/go-crypto/keys/cryptostore" ) func TestNoopEncoder(t *testing.T) { diff --git a/keys/cryptostore/holder.go b/keys/cryptostore/holder.go index 549326614..42d4662de 100644 --- a/keys/cryptostore/holder.go +++ b/keys/cryptostore/holder.go @@ -1,6 +1,6 @@ package cryptostore -import keys "github.com/tendermint/go-keys" +import keys "github.com/tendermint/go-crypto/keys" // Manager combines encyption and storage implementation to provide // a full-featured key manager diff --git a/keys/cryptostore/holder_test.go b/keys/cryptostore/holder_test.go index 860869c86..4f0383198 100644 --- a/keys/cryptostore/holder_test.go +++ b/keys/cryptostore/holder_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" crypto "github.com/tendermint/go-crypto" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/storage/memstorage" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/storage/memstorage" ) // TestKeyManagement makes sure we can manipulate these keys well diff --git a/keys/cryptostore/storage_test.go b/keys/cryptostore/storage_test.go index 78d107c11..b109c44e8 100644 --- a/keys/cryptostore/storage_test.go +++ b/keys/cryptostore/storage_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) func TestSortKeys(t *testing.T) { diff --git a/keys/server/helpers.go b/keys/server/helpers.go index 111f158e7..954922060 100644 --- a/keys/server/helpers.go +++ b/keys/server/helpers.go @@ -13,7 +13,7 @@ import ( "net/http" data "github.com/tendermint/go-data" - "github.com/tendermint/go-keys/server/types" + "github.com/tendermint/go-crypto/keys/server/types" "github.com/pkg/errors" ) diff --git a/keys/server/keys.go b/keys/server/keys.go index 78a382e5e..90d6da2b0 100644 --- a/keys/server/keys.go +++ b/keys/server/keys.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gorilla/mux" - keys "github.com/tendermint/go-keys" - "github.com/tendermint/go-keys/server/types" + keys "github.com/tendermint/go-crypto/keys" + "github.com/tendermint/go-crypto/keys/server/types" ) type Keys struct { diff --git a/keys/server/keys_test.go b/keys/server/keys_test.go index 8333e8e53..4908559b0 100644 --- a/keys/server/keys_test.go +++ b/keys/server/keys_test.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - keys "github.com/tendermint/go-keys" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/server" - "github.com/tendermint/go-keys/server/types" - "github.com/tendermint/go-keys/storage/memstorage" + keys "github.com/tendermint/go-crypto/keys" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/server" + "github.com/tendermint/go-crypto/keys/server/types" + "github.com/tendermint/go-crypto/keys/storage/memstorage" ) func TestKeyServer(t *testing.T) { diff --git a/keys/storage/filestorage/main.go b/keys/storage/filestorage/main.go index 737f0772c..1add482e2 100644 --- a/keys/storage/filestorage/main.go +++ b/keys/storage/filestorage/main.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) const ( diff --git a/keys/storage/filestorage/main_test.go b/keys/storage/filestorage/main_test.go index 890898dcb..c569eb6f9 100644 --- a/keys/storage/filestorage/main_test.go +++ b/keys/storage/filestorage/main_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) func TestBasicCRUD(t *testing.T) { diff --git a/keys/storage/memstorage/main.go b/keys/storage/memstorage/main.go index 69c8d9b03..195fa7a17 100644 --- a/keys/storage/memstorage/main.go +++ b/keys/storage/memstorage/main.go @@ -7,7 +7,7 @@ package memstorage import ( "github.com/pkg/errors" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) type data struct { diff --git a/keys/storage/memstorage/main_test.go b/keys/storage/memstorage/main_test.go index 7605c8225..8bc7e355f 100644 --- a/keys/storage/memstorage/main_test.go +++ b/keys/storage/memstorage/main_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) func TestBasicCRUD(t *testing.T) { diff --git a/keys/tx/multi_test.go b/keys/tx/multi_test.go index 815b9e15a..97463a5f7 100644 --- a/keys/tx/multi_test.go +++ b/keys/tx/multi_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/storage/memstorage" + keys "github.com/tendermint/go-crypto/keys" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/storage/memstorage" ) func TestMultiSig(t *testing.T) { diff --git a/keys/tx/one_test.go b/keys/tx/one_test.go index 71b8011ef..05af347b4 100644 --- a/keys/tx/one_test.go +++ b/keys/tx/one_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" crypto "github.com/tendermint/go-crypto" - keys "github.com/tendermint/go-keys" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/storage/memstorage" + keys "github.com/tendermint/go-crypto/keys" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/storage/memstorage" ) func TestOneSig(t *testing.T) { diff --git a/keys/tx/reader.go b/keys/tx/reader.go index 7689693cb..16a403719 100644 --- a/keys/tx/reader.go +++ b/keys/tx/reader.go @@ -3,7 +3,7 @@ package tx import ( crypto "github.com/tendermint/go-crypto" data "github.com/tendermint/go-data" - keys "github.com/tendermint/go-keys" + keys "github.com/tendermint/go-crypto/keys" ) const ( diff --git a/keys/tx/reader_test.go b/keys/tx/reader_test.go index 54b76af96..4b365604d 100644 --- a/keys/tx/reader_test.go +++ b/keys/tx/reader_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" crypto "github.com/tendermint/go-crypto" data "github.com/tendermint/go-data" - "github.com/tendermint/go-keys/cryptostore" - "github.com/tendermint/go-keys/storage/memstorage" + "github.com/tendermint/go-crypto/keys/cryptostore" + "github.com/tendermint/go-crypto/keys/storage/memstorage" ) func TestReader(t *testing.T) { diff --git a/crypto/priv_key.go b/priv_key.go similarity index 100% rename from crypto/priv_key.go rename to priv_key.go diff --git a/crypto/pub_key.go b/pub_key.go similarity index 100% rename from crypto/pub_key.go rename to pub_key.go diff --git a/crypto/pub_key_test.go b/pub_key_test.go similarity index 100% rename from crypto/pub_key_test.go rename to pub_key_test.go diff --git a/crypto/random.go b/random.go similarity index 100% rename from crypto/random.go rename to random.go diff --git a/crypto/signature.go b/signature.go similarity index 100% rename from crypto/signature.go rename to signature.go diff --git a/crypto/signature_test.go b/signature_test.go similarity index 100% rename from crypto/signature_test.go rename to signature_test.go diff --git a/crypto/symmetric.go b/symmetric.go similarity index 100% rename from crypto/symmetric.go rename to symmetric.go diff --git a/crypto/symmetric_test.go b/symmetric_test.go similarity index 100% rename from crypto/symmetric_test.go rename to symmetric_test.go