aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Simonsson <gustav.simonsson@gmail.com>2015-05-13 00:33:04 +0800
committerGustav Simonsson <gustav.simonsson@gmail.com>2015-05-13 00:33:04 +0800
commite389585f1f2e77fd7cd507499015bf3754581e4e (patch)
tree3f1792e7d71a82de0ceb6047eaf87f2f72aa82ff
parent231fe04f0309e588c6151e1d5a14fd5adc116bf2 (diff)
downloadgo-tangerine-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.gz
go-tangerine-e389585f1f2e77fd7cd507499015bf3754581e4e.tar.zst
go-tangerine-e389585f1f2e77fd7cd507499015bf3754581e4e.zip
Change default keystore dir
-rw-r--r--cmd/geth/js_test.go2
-rw-r--r--cmd/utils/flags.go2
-rw-r--r--common/natspec/natspec_e2e_test.go4
-rw-r--r--crypto/crypto.go2
-rw-r--r--tests/block_test.go2
5 files changed, 6 insertions, 6 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(&eth.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)
}
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go
index a7fc5cb77..a8d318b57 100644
--- a/common/natspec/natspec_e2e_test.go
+++ b/common/natspec/natspec_e2e_test.go
@@ -104,13 +104,13 @@ func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) {
os.RemoveAll("/tmp/eth-natspec/")
- err = os.MkdirAll("/tmp/eth-natspec/keys", os.ModePerm)
+ err = os.MkdirAll("/tmp/eth-natspec/keystore", os.ModePerm)
if err != nil {
panic(err)
}
// create a testAddress
- ks := crypto.NewKeyStorePassphrase("/tmp/eth-natspec/keys")
+ ks := crypto.NewKeyStorePassphrase("/tmp/eth-natspec/keystore")
am := accounts.NewManager(ks)
testAccount, err := am.NewAccount("password")
if err != nil {
diff --git a/crypto/crypto.go b/crypto/crypto.go
index ff817b0fa..4bbd62f7f 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -181,7 +181,7 @@ func Decrypt(prv *ecdsa.PrivateKey, ct []byte) ([]byte, error) {
// Used only by block tests.
func ImportBlockTestKey(privKeyBytes []byte) error {
- ks := NewKeyStorePassphrase(common.DefaultDataDir() + "/keys")
+ ks := NewKeyStorePassphrase(common.DefaultDataDir() + "/keystore")
ecKey := ToECDSA(privKeyBytes)
key := &Key{
Id: uuid.NewRandom(),
diff --git a/tests/block_test.go b/tests/block_test.go
index b5724a1e1..0ba0aefa2 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -99,7 +99,7 @@ func runBlockTest(name string, test *BlockTest, t *testing.T) {
}
func testEthConfig() *eth.Config {
- ks := crypto.NewKeyStorePassphrase(filepath.Join(common.DefaultDataDir(), "keys"))
+ ks := crypto.NewKeyStorePassphrase(filepath.Join(common.DefaultDataDir(), "keystore"))
return &eth.Config{
DataDir: common.DefaultDataDir(),