Merge pull request #2387 from CortexFoundation/dev

fix data race when closing manager

Author: ucwong

accounts/manager.go

@@ -83,9 +83,6 @@ func NewManager(config *Config, backends ...Backend) *Manager {
 
 // Close terminates the account manager's internal notification processes.
 func (am *Manager) Close() error {
-	for _, w := range am.wallets {
-		w.Close()
-	}
 	errc := make(chan error)
 	am.quit <- errc
 	return <-errc
@@ -127,6 +124,10 @@ func (am *Manager) update() {
 			am.feed.Send(event)
 
 		case errc := <-am.quit:
+			// Close all owned wallets
+			for _, w := range am.wallets {
+				w.Close()
+			}
 			// Manager terminating, return
 			errc <- nil
 			return