From 541f299fbbf3c4f4f0ee49c5ecb832f08cc22656 Mon Sep 17 00:00:00 2001
From: GagziW <leon.stanko@rwth-aachen.de>
Date: Thu, 3 May 2018 01:37:56 -0700
Subject: [PATCH] accounts: changed if-else blocks to conform with golint
(#16654)
---
accounts/keystore/keystore_passphrase.go | 3 +--
accounts/keystore/keystore_plain.go | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go
index eaec39f7d..da632fe34 100644
--- 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
diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go
index b490ca72b..f62a133ce 100644
--- 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)
}
--
GitLab