Address pull request comments

* Further simplify "constructor" function's allocation of structs
* Fix formatting
This commit is contained in:
Gustav Simonsson 2015-01-19 22:12:22 +01:00
parent 3cf038f300
commit d48140cab3
2 changed files with 4 additions and 9 deletions

View File

@ -89,10 +89,7 @@ type keyStorePassphrase struct {
} }
func NewKeyStorePassphrase(path string) KeyStore2 { func NewKeyStorePassphrase(path string) KeyStore2 {
ks := &keyStorePassphrase{ return &keyStorePassphrase{path}
keysDirPath : path,
}
return ks
} }
func (ks keyStorePassphrase) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) { func (ks keyStorePassphrase) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) {
@ -105,8 +102,8 @@ func (ks keyStorePassphrase) GetKey(keyId *uuid.UUID, auth string) (key *Key, er
return nil, err return nil, err
} }
key = &Key{ key = &Key{
Id : keyId, Id: keyId,
PrivateKey : ToECDSA(keyBytes), PrivateKey: ToECDSA(keyBytes),
} }
return key, err return key, err
} }

View File

@ -54,9 +54,7 @@ func DefaultDataDir() string {
} }
func NewKeyStorePlain(path string) KeyStore2 { func NewKeyStorePlain(path string) KeyStore2 {
ks := new(keyStorePlain) return &keyStorePlain{path}
ks.keysDirPath = path
return ks
} }
func (ks keyStorePlain) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) { func (ks keyStorePlain) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) {