diff options
| author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-05-13 00:33:04 +0800 |
|---|---|---|
| committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-05-13 00:33:04 +0800 |
| commit | e389585f1f2e77fd7cd507499015bf3754581e4e (patch) | |
| tree | 3f1792e7d71a82de0ceb6047eaf87f2f72aa82ff /cmd | |
| parent | 231fe04f0309e588c6151e1d5a14fd5adc116bf2 (diff) | |
| download | dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.gz dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.bz2 dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.lz dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.xz dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.zst dexon-e389585f1f2e77fd7cd507499015bf3754581e4e.zip | |
Change default keystore dir
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js_test.go | 2 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 8f9859771..c2a0e2fe2 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -68,7 +68,7 @@ func testJEthRE(t *testing.T) (string, *testjethre, *eth.Ethereum) { // set up mock genesis with balance on the testAddress core.GenesisData = []byte(testGenesis) - ks := crypto.NewKeyStorePassphrase(filepath.Join(tmp, "keys")) + ks := crypto.NewKeyStorePassphrase(filepath.Join(tmp, "keystore")) am := accounts.NewManager(ks) ethereum, err := eth.New(ð.Config{ DataDir: tmp, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 339dd3f47..ddbd36b5c 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -346,7 +346,7 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Dat func GetAccountManager(ctx *cli.Context) *accounts.Manager { dataDir := ctx.GlobalString(DataDirFlag.Name) - ks := crypto.NewKeyStorePassphrase(filepath.Join(dataDir, "keys")) + ks := crypto.NewKeyStorePassphrase(filepath.Join(dataDir, "keystore")) return accounts.NewManager(ks) } |