unifying constants

cosmos · Feb 2, 2019 · 0eb3f04 · 0eb3f04
1 parent 88e8a57
commit 0eb3f04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/client/keys/add.go b/client/keys/add.go
@@ -37,7 +37,6 @@ const (
 )
 
 const (
-	defaultBIP39Passphrase = ""
 	maxValidAccountValue   = int(0x80000000 - 1)
 	maxValidIndexalue      = int(0x80000000 - 1)
 )
@@ -245,7 +244,7 @@ func runAddCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	info, err := kb.CreateAccount(name, mnemonic, defaultBIP39Passphrase, encryptPassword, account, index)
+	info, err := kb.CreateAccount(name, mnemonic, keys.DefaultBIP39Passphrase, encryptPassword, account, index)
 	if err != nil {
 		return err
 	}
@@ -386,7 +385,7 @@ func AddNewKeyRequestHandler(indent bool) http.HandlerFunc {
 		// create account
 		account := uint32(m.Account)
 		index := uint32(m.Index)
-		info, err := kb.CreateAccount(m.Name, mnemonic, defaultBIP39Passphrase, m.Password, account, index)
+		info, err := kb.CreateAccount(m.Name, mnemonic, keys.DefaultBIP39Passphrase, m.Password, account, index)
 		if CheckAndWriteErrorResponse(w, http.StatusInternalServerError, err) {
 			return
 		}
@@ -477,7 +476,7 @@ func RecoverRequestHandler(indent bool) http.HandlerFunc {
 		account := uint32(m.Account)
 		index := uint32(m.Index)
 
-		info, err := kb.CreateAccount(name, mnemonic, defaultBIP39Passphrase, m.Password, account, index)
+		info, err := kb.CreateAccount(name, mnemonic, keys.DefaultBIP39Passphrase, m.Password, account, index)
 		if CheckAndWriteErrorResponse(w, http.StatusInternalServerError, err) {
 			return
 		}

diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go
@@ -54,7 +54,7 @@ const (
 
 const (
 	// used for deriving seed from mnemonic
-	defaultBIP39Passphrase = ""
+	DefaultBIP39Passphrase = ""
 
 	// bits of entropy to draw when creating a mnemonic
 	defaultEntropySize = 256
@@ -109,7 +109,7 @@ func (kb dbKeybase) CreateMnemonic(name string, language Language, passwd string
 		return
 	}
 
-	seed := bip39.NewSeed(mnemonic, defaultBIP39Passphrase)
+	seed := bip39.NewSeed(mnemonic, DefaultBIP39Passphrase)
 	info, err = kb.persistDerivedKey(seed, passwd, name, hd.FullFundraiserPath)
 	return
 }