LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Remove unnecessary address manager locks.

Browse source 
In particular, this allows the use of AccountName in the passed
function when iterating over all account numbers.
This commit is contained in:
Josh Rickmar 2015-06-30 15:25:38 -04:00
parent eb25d889a0
commit c31dc63760
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
waddrmgr/manager.go
View file

@ -619,6 +619,8 @@ func (m *Manager) scriptAddressRowToManaged(row *dbScriptAddressRow) (ManagedAdd
// rowInterfaceToManaged returns a new managed address based on the given
// address data loaded from the database. It will automatically select the
// appropriate type.
//
// This function MUST be called with the manager lock held for writes.
func (m *Manager) rowInterfaceToManaged(rowInterface interface{}) (ManagedAddress, error) {
switch row := rowInterface.(type) {
case *dbChainAddressRow:
@ -1807,9 +1809,6 @@ func (m *Manager) RenameAccount(account uint32, name string) error {
// AccountName returns the account name for the given account number
// stored in the manager.
func (m *Manager) AccountName(account uint32) (string, error) {
m.mtx.Lock()
defer m.mtx.Unlock()
var acctName string
err := m.namespace.View(func(tx walletdb.Tx) error {
var err error
@ -1826,8 +1825,6 @@ func (m *Manager) AccountName(account uint32) (string, error) {
// ForEachAccount calls the given function with each account stored in the
// manager, breaking early on error.
func (m *Manager) ForEachAccount(fn func(account uint32) error) error {
m.mtx.Lock()
defer m.mtx.Unlock()
return m.namespace.View(func(tx walletdb.Tx) error {
return forEachAccount(tx, fn)
})
@ -1835,9 +1832,6 @@ func (m *Manager) ForEachAccount(fn func(account uint32) error) error {
// LastAccount returns the last account stored in the manager.
func (m *Manager) LastAccount() (uint32, error) {
m.mtx.Lock()
defer m.mtx.Unlock()
var account uint32
err := m.namespace.View(func(tx walletdb.Tx) error {
var err error