From f3f49c23620505f50eb0e0398cb9b1837046e201 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sat, 30 Dec 2017 16:46:58 -0500
Subject: [PATCH] keys/words

---
 keys/keybase.go                                  |  9 +++++----
 keys/keybase_test.go                             | 15 ++++++++-------
 keys/{ => words}/ecc.go                          |  2 +-
 keys/{ => words}/ecc_test.go                     |  2 +-
 keys/{ => words}/wordcodec.go                    |  4 ++--
 keys/{ => words}/wordcodec_test.go               |  2 +-
 keys/{ => words}/wordcodecbench_test.go          |  2 +-
 keys/{ => words}/wordlist/chinese_simplified.txt |  0
 keys/{ => words}/wordlist/english.txt            |  0
 keys/{ => words}/wordlist/japanese.txt           |  0
 keys/{ => words}/wordlist/spanish.txt            |  0
 keys/{ => words}/wordlist/wordlist.go            |  0
 12 files changed, 19 insertions(+), 17 deletions(-)
 rename keys/{ => words}/ecc.go (99%)
 rename keys/{ => words}/ecc_test.go (98%)
 rename keys/{ => words}/wordcodec.go (98%)
 rename keys/{ => words}/wordcodec_test.go (99%)
 rename keys/{ => words}/wordcodecbench_test.go (98%)
 rename keys/{ => words}/wordlist/chinese_simplified.txt (100%)
 rename keys/{ => words}/wordlist/english.txt (100%)
 rename keys/{ => words}/wordlist/japanese.txt (100%)
 rename keys/{ => words}/wordlist/spanish.txt (100%)
 rename keys/{ => words}/wordlist/wordlist.go (100%)

diff --git a/keys/keybase.go b/keys/keybase.go
index c68564d5a..b5f7a3c5e 100644
--- a/keys/keybase.go
+++ b/keys/keybase.go
@@ -8,6 +8,7 @@ import (
 	crypto "github.com/tendermint/go-crypto"
 	dbm "github.com/tendermint/tmlibs/db"
 
+	"github.com/tendermint/go-crypto/keys/words"
 	"github.com/tendermint/go-crypto/nano"
 )
 
