diff --git a/keys/cryptostore/generator.go b/keys/cryptostore/generator.go index 5a05b7e6e..6b2d47a1a 100644 --- a/keys/cryptostore/generator.go +++ b/keys/cryptostore/generator.go @@ -68,7 +68,7 @@ func getGenerator(algo string) Generator { return GenEd25519 case crypto.NameSecp256k1: return GenSecp256k1 - case nano.NameLedger: + case nano.NameLedgerEd25519: return GenLedger default: return genInvalidAlgo{algo} @@ -81,7 +81,7 @@ func getGeneratorByType(typ byte) Generator { return GenEd25519 case crypto.TypeSecp256k1: return GenSecp256k1 - case nano.TypeLedger: + case nano.TypeLedgerEd25519: return GenLedger default: return genInvalidByte{typ} diff --git a/keys/cryptostore/holder_test.go b/keys/cryptostore/holder_test.go index 80ebcc528..831fa251e 100644 --- a/keys/cryptostore/holder_test.go +++ b/keys/cryptostore/holder_test.go @@ -173,7 +173,7 @@ func TestSignWithLedger(t *testing.T) { p := "hard2hack" // create a nano user - c, _, err := cstore.Create(n, p, nano.NameLedger) + c, _, err := cstore.Create(n, p, nano.NameLedgerEd25519) require.Nil(err, "%+v", err) assert.Equal(c.Name, n) _, ok := c.PubKey.Unwrap().(nano.PubKeyLedger) diff --git a/nano/keys.go b/nano/keys.go index c0eccc492..bd56af6db 100644 --- a/nano/keys.go +++ b/nano/keys.go @@ -13,8 +13,8 @@ import ( ) const ( - NameLedger = "ledger" - TypeLedger = 0x10 + NameLedgerEd25519 = "ledger" + TypeLedgerEd25519 = 0x10 ) var device *ledger.Ledger @@ -229,11 +229,11 @@ func (pk PubKeyLedger) Equals(other crypto.PubKey) bool { func init() { crypto.PrivKeyMapper. - RegisterImplementation(&PrivKeyLedger{}, NameLedger, TypeLedger). + RegisterImplementation(&PrivKeyLedger{}, NameLedgerEd25519, TypeLedgerEd25519). RegisterImplementation(MockPrivKeyLedger{}, "mock-ledger", 0x11) crypto.PubKeyMapper. - RegisterImplementation(PubKeyLedger{}, NameLedger, TypeLedger) + RegisterImplementation(PubKeyLedger{}, NameLedgerEd25519, TypeLedgerEd25519) } // Wrap fulfils interface for PrivKey struct