Skip to content

Commit

Permalink
accounts, internal/ethapi: use common Accounts method (ethereum#18428)
Browse files Browse the repository at this point in the history
* accounts/mananger, internal/ethapi/api: Add new function AllAccounts on account manager to remove the duplication code on getting all wallets accounts

* Rename to Accounts

* Rename to AllAccounts
  • Loading branch information
rociiu authored and karalabe committed Aug 8, 2019
1 parent 3e993ff commit 17589aa
Showing 2 changed files with 17 additions and 14 deletions.
15 changes: 15 additions & 0 deletions accounts/manager.go
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ import (
"sort"
"sync"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
)

@@ -162,6 +163,20 @@ func (am *Manager) Wallet(url string) (Wallet, error) {
return nil, ErrUnknownWallet
}

// Accounts returns all account addresses of all wallets within the account manager
func (am *Manager) Accounts() []common.Address {
am.lock.RLock()
defer am.lock.RUnlock()

addresses := make([]common.Address, 0) // return [] instead of nil if empty
for _, wallet := range am.wallets {
for _, account := range wallet.Accounts() {
addresses = append(addresses, account.Address)
}
}
return addresses
}

// Find attempts to locate the wallet corresponding to a specific account. Since
// accounts can be dynamically added to and removed from wallets, this method has
// a linear runtime in the number of wallets.
16 changes: 2 additions & 14 deletions internal/ethapi/api.go
Original file line number Diff line number Diff line change
@@ -191,13 +191,7 @@ func NewPublicAccountAPI(am *accounts.Manager) *PublicAccountAPI {

// Accounts returns the collection of accounts this node manages
func (s *PublicAccountAPI) Accounts() []common.Address {
addresses := make([]common.Address, 0) // return [] instead of nil if empty
for _, wallet := range s.am.Wallets() {
for _, account := range wallet.Accounts() {
addresses = append(addresses, account.Address)
}
}
return addresses
return s.am.Accounts()
}

// PrivateAccountAPI provides an API to access accounts managed by this node.
@@ -220,13 +214,7 @@ func NewPrivateAccountAPI(b Backend, nonceLock *AddrLocker) *PrivateAccountAPI {

// listAccounts will return a list of addresses for accounts this node manages.
func (s *PrivateAccountAPI) ListAccounts() []common.Address {
addresses := make([]common.Address, 0) // return [] instead of nil if empty
for _, wallet := range s.am.Wallets() {
for _, account := range wallet.Accounts() {
addresses = append(addresses, account.Address)
}
}
return addresses
return s.am.Accounts()
}

// rawWallet is a JSON representation of an accounts.Wallet interface, with its

0 comments on commit 17589aa

Please sign in to comment.