aboutsummaryrefslogtreecommitdiffstats
path: root/accounts
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-06-18 23:20:00 +0800
committerzelig <viktor.tron@gmail.com>2015-07-03 06:28:11 +0800
commitfc2e33c594449e38b90bad2bd7b5c50f03b7f69d (patch)
tree8cd8fbf8f0ecb93234b2fb47df30e5e1b78d5173 /accounts
parent1d72aaa0cd3a94e95c892a8b8b88a8a1ef59847e (diff)
downloaddexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.gz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.bz2
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.lz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.xz
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.tar.zst
dexon-fc2e33c594449e38b90bad2bd7b5c50f03b7f69d.zip
unlock multiple passes and obsolete primary
* 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
Diffstat (limited to 'accounts')
-rw-r--r--accounts/account_manager.go13
-rw-r--r--accounts/accounts_test.go2
2 files changed, 1 insertions, 14 deletions
diff --git a/accounts/account_manager.go b/accounts/account_manager.go
index e79ec51a2..4519c8420 100644
--- a/accounts/account_manager.go
+++ b/accounts/account_manager.go
@@ -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)
}
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index 6065fa8e4..8bd70880c 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -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 {