aboutsummaryrefslogtreecommitdiffstats
path: root/accounts/keystore
diff options
context:
space:
mode:
authorGagziW <leon.stanko@rwth-aachen.de>2018-05-03 16:37:56 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-05-03 16:37:56 +0800
commit541f299fbbf3c4f4f0ee49c5ecb832f08cc22656 (patch)
tree73f87c73b7e0aa5be82005e00602f051c57d1b7d /accounts/keystore
parent7c02933275d8f67fbdf78cdc05c0e09af4ebc657 (diff)
downloadgo-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar.gz
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar.bz2
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar.lz
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar.xz
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.tar.zst
go-tangerine-541f299fbbf3c4f4f0ee49c5ecb832f08cc22656.zip
accounts: changed if-else blocks to conform with golint (#16654)
Diffstat (limited to 'accounts/keystore')
-rw-r--r--accounts/keystore/keystore_passphrase.go3
-rw-r--r--accounts/keystore/keystore_plain.go3
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)
}