diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-13 01:00:35 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-13 01:00:35 +0800 |
| commit | d6357aa616715df1e98cfb90c3aa5372e15cc24b (patch) | |
| tree | 3f1792e7d71a82de0ceb6047eaf87f2f72aa82ff /cmd/geth/js_test.go | |
| parent | 58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd (diff) | |
| parent | e389585f1f2e77fd7cd507499015bf3754581e4e (diff) | |
| download | dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.gz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.bz2 dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.lz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.xz dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.tar.zst dexon-d6357aa616715df1e98cfb90c3aa5372e15cc24b.zip | |
Merge pull request #631 from Gustav-Simonsson/improve_key_store_crypto
Improve key store crypto
Diffstat (limited to 'cmd/geth/js_test.go')
| -rw-r--r-- | cmd/geth/js_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 9b6d503ab..c2a0e2fe2 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -45,7 +45,7 @@ type testjethre struct { } func (self *testjethre) UnlockAccount(acc []byte) bool { - err := self.ethereum.AccountManager().Unlock(acc, "") + err := self.ethereum.AccountManager().Unlock(common.BytesToAddress(acc), "") if err != nil { panic("unable to unlock") } @@ -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, |