OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update GetAccountIDByAccountAlias
[bytom/vapor.git]
/
account
/
accounts.go
diff --git
a/account/accounts.go
b/account/accounts.go
index
488cf12
..
f173388
100644
(file)
--- a/
account/accounts.go
+++ b/
account/accounts.go
@@
-128,7
+128,7
@@
func (m *Manager) SaveAccount(account *Account) error {
m.accountMu.Lock()
defer m.accountMu.Unlock()
m.accountMu.Lock()
defer m.accountMu.Unlock()
- if existed := m.store.GetAccount
ByAccountAlias(account.Alias); existed != nil
{
+ if existed := m.store.GetAccount
IDByAccountAlias(account.Alias); existed != ""
{
return ErrDuplicateAlias
}
return ErrDuplicateAlias
}
@@
-153,7
+153,7
@@
func (m *Manager) Create(xpubs []chainkd.XPub, quorum int, alias string, deriveR
m.accountMu.Lock()
defer m.accountMu.Unlock()
m.accountMu.Lock()
defer m.accountMu.Unlock()
- if existed := m.store.GetAccount
ByAccountAlias(alias); existed != nil
{
+ if existed := m.store.GetAccount
IDByAccountAlias(alias); existed != ""
{
return nil, ErrDuplicateAlias
}
return nil, ErrDuplicateAlias
}
@@
-184,7
+184,7
@@
func (m *Manager) UpdateAccountAlias(accountID string, newAlias string) error {
oldAlias := account.Alias
normalizedAlias := strings.ToLower(strings.TrimSpace(newAlias))
oldAlias := account.Alias
normalizedAlias := strings.ToLower(strings.TrimSpace(newAlias))
- if existed := m.store.GetAccount
ByAccountAlias(normalizedAlias); existed != nil
{
+ if existed := m.store.GetAccount
IDByAccountAlias(normalizedAlias); existed != ""
{
return ErrDuplicateAlias
}
return ErrDuplicateAlias
}
@@
-333,12
+333,11
@@
func (m *Manager) FindByAlias(alias string) (*Account, error) {
return m.FindByID(cachedID.(string))
}
return m.FindByID(cachedID.(string))
}
-
rawID := m.store.GetAccount
ByAccountAlias(alias)
- if
rawID == nil
{
+
accountID := m.store.GetAccountID
ByAccountAlias(alias)
+ if
accountID == ""
{
return nil, ErrFindAccount
}
return nil, ErrFindAccount
}
- accountID := string(rawID)
m.cacheMu.Lock()
m.aliasCache.Add(alias, accountID)
m.cacheMu.Unlock()
m.cacheMu.Lock()
m.aliasCache.Add(alias, accountID)
m.cacheMu.Unlock()