accounts: changed if-else blocks to conform with golint (#16654)

541f299f · GagziW · Péter Szilágyi · 7c029332 · 541f299f · 541f299f
Commit 541f299f authored May 03, 2018 by GagziW Committed by Péter Szilágyi May 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

keystore_passphrase.go accounts/keystore/keystore_passphrase.go +1 -2

keystore_plain.go accounts/keystore/keystore_plain.go +1 -2

No files found.
--- a/accounts/keystore/keystore_passphrase.go
+++ b/accounts/keystore/keystore_passphrase.go
@@ -108,9 +108,8 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er
 func (ks keyStorePassphrase) JoinPath(filename string) string {
 	if filepath.IsAbs(filename) {
 		return filename
-	} else {
-		return filepath.Join(ks.keysDirPath, filename)
 	}
+	return filepath.Join(ks.keysDirPath, filename)
 }

 // EncryptKey encrypts a key using the specified scrypt parameters into a json

--- a/accounts/keystore/keystore_plain.go
+++ b/accounts/keystore/keystore_plain.go
@@ -56,7 +56,6 @@ func (ks keyStorePlain) StoreKey(filename string, key *Key, auth string) error {
 func (ks keyStorePlain) JoinPath(filename string) string {
 	if filepath.IsAbs(filename) {
 		return filename
-	} else {
-		return filepath.Join(ks.keysDirPath, filename)
 	}
+	return filepath.Join(ks.keysDirPath, filename)
 }