diff options
| author | Felix Lange <fjl@twurst.com> | 2016-08-18 19:28:17 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-09-16 21:24:31 +0800 |
| commit | eeb322ae649c4a1a32430cdddfffed70f509181e (patch) | |
| tree | 35622201208afb98665743d9bcf88883058e772a /cmd/geth/dao_test.go | |
| parent | 52ede09b172094f8fd85f8b10e7d0578059353fb (diff) | |
| download | dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar.gz dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar.bz2 dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar.lz dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar.xz dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.tar.zst dexon-eeb322ae649c4a1a32430cdddfffed70f509181e.zip | |
node: ensure datadir can be co-inhabited by different instances
This change ensures that nodes started with different Name but same
DataDir values don't use the same nodekey and IPC socket.
Diffstat (limited to 'cmd/geth/dao_test.go')
| -rw-r--r-- | cmd/geth/dao_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 7058fb385..59730b17f 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -195,9 +195,9 @@ func testDAOForkBlockNewChain(t *testing.T, testnet bool, genesis string, votes geth.cmd.Wait() } // Retrieve the DAO config flag from the database - path := filepath.Join(datadir, "chaindata") + path := filepath.Join(datadir, "geth", "chaindata") if testnet && genesis == "" { - path = filepath.Join(datadir, "testnet", "chaindata") + path = filepath.Join(datadir, "testnet", "geth", "chaindata") } db, err := ethdb.NewLDBDatabase(path, 0, 0) if err != nil { |