From d48140cab39923bb06bb4df8667efd2df000d17b Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Mon, 19 Jan 2015 22:12:22 +0100
Subject: Address pull request comments

* Further simplify "constructor" function's allocation of structs
* Fix formatting
---
 crypto/key_store_passphrase.go | 9 +++------
 crypto/key_store_plain.go      | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'crypto')

diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 68135a4f0..e30a0a785 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -89,10 +89,7 @@ type keyStorePassphrase struct {
 }
 
 func NewKeyStorePassphrase(path string) KeyStore2 {
-	ks := &keyStorePassphrase{
-		keysDirPath : path,
-	}
-	return ks
+	return &keyStorePassphrase{path}
 }
 
 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
 	}
 	key = &Key{
-		Id : keyId,
-		PrivateKey : ToECDSA(keyBytes),
+		Id:         keyId,
+		PrivateKey: ToECDSA(keyBytes),
 	}
 	return key, err
 }
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index 2aa813f5e..b6e2a309a 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -54,9 +54,7 @@ func DefaultDataDir() string {
 }
 
 func NewKeyStorePlain(path string) KeyStore2 {
-	ks := new(keyStorePlain)
-	ks.keysDirPath = path
-	return ks
+	return &keyStorePlain{path}
 }
 
 func (ks keyStorePlain) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) {
-- 
cgit v1.2.3