gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2284 from fjl/accounts-addr-cache

Browse Source 
accounts: cache key addresses
This commit is contained in:
Péter Szilágyi
2016-04-12 17:51:09 +03:00
parent 33e4f51749 6498df7b02
commit 1e9b504ee7
96 changed files with 7364 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/gethrpctest/main.go
View File

@ -108,24 +108,23 @@ func MakeSystemNode(keydir string, privkey string, test *tests.BlockTest) (*node
return nil, err
}
// Create the keystore and inject an unlocked account if requested
keystore := crypto.NewKeyStorePassphrase(keydir, crypto.StandardScryptN, crypto.StandardScryptP)
accman := accounts.NewManager(keystore)
accman := accounts.NewPlaintextManager(keydir)
if len(privkey) > 0 {
key, err := crypto.HexToECDSA(privkey)
if err != nil {
return nil, err
}
if err := keystore.StoreKey(crypto.NewKeyFromECDSA(key), ""); err != nil {
a, err := accman.ImportECDSA(key, "")
if err != nil {
return nil, err
}
if err := accman.Unlock(crypto.NewKeyFromECDSA(key).Address, ""); err != nil {
if err := accman.Unlock(a, ""); err != nil {
return nil, err
}
}
// Initialize and register the Ethereum protocol
db, _ := ethdb.NewMemDatabase()
if _, err := test.InsertPreState(db, accman); err != nil {
if _, err := test.InsertPreState(db); err != nil {
return nil, err
}
ethConf := &eth.Config{