aboutsummaryrefslogtreecommitdiffstats
path: root/accounts/accounts_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'accounts/accounts_test.go')
-rw-r--r--accounts/accounts_test.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index 44d1d72f1..b90da2892 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -3,15 +3,16 @@ package accounts
import (
"testing"
+ "time"
+
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto/randentropy"
"github.com/ethereum/go-ethereum/ethutil"
- "time"
)
func TestAccountManager(t *testing.T) {
ks := crypto.NewKeyStorePlain(ethutil.DefaultDataDir() + "/testaccounts")
- am := NewAccountManager(ks, 100)
+ am := NewManager(ks, 100*time.Millisecond)
pass := "" // not used but required by API
a1, err := am.NewAccount(pass)
toSign := randentropy.GetEntropyCSPRNG(32)
@@ -21,7 +22,7 @@ func TestAccountManager(t *testing.T) {
}
// Cleanup
- time.Sleep(time.Millisecond * 150) // wait for locking
+ time.Sleep(150 * time.Millisecond) // wait for locking
accounts, err := am.Accounts()
if err != nil {
@@ -37,7 +38,7 @@ func TestAccountManager(t *testing.T) {
func TestAccountManagerLocking(t *testing.T) {
ks := crypto.NewKeyStorePassphrase(ethutil.DefaultDataDir() + "/testaccounts")
- am := NewAccountManager(ks, 200)
+ am := NewManager(ks, 200*time.Millisecond)
pass := "foo"
a1, err := am.NewAccount(pass)
toSign := randentropy.GetEntropyCSPRNG(32)
@@ -61,7 +62,7 @@ func TestAccountManagerLocking(t *testing.T) {
}
// Signing without passphrase fails after automatic locking
- time.Sleep(time.Millisecond * time.Duration(250))
+ time.Sleep(250 * time.Millisecond)
_, err = am.Sign(a1, toSign)
if err != ErrLocked {