From c9601ccf3710406127fe83a9facba2fd9bbc7137 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 22 Feb 2019 12:49:36 +0100 Subject: [PATCH] node: revert change to instanceDir --- node/config.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/node/config.go b/node/config.go index fd0d330c36..2f871e478b 100644 --- a/node/config.go +++ b/node/config.go @@ -337,13 +337,7 @@ func (c *Config) instanceDir() string { if c.DataDir == "" { return "" } - name := c.name() - if name == "p2p-node" { - // use original data dir with network simulator in order to allow using - // an existing database for a simulated node instead of a temporary one - name = "geth" - } - return filepath.Join(c.DataDir, name) + return filepath.Join(c.DataDir, c.name()) } // NodeKey retrieves the currently configured private key of the node, checking