fix test failure (#302)

diff --git a/blockchain/account/accounts.go b/blockchain/account/accounts.go
index d21debe..3f176a8 100755 (executable)
--- a/blockchain/account/accounts.go
+++ b/blockchain/account/accounts.go
@@ -117,7 +117,7 @@ type Account struct {
 }
 
 // Create creates a new Account.
-func (m *Manager) Create(xpubs []chainkd.XPub, quorum int, alias string, tags map[string]interface{}) (*Account, error) {
+func (m *Manager) Create(ctx context.Context, xpubs []chainkd.XPub, quorum int, alias string, tags map[string]interface{}) (*Account, error) {
        if existed := m.db.Get(aliasKey(alias)); existed != nil {
                return nil, ErrDuplicateAlias
        }

diff --git a/blockchain/account/accounts_test.go b/blockchain/account/accounts_test.go
index e59c337..c88055a 100644 (file)
--- a/blockchain/account/accounts_test.go
+++ b/blockchain/account/accounts_test.go
@@ -20,7 +20,7 @@ func TestCreateAccount(t *testing.T) {
        m := mockAccountManager(t)
        ctx := context.Background()
 
-       account, err := m.Create([]chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
+       account, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
        if err != nil {
                testutil.FatalErr(t, err)
        }
@@ -39,7 +39,7 @@ func TestCreateAccountReusedAlias(t *testing.T) {
        ctx := context.Background()
        m.createTestAccount(ctx, t, "test-alias", nil)
 
-       _, err := m.Create([]chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
+       _, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
        if errors.Root(err) != ErrDuplicateAlias {
                t.Errorf("expected %s when reusing an alias, got %v", ErrDuplicateAlias, err)
        }
@@ -49,12 +49,12 @@ func TestDeleteAccount(t *testing.T) {
        m := mockAccountManager(t)
        ctx := context.Background()
 
-       account1, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias1", nil, "")
+       account1, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias1", nil)
        if err != nil {
                testutil.FatalErr(t, err)
        }
 
-       account2, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias2", nil, "")
+       account2, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias2", nil)
        if err != nil {
                testutil.FatalErr(t, err)
        }
@@ -136,7 +136,7 @@ func mockAccountManager(t *testing.T) *Manager {
 }
 
 func (m *Manager) createTestAccount(ctx context.Context, t testing.TB, alias string, tags map[string]interface{}) *Account {
-       account, err := m.Create([]chainkd.XPub{testutil.TestXPub}, 1, alias, tags)
+       account, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, alias, tags)
        if err != nil {
                testutil.FatalErr(t, err)
        }

diff --git a/blockchain/account/receivers_test.go b/blockchain/account/receivers_test.go
index fa5367c..6f7e696 100644 (file)
--- a/blockchain/account/receivers_test.go
+++ b/blockchain/account/receivers_test.go
@@ -12,7 +12,7 @@ func TestCreateAddressReceiver(t *testing.T) {
        m := mockAccountManager(t)
        ctx := context.Background()
 
-       account, err := m.Create([]chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
+       account, err := m.Create(ctx, []chainkd.XPub{testutil.TestXPub}, 1, "test-alias", nil)
        if err != nil {
                testutil.FatalErr(t, err)
        }

diff --git a/blockchain/account/reserve_test.go b/blockchain/account/reserve_test.go
index ef469f0..ef13172 100644 (file)
--- a/blockchain/account/reserve_test.go
+++ b/blockchain/account/reserve_test.go
@@ -46,7 +46,7 @@ func TestCancelReservation(t *testing.T) {
                t.Fatal(err)
        }
 
-       testAccount, err := accountManager.Create(nil, []chainkd.XPub{xpub1.XPub}, 1, "testAccount", nil, "")
+       testAccount, err := accountManager.Create(nil, []chainkd.XPub{xpub1.XPub}, 1, "testAccount", nil)
        if err != nil {
                t.Fatal(err)
        }

diff --git a/blockchain/accounts.go b/blockchain/accounts.go
index 4da069a..20df934 100644 (file)
--- a/blockchain/accounts.go
+++ b/blockchain/accounts.go
@@ -16,7 +16,7 @@ func (bcr *BlockchainReactor) createAccount(ctx context.Context, ins struct {
        Alias     string                 `json:"alias"`
        Tags      map[string]interface{} `json:"tags"`
 }) Response {
-       acc, err := bcr.accounts.Create(ins.RootXPubs, ins.Quorum, ins.Alias, ins.Tags)
+       acc, err := bcr.accounts.Create(ctx, ins.RootXPubs, ins.Quorum, ins.Alias, ins.Tags)
        if err != nil {
                return NewErrorResponse(err)
        }

diff --git a/blockchain/hsm_test.go b/blockchain/hsm_test.go
index 4eee951..c3e5a68 100755 (executable)
--- a/blockchain/hsm_test.go
+++ b/blockchain/hsm_test.go
@@ -59,11 +59,11 @@ func TestHSM(t *testing.T) {
                t.Fatal(err)
        }
 
-       acct1, err := accounts.Create([]chainkd.XPub{xpub1.XPub}, 1, "acc1", nil)
+       acct1, err := accounts.Create(ctx, []chainkd.XPub{xpub1.XPub}, 1, "acc1", nil)
        if err != nil {
                t.Fatal(err)
        }
-       acct2, err := accounts.Create([]chainkd.XPub{xpub2.XPub}, 1, "acc2", nil)
+       acct2, err := accounts.Create(ctx, []chainkd.XPub{xpub2.XPub}, 1, "acc2", nil)
        if err != nil {
                t.Fatal(err)
        }

diff --git a/blockchain/wallet/wallet.go b/blockchain/wallet/wallet.go
index 916680e..9230533 100755 (executable)
--- a/blockchain/wallet/wallet.go
+++ b/blockchain/wallet/wallet.go
@@ -173,7 +173,7 @@ func (w *Wallet) ImportAccountPrivKey(hsm *pseudohsm.HSM, xprv chainkd.XPrv, key
                return nil, err
        }
 
-       newAccount, err := w.AccountMgr.Create([]chainkd.XPub{xpub.XPub}, SINGLE, accountAlias, nil)
+       newAccount, err := w.AccountMgr.Create(nil, []chainkd.XPub{xpub.XPub}, SINGLE, accountAlias, nil)
        if err != nil {
                return nil, err
        }

diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go
index 543e224..cf81660 100644 (file)
--- a/test/integration/standard_transaction_test.go
+++ b/test/integration/standard_transaction_test.go
@@ -41,7 +41,7 @@ func TestP2PKH(t *testing.T) {
                t.Fatal(err)
        }
 
-       testAccount, err := accountManager.Create([]chainkd.XPub{xpub.XPub}, 1, "testAccount", nil)
+       testAccount, err := accountManager.Create(nil, []chainkd.XPub{xpub.XPub}, 1, "testAccount", nil)
        if err != nil {
                t.Fatal(err)
        }
@@ -97,7 +97,7 @@ func TestP2SH(t *testing.T) {
                t.Fatal(err)
        }
 
-       testAccount, err := accountManager.Create([]chainkd.XPub{xpub1.XPub, xpub2.XPub}, 2, "testAccount", nil)
+       testAccount, err := accountManager.Create(nil, []chainkd.XPub{xpub1.XPub, xpub2.XPub}, 2, "testAccount", nil)
        if err != nil {
                t.Fatal(err)
        }