diff options
| author | Felix Lange <fjl@twurst.com> | 2016-09-29 20:24:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 20:24:37 +0800 |
| commit | 44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308 (patch) | |
| tree | aaab07e78f7b9341f0fcfbd9348fe96273bd6a0d /cmd/geth/dao_test.go | |
| parent | 4e8cec05abb567457e80185cb9fcf7ec2cc90596 (diff) | |
| parent | b42a5b118f1aa7ac1235547c8594146978941401 (diff) | |
| download | dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.gz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.bz2 dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.lz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.xz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.zst dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.zip | |
Merge pull request #2914 from fjl/node-coinhabit
cmd/utils, node: make datadir reusable for bzzd
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 { |