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

unlock multiple passes and obsolete primary

Browse Source 
* multiple passwords allowed in password file
* split on "\n", sideeffect: chop trailing slashes. fixes common mistake <(echo 'pass')
* remove accounts.Primary method
* do not fall back to primary account for mining
This commit is contained in:
zelig
2015-06-18 16:20:00 +01:00
parent 1d72aaa0cd
commit fc2e33c594
6 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
accounts/account_manager.go
View File

@ -81,19 +81,6 @@ func (am *Manager) HasAccount(addr common.Address) bool {
return false
}
func (am *Manager) Primary() (addr common.Address, err error) {
addrs, err := am.keyStore.GetKeyAddresses()
if os.IsNotExist(err) {
return common.Address{}, ErrNoKeys
} else if err != nil {
return common.Address{}, err
}
if len(addrs) == 0 {
return common.Address{}, ErrNoKeys
}
return addrs[0], nil
}
func (am *Manager) DeleteAccount(address common.Address, auth string) error {
return am.keyStore.DeleteKey(address, auth)
}

2
accounts/accounts_test.go
View File

@ -18,7 +18,7 @@ func TestSign(t *testing.T) {
pass := "" // not used but required by API
a1, err := am.NewAccount(pass)
toSign := randentropy.GetEntropyCSPRNG(32)
am.Unlock(a1.Address, "", 0)
am.Unlock(a1.Address, "")
_, err = am.Sign(a1, toSign)
if err != nil {