@@ -19,10 +20,10 @@ import (
 // a full-featured key manager
 type dbKeybase struct {
 	db    dbm.DB
-	codec Codec
+	codec words.Codec
 }
 
-func New(db dbm.DB, codec Codec) dbKeybase {
+func New(db dbm.DB, codec words.Codec) dbKeybase {
 	return dbKeybase{
 		db:    db,
 		codec: codec,
@@ -214,7 +215,7 @@ func generate(algo string, secret []byte) (crypto.PrivKey, error) {
 	case crypto.NameSecp256k1:
 		return crypto.GenPrivKeySecp256k1FromSecret(secret).Wrap(), nil
 	case nano.NameLedgerEd25519:
-		return nano.NewPrivKeyLedgerEd25519Ed25519()
+		return nano.NewPrivKeyLedgerEd25519()
 	default:
 		err := errors.Errorf("Cannot generate keys for algorithm: %s", algo)
 		return crypto.PrivKey{}, err
@@ -228,7 +229,7 @@ func generateByType(typ byte, secret []byte) (crypto.PrivKey, error) {
 	case crypto.TypeSecp256k1:
 		return crypto.GenPrivKeySecp256k1FromSecret(secret).Wrap(), nil
 	case nano.TypeLedgerEd25519:
-		return nano.NewPrivKeyLedgerEd25519Ed25519()
+		return nano.NewPrivKeyLedgerEd25519()
 	default:
 		err := errors.Errorf("Cannot generate keys for algorithm: %X", typ)
 		return crypto.PrivKey{}, err
diff --git a/keys/keybase_test.go b/keys/keybase_test.go
index 72476a02e..5b4d11303 100644
--- a/keys/keybase_test.go
+++ b/keys/keybase_test.go
@@ -13,6 +13,7 @@ import (
 
 	crypto "github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-crypto/keys"
+	"github.com/tendermint/go-crypto/keys/words"
 	"github.com/tendermint/go-crypto/nano"
 )
 
@@ -23,7 +24,7 @@ func TestKeyManagement(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 
 	algo := crypto.NameEd25519
@@ -91,7 +92,7 @@ func TestSignVerify(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 	algo := crypto.NameSecp256k1
 
@@ -165,7 +166,7 @@ func TestSignWithLedger(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 	n := "nano-s"
 	p := "hard2hack"
@@ -219,7 +220,7 @@ func TestImportUnencrypted(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 
 	key := crypto.GenPrivKeyEd25519FromSecret(cmn.RandBytes(16)).Wrap()
@@ -245,7 +246,7 @@ func TestAdvancedKeyManagement(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 
 	algo := crypto.NameSecp256k1
@@ -288,7 +289,7 @@ func TestSeedPhrase(t *testing.T) {
 	// make the storage with reasonable defaults
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 
 	algo := crypto.NameEd25519
@@ -319,7 +320,7 @@ func ExampleNew() {
 	// Select the encryption and storage for your cryptostore
 	cstore := keys.New(
 		dbm.NewMemDB(),
-		keys.MustLoadCodec("english"),
+		words.MustLoadCodec("english"),
 	)
 	ed := crypto.NameEd25519
 	sec := crypto.NameSecp256k1
diff --git a/keys/ecc.go b/keys/words/ecc.go
similarity index 99%
rename from keys/ecc.go
rename to keys/words/ecc.go
index c1ac258fe..c511ad6e4 100644
--- a/keys/ecc.go
+++ b/keys/words/ecc.go
@@ -1,4 +1,4 @@
-package keys
+package words
 
 import (
 	"encoding/binary"
diff --git a/keys/ecc_test.go b/keys/words/ecc_test.go
similarity index 98%
rename from keys/ecc_test.go
rename to keys/words/ecc_test.go
index 6d3e3bec8..9e1772b9f 100644
--- a/keys/ecc_test.go
+++ b/keys/words/ecc_test.go
@@ -1,4 +1,4 @@
-package keys
+package words
 
 import (
 	"testing"
diff --git a/keys/wordcodec.go b/keys/words/wordcodec.go
similarity index 98%
rename from keys/wordcodec.go
rename to keys/words/wordcodec.go
index c551e54ce..fbf32160f 100644
--- a/keys/wordcodec.go
+++ b/keys/words/wordcodec.go
@@ -1,4 +1,4 @@
-package keys
+package words
 
 import (
 	"math/big"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/tendermint/go-crypto/keys/wordlist"
+	"github.com/tendermint/go-crypto/keys/words/wordlist"
 )
 
 const BankSize = 2048
diff --git a/keys/wordcodec_test.go b/keys/words/wordcodec_test.go
similarity index 99%
rename from keys/wordcodec_test.go
rename to keys/words/wordcodec_test.go
index f79ebcad0..367e3799a 100644
--- a/keys/wordcodec_test.go
+++ b/keys/words/wordcodec_test.go
@@ -1,4 +1,4 @@
-package keys
+package words
 
 import (
 	"testing"
diff --git a/keys/wordcodecbench_test.go b/keys/words/wordcodecbench_test.go
similarity index 98%
rename from keys/wordcodecbench_test.go
rename to keys/words/wordcodecbench_test.go
index e100a443a..04417a936 100644
--- a/keys/wordcodecbench_test.go
+++ b/keys/words/wordcodecbench_test.go
@@ -1,4 +1,4 @@
-package keys
+package words
 
 import (
 	"testing"
diff --git a/keys/wordlist/chinese_simplified.txt b/keys/words/wordlist/chinese_simplified.txt
similarity index 100%
rename from keys/wordlist/chinese_simplified.txt
rename to keys/words/wordlist/chinese_simplified.txt
diff --git a/keys/wordlist/english.txt b/keys/words/wordlist/english.txt
similarity index 100%
rename from keys/wordlist/english.txt
rename to keys/words/wordlist/english.txt
diff --git a/keys/wordlist/japanese.txt b/keys/words/wordlist/japanese.txt
similarity index 100%
rename from keys/wordlist/japanese.txt
rename to keys/words/wordlist/japanese.txt
diff --git a/keys/wordlist/spanish.txt b/keys/words/wordlist/spanish.txt
similarity index 100%
rename from keys/wordlist/spanish.txt
rename to keys/words/wordlist/spanish.txt
diff --git a/keys/wordlist/wordlist.go b/keys/words/wordlist/wordlist.go
similarity index 100%
rename from keys/wordlist/wordlist.go
rename to keys/words/wordlist/wordlist.go