From 81800f257eef97c12cc80bb908432ee710d8a14c Mon Sep 17 00:00:00 2001
From: Chengcheng Zhang <943420582@qq.com>
Date: Tue, 9 Jul 2019 17:12:00 +0800
Subject: [PATCH] update

---
 account/accounts.go     | 8 +++-----
 wallet/recovery_test.go | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/account/accounts.go b/account/accounts.go
index 6360169c..db592885 100644
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -145,11 +145,9 @@ func (m *Manager) SaveAccount(account *Account) error {
 	}
 
 	acct, err := m.GetAccountByXPubsIndex(account.XPubs, account.KeyIndex)
-	if err != nil {
+	if err != nil && err != ErrFindAccount {
 		return err
-	}
-
-	if acct != nil {
+	} else if acct != nil {
 		return ErrDuplicateIndex
 	}
 
@@ -347,7 +345,7 @@ func (m *Manager) GetAccountByXPubsIndex(xPubs []chainkd.XPub, index uint64) (*A
 			return account, nil
 		}
 	}
-	return nil, nil
+	return nil, ErrFindAccount
 }
 
 // GetAliasByID return the account alias by given ID
diff --git a/wallet/recovery_test.go b/wallet/recovery_test.go
index 906c0c97..242a5251 100644
--- a/wallet/recovery_test.go
+++ b/wallet/recovery_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/vapor/account"
+	acc "github.com/vapor/account"
 	"github.com/vapor/blockchain/pseudohsm"
 	"github.com/vapor/blockchain/signers"
 	"github.com/vapor/blockchain/txbuilder"
@@ -297,7 +298,7 @@ func TestRecoveryFromXPubs(t *testing.T) {
 
 		for _, acct := range Accounts {
 			tmp, err := recAcctMgr.GetAccountByXPubsIndex(acct.XPubs, acct.KeyIndex)
-			if err != nil {
+			if err != nil && err != acc.ErrFindAccount {
 				t.Fatal("recovery from XPubs err:", err)
 			}
 
@@ -386,7 +387,7 @@ func TestRecoveryByRescanAccount(t *testing.T) {
 
 		for _, acct := range accounts {
 			tmp, err := recAcctMgr.GetAccountByXPubsIndex(acct.XPubs, acct.KeyIndex)
-			if err != nil {
+			if err != nil && err != acc.ErrFindAccount {
 				t.Fatal("recovery from XPubs err:", err)
 			}
 
-- 
2.11.0