update

diff --git a/wallet/recovery_test.go b/wallet/recovery_test.go
index eff5850..667da60 100644 (file)
--- a/wallet/recovery_test.go
+++ b/wallet/recovery_test.go
@@ -16,7 +16,7 @@ import (
        "github.com/vapor/common"
        "github.com/vapor/consensus"
        "github.com/vapor/crypto/ed25519/chainkd"
-       dbm "github.com/vapor/database/leveldb"
+       "github.com/vapor/database"
        "github.com/vapor/errors"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
@@ -135,7 +135,7 @@ func TestXPubsRecoveryLock(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)
@@ -184,7 +184,7 @@ func TestExtendScanAddresses(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)
@@ -239,8 +239,8 @@ func TestRecoveryFromXPubs(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
-       recoveryDB := dbm.NewDB("recdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
+       recoveryDB := database.NewDB("recdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)
@@ -313,8 +313,8 @@ func TestRecoveryByRescanAccount(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
-       recoveryDB := dbm.NewDB("recdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
+       recoveryDB := database.NewDB("recdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)
@@ -402,7 +402,7 @@ func TestReportFound(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)
@@ -489,7 +489,7 @@ func TestLoadStatusInfo(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer os.RemoveAll("temp")
 
        hsm, err := pseudohsm.New(dirPath)
@@ -563,7 +563,7 @@ func TestLock(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer os.RemoveAll("temp")
 
        acctMgr := account.NewManager(testDB, nil)
@@ -621,7 +621,7 @@ func TestContractIndexResidue(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
        hsm, err := pseudohsm.New(dirPath)
        if err != nil {
                t.Fatal(err)

diff --git a/wallet/unconfirmed_test.go b/wallet/unconfirmed_test.go
index 60ece60..6535f69 100644 (file)
--- a/wallet/unconfirmed_test.go
+++ b/wallet/unconfirmed_test.go
@@ -12,7 +12,7 @@ import (
        "github.com/vapor/blockchain/signers"
        "github.com/vapor/consensus"
        "github.com/vapor/crypto/ed25519/chainkd"
-       dbm "github.com/vapor/database/leveldb"
+       "github.com/vapor/database"
        "github.com/vapor/event"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
@@ -26,7 +26,7 @@ func TestWalletUnconfirmedTxs(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer os.RemoveAll("temp")
 
        accountManager := account.NewManager(testDB, nil)

diff --git a/wallet/utxo_test.go b/wallet/utxo_test.go
index 86450ba..d96217c 100644 (file)
--- a/wallet/utxo_test.go
+++ b/wallet/utxo_test.go
@@ -10,14 +10,14 @@ import (
 
        "github.com/vapor/account"
        "github.com/vapor/consensus"
-       dbm "github.com/vapor/database/leveldb"
+       "github.com/vapor/database"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
        "github.com/vapor/testutil"
 )
 
 func TestGetAccountUtxos(t *testing.T) {
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer func() {
                testDB.Close()
                os.RemoveAll("temp")
@@ -209,7 +209,7 @@ func TestGetAccountUtxos(t *testing.T) {
 }
 
 func TestFilterAccountUtxo(t *testing.T) {
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer func() {
                testDB.Close()
                os.RemoveAll("temp")

diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go
index 124b4b0..592bfb1 100644 (file)
--- a/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -18,7 +18,6 @@ import (
        "github.com/vapor/crypto/ed25519/chainkd"
        "github.com/vapor/database"
        "github.com/vapor/database/dbutils"
-       dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/event"
        "github.com/vapor/protocol"
        "github.com/vapor/protocol/bc"
@@ -118,7 +117,7 @@ func TestWalletUpdate(t *testing.T) {
        defer os.RemoveAll(dirPath)
 
        config.CommonConfig = config.DefaultConfig()
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer func() {
                testDB.Close()
                os.RemoveAll("temp")
@@ -215,7 +214,7 @@ func TestRescanWallet(t *testing.T) {
        defer os.RemoveAll(dirPath)
 
        config.CommonConfig = config.DefaultConfig()
-       testDB := dbm.NewDB("testdb", "leveldb", "temp")
+       testDB := database.NewDB("testdb", "leveldb", "temp")
        defer func() {
                testDB.Close()
                os.RemoveAll("temp")
@@ -266,7 +265,7 @@ func TestMemPoolTxQueryLoop(t *testing.T) {
                t.Fatal(err)
        }
        config.CommonConfig = config.DefaultConfig()
-       testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       testDB := database.NewDB("testdb", "leveldb", dirPath)
        defer func() {
                testDB.Close()
                os.RemoveAll(dirPath)