Paging (#234)

[bytom/vapor.git] / wallet / wallet_test.go

diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go
index 9f818ea..ac966f4 100644 (file)
--- a/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -53,7 +53,10 @@ func TestWalletVersion(t *testing.T) {
        defer os.RemoveAll(dirPath)
 
        testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
+       defer func() {
+               testDB.Close()
+               os.RemoveAll("temp")
+       }()
 
        dispatcher := event.NewDispatcher()
        w := mockWallet(testDB, nil, nil, nil, dispatcher, false)
@@ -113,14 +116,18 @@ func TestWalletUpdate(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
+       config.CommonConfig = config.DefaultConfig()
        testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
+       defer func() {
+               testDB.Close()
+               os.RemoveAll("temp")
+       }()
 
        store := database.NewStore(testDB)
        dispatcher := event.NewDispatcher()
        txPool := protocol.NewTxPool(store, dispatcher)
 
-       chain, err := protocol.NewChain(store, txPool)
+       chain, err := protocol.NewChain(store, txPool, dispatcher)
        if err != nil {
                t.Fatal(err)
        }
@@ -149,15 +156,12 @@ func TestWalletUpdate(t *testing.T) {
        controlProg.KeyIndex = 1
 
        reg := asset.NewRegistry(testDB, chain)
-       asset, err := reg.Define([]chainkd.XPub{xpub1.XPub}, 1, nil, 0, "TESTASSET", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
+       asset := bc.AssetID{V0: 5}
 
        utxos := []*account.UTXO{}
        btmUtxo := mockUTXO(controlProg, consensus.BTMAssetID)
        utxos = append(utxos, btmUtxo)
-       OtherUtxo := mockUTXO(controlProg, &asset.AssetID)
+       OtherUtxo := mockUTXO(controlProg, &asset)
        utxos = append(utxos, OtherUtxo)
 
        _, txData, err := mockTxData(utxos, testAccount)
@@ -182,7 +186,7 @@ func TestWalletUpdate(t *testing.T) {
                t.Fatal(err)
        }
 
-       wants, err := w.GetTransactions("")
+       wants, err := w.GetTransactions(testAccount.ID, "", 1, false)
        if len(wants) != 1 {
                t.Fatal(err)
        }
@@ -209,13 +213,17 @@ func TestRescanWallet(t *testing.T) {
        }
        defer os.RemoveAll(dirPath)
 
+       config.CommonConfig = config.DefaultConfig()
        testDB := dbm.NewDB("testdb", "leveldb", "temp")
-       defer os.RemoveAll("temp")
+       defer func() {
+               testDB.Close()
+               os.RemoveAll("temp")
+       }()
 
        store := database.NewStore(testDB)
        dispatcher := event.NewDispatcher()
        txPool := protocol.NewTxPool(store, dispatcher)
-       chain, err := protocol.NewChain(store, txPool)
+       chain, err := protocol.NewChain(store, txPool, dispatcher)
        if err != nil {
                t.Fatal(err)
        }
@@ -256,15 +264,18 @@ func TestMemPoolTxQueryLoop(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       defer os.RemoveAll(dirPath)
-
+       config.CommonConfig = config.DefaultConfig()
        testDB := dbm.NewDB("testdb", "leveldb", dirPath)
+       defer func() {
+               testDB.Close()
+               os.RemoveAll(dirPath)
+       }()
 
        store := database.NewStore(testDB)
        dispatcher := event.NewDispatcher()
        txPool := protocol.NewTxPool(store, dispatcher)
 
-       chain, err := protocol.NewChain(store, txPool)
+       chain, err := protocol.NewChain(store, txPool, dispatcher)
        if err != nil {
                t.Fatal(err)
        }
@@ -293,15 +304,12 @@ func TestMemPoolTxQueryLoop(t *testing.T) {
        controlProg.KeyIndex = 1
 
        reg := asset.NewRegistry(testDB, chain)
-       asset, err := reg.Define([]chainkd.XPub{xpub1.XPub}, 1, nil, 0, "TESTASSET", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
+       asset := bc.AssetID{V0: 5}
 
        utxos := []*account.UTXO{}
        btmUtxo := mockUTXO(controlProg, consensus.BTMAssetID)
        utxos = append(utxos, btmUtxo)
-       OtherUtxo := mockUTXO(controlProg, &asset.AssetID)
+       OtherUtxo := mockUTXO(controlProg, &asset)
        utxos = append(utxos, OtherUtxo)
 
        _, txData, err := mockTxData(utxos, testAccount)