Moved crypto code to top level again

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

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"

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

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

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

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) {

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

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

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) {

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

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 {

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) {

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 (

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) {

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 {

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) {

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) {

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) {

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 (

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) {