roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Address pull request comments

Browse Source 
* Use RWMutex instead of Mutex
* Use time.Duration instead of int for unlock time
* Use time.After with select instead of time.Sleep
This commit is contained in:
Gustav Simonsson 2015-02-25 18:40:59 +01:00
parent b296b36d2b
commit d1311c53ee
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
accounts/account_manager.go
View File

@ -48,19 +48,19 @@ type Account struct {
} }
type AccountManager struct { type AccountManager struct {
keyStore crypto.KeyStore2 keyStore crypto.KeyStore2
unlockedKeys map[string]crypto.Key unlockedKeys map[string]crypto.Key
unlockedMilliSeconds int unlockMilliseconds time.Duration
mutex sync.Mutex mutex sync.RWMutex
} }
func NewAccountManager(keyStore crypto.KeyStore2, unlockMilliSeconds int) AccountManager { func NewAccountManager(keyStore crypto.KeyStore2, unlockMilliseconds time.Duration) AccountManager {
keysMap := make(map[string]crypto.Key) keysMap := make(map[string]crypto.Key)
am := &AccountManager{ am := &AccountManager{
keyStore: keyStore, keyStore: keyStore,
unlockedKeys: keysMap, unlockedKeys: keysMap,
unlockedMilliSeconds: unlockMilliSeconds, unlockMilliseconds: unlockMilliseconds,
mutex: sync.Mutex{}, // for accessing unlockedKeys map mutex: sync.RWMutex{}, // for accessing unlockedKeys map
} }
return *am return *am
} }
@ -70,9 +70,9 @@ func (am AccountManager) DeleteAccount(address []byte, auth string) error {
} }
func (am *AccountManager) Sign(fromAccount *Account, toSign []byte) (signature []byte, err error) { func (am *AccountManager) Sign(fromAccount *Account, toSign []byte) (signature []byte, err error) {
am.mutex.Lock() am.mutex.RLock()
unlockedKey := am.unlockedKeys[string(fromAccount.Address)] unlockedKey := am.unlockedKeys[string(fromAccount.Address)]
am.mutex.Unlock() am.mutex.RUnlock()
if unlockedKey.Address == nil { if unlockedKey.Address == nil {
return nil, ErrLocked return nil, ErrLocked
} }
@ -85,9 +85,9 @@ func (am *AccountManager) SignLocked(fromAccount *Account, keyAuth string, toSig
if err != nil { if err != nil {
return nil, err return nil, err
} }
am.mutex.Lock() am.mutex.RLock()
am.unlockedKeys[string(fromAccount.Address)] = *key am.unlockedKeys[string(fromAccount.Address)] = *key
am.mutex.Unlock() am.mutex.RUnlock()
go unlockLater(am, fromAccount.Address) go unlockLater(am, fromAccount.Address)
signature, err = crypto.Sign(toSign, key.PrivateKey) signature, err = crypto.Sign(toSign, key.PrivateKey)
return signature, err return signature, err
@ -121,9 +121,11 @@ func (am *AccountManager) Accounts() ([]Account, error) {
} }
func unlockLater(am *AccountManager, addr []byte) { func unlockLater(am *AccountManager, addr []byte) {
time.Sleep(time.Millisecond * time.Duration(am.unlockedMilliSeconds)) select {
am.mutex.Lock() case <-time.After(time.Millisecond * am.unlockMilliseconds):
}
am.mutex.RLock()
// TODO: how do we know the key is actually gone from memory? // TODO: how do we know the key is actually gone from memory?
delete(am.unlockedKeys, string(addr)) delete(am.unlockedKeys, string(addr))
am.mutex.Unlock() am.mutex.RUnlock()
} }

2
accounts/accounts_test.go
View File

@ -21,7 +21,7 @@ func TestAccountManager(t *testing.T) {
} }
// Cleanup // Cleanup
time.Sleep(time.Millisecond * time.Duration(150)) // wait for locking time.Sleep(time.Millisecond * 150) // wait for locking
accounts, err := am.Accounts() accounts, err := am.Accounts()
if err != nil { if err != nil {