forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

node: revert change to instanceDir

Browse source
This commit is contained in:
Felix Lange 2019-02-22 12:49:36 +01:00 committed by Zsolt Felfoldi
parent 591f861d3d
commit c9601ccf37
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
node/config.go
View file

@ -337,13 +337,7 @@ func (c *Config) instanceDir() string {
if c.DataDir == "" { if c.DataDir == "" {
return "" return ""
} }
name := c.name() return filepath.Join(c.DataDir, 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)
} }
// NodeKey retrieves the currently configured private key of the node, checking // NodeKey retrieves the currently configured private key of the node, checking