Add mempool new tx subscription support (#1578)

[bytom/bytom.git] / test / util.go

diff --git a/test/util.go b/test/util.go
index 94daf03..e062dc8 100644 (file)
--- a/test/util.go
+++ b/test/util.go
@@ -12,6 +12,7 @@ import (
        "github.com/bytom/consensus"
        "github.com/bytom/crypto/ed25519/chainkd"
        "github.com/bytom/database/leveldb"
+       "github.com/bytom/event"
        "github.com/bytom/protocol"
        "github.com/bytom/protocol/bc"
        "github.com/bytom/protocol/bc/types"
@@ -23,15 +24,11 @@ const (
        assetVersion = 1
 )
 
-// MockTxPool mock transaction pool
-func MockTxPool() *protocol.TxPool {
-       return protocol.NewTxPool()
-}
-
 // MockChain mock chain with genesis block
 func MockChain(testDB dbm.DB) (*protocol.Chain, *leveldb.Store, *protocol.TxPool, error) {
        store := leveldb.NewStore(testDB)
-       txPool := MockTxPool()
+       dispatcher := event.NewDispatcher()
+       txPool := protocol.NewTxPool(store, dispatcher)
        chain, err := protocol.NewChain(store, txPool)
        return chain, store, txPool, err
 }
@@ -48,6 +45,7 @@ func MockUTXO(controlProg *account.CtrlProgram) *account.UTXO {
        utxo.AccountID = controlProg.AccountID
        utxo.Address = controlProg.Address
        utxo.ControlProgramIndex = controlProg.KeyIndex
+       utxo.Change = controlProg.Change
        return utxo
 }
 
@@ -59,15 +57,19 @@ func MockTx(utxo *account.UTXO, testAccount *account.Account) (*txbuilder.Templa
        }
 
        b := txbuilder.NewBuilder(time.Now())
-       b.AddInput(txInput, sigInst)
+       if err := b.AddInput(txInput, sigInst); err != nil {
+               return nil, nil, err
+       }
        out := types.NewTxOutput(*consensus.BTMAssetID, 100, []byte{byte(vm.OP_FAIL)})
-       b.AddOutput(out)
+       if err := b.AddOutput(out); err != nil {
+               return nil, nil, err
+       }
        return b.Build()
 }
 
 // MockSign sign a tx
 func MockSign(tpl *txbuilder.Template, hsm *pseudohsm.HSM, password string) (bool, error) {
-       err := txbuilder.Sign(nil, tpl, nil, password, func(_ context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
+       err := txbuilder.Sign(nil, tpl, password, func(_ context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
                return hsm.XSign(xpub, path, data[:], password)
        })
        if err != nil {