From fc2e33c594449e38b90bad2bd7b5c50f03b7f69d Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 18 Jun 2015 16:20:00 +0100
Subject: 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

---
 eth/backend.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'eth')

diff --git a/eth/backend.go b/eth/backend.go
index d6ad3381d..ce774ba1b 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -464,15 +464,8 @@ func (s *Ethereum) StartMining(threads int) error {
 func (s *Ethereum) Etherbase() (eb common.Address, err error) {
 	eb = s.etherbase
 	if (eb == common.Address{}) {
-		primary, err := s.accountManager.Primary()
-		if err != nil {
-			return eb, err
-		}
-		if (primary == common.Address{}) {
-			err = fmt.Errorf("no accounts found")
-			return eb, err
-		}
-		eb = primary
+		err = fmt.Errorf("no accounts found")
+		return eb, err
 	}
 	return eb, nil
 }
-- 
cgit v1.2.3