From 1adadea16101208bd14fda13ecc2007ba3f5bc95 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 20 Nov 2017 15:19:35 +0100
Subject: [PATCH] node: Remove superfluous code

---
 node/config.go | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/node/config.go b/node/config.go
index b8f8898931..89efe1911c 100644
--- a/node/config.go
+++ b/node/config.go
@@ -359,6 +359,7 @@ func (c *Config) parsePersistentNodes(path string) []*discover.Node {
 	}
 	return nodes
 }
+
 // ResolveAccountConfig determines the settings for scrypt and keydirectory
 func ResolveAccountConfig(conf *Config) (int, int, string, error) {
 	scryptN := keystore.StandardScryptN
@@ -391,34 +392,8 @@ func ResolveAccountConfig(conf *Config) (int, int, string, error) {
 }
 
 func makeAccountManager(conf *Config) (*accounts.Manager, string, error) {
-	scryptN := keystore.StandardScryptN
-	scryptP := keystore.StandardScryptP
-	if conf.UseLightweightKDF {
-		scryptN = keystore.LightScryptN
-		scryptP = keystore.LightScryptP
-	}
+	scryptN, scryptP, keydir, err := ResolveAccountConfig(conf)
 
-	var (
-		keydir    string
-		ephemeral string
-		err       error
-	)
-	switch {
-	case filepath.IsAbs(conf.KeyStoreDir):
-		keydir = conf.KeyStoreDir
-	case conf.DataDir != "":
-		if conf.KeyStoreDir == "" {
-			keydir = filepath.Join(conf.DataDir, datadirDefaultKeyStore)
-		} else {
-			keydir, err = filepath.Abs(conf.KeyStoreDir)
-		}
-	case conf.KeyStoreDir != "":
-		keydir, err = filepath.Abs(conf.KeyStoreDir)
-	default:
-		// There is no datadir.
-		keydir, err = ioutil.TempDir("", "go-ethereum-keystore")
-		ephemeral = keydir
-	}
 	if err != nil {
 		return nil, "", err
 	}
@@ -443,5 +418,5 @@ func makeAccountManager(conf *Config) (*accounts.Manager, string, error) {
 			backends = append(backends, trezorhub)
 		}
 	}
-	return accounts.NewManager(backends...), ephemeral, nil
+	return accounts.NewManager(backends...), keydir, nil
 }