aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-15 01:36:56 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-15 01:36:56 +0800
commit6bc8dec7aceba4630e5e8c18376da2ceb46b2d5e (patch)
treea9a9bc39aeef3d405bbe34db999b9bc61ad4da7b
parent060a07cf69a2083611565e92cfa78d35c71cdb9f (diff)
parent559cc02313a869ece839205b336d637cfb486740 (diff)
downloadgo-tangerine-6bc8dec7aceba4630e5e8c18376da2ceb46b2d5e.tar.gz
go-tangerine-6bc8dec7aceba4630e5e8c18376da2ceb46b2d5e.tar.zst
go-tangerine-6bc8dec7aceba4630e5e8c18376da2ceb46b2d5e.zip
Merge pull request #980 from fjl/geth-test-no-scrypt
cmd/geth: use plain keystore for JS tests
-rw-r--r--cmd/geth/js_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index c2a0e2fe2..e02e8f704 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, "keystore"))
+ ks := crypto.NewKeyStorePlain(filepath.Join(tmp, "keystore"))
am := accounts.NewManager(ks)
ethereum, err := eth.New(&eth.Config{
DataDir: tmp,