Minor cleanup

This commit is contained in:
Ethan Frey 2017-11-13 14:54:14 +01:00
parent 9d78be41b5
commit 2649c056cd
2 changed files with 5 additions and 4 deletions

View File

@ -56,11 +56,12 @@ metalinter_test: ensure_tools
--enable=structcheck \ --enable=structcheck \
--enable=unconvert \ --enable=unconvert \
--enable=unused \ --enable=unused \
--enable=vetshadow \
--enable=vet \ --enable=vet \
--enable=varcheck \ --enable=varcheck \
./... ./...
# --enable=vetshadow \ <= doesn't like assert := assert.New(t)
#--enable=dupl \ #--enable=dupl \
#--enable=errcheck \ #--enable=errcheck \
#--enable=goimports \ #--enable=goimports \

View File

@ -222,11 +222,11 @@ func generate(algo string, secret []byte) (crypto.PrivKey, error) {
func generateByType(typ byte, secret []byte) (crypto.PrivKey, error) { func generateByType(typ byte, secret []byte) (crypto.PrivKey, error) {
switch typ { switch typ {
case crypto.TypeEd25519: case crypto.TypeEd25519:
return generate(crypto.NameEd25519, secret) return crypto.GenPrivKeyEd25519FromSecret(secret).Wrap(), nil
case crypto.TypeSecp256k1: case crypto.TypeSecp256k1:
return generate(crypto.NameSecp256k1, secret) return crypto.GenPrivKeySecp256k1FromSecret(secret).Wrap(), nil
case nano.TypeLedgerEd25519: case nano.TypeLedgerEd25519:
return generate(nano.NameLedgerEd25519, secret) return nano.NewPrivKeyLedgerEd25519Ed25519()
default: default:
err := errors.Errorf("Cannot generate keys for algorithm: %X", typ) err := errors.Errorf("Cannot generate keys for algorithm: %X", typ)
return crypto.PrivKey{}, err return crypto.PrivKey{}, err