Merge pull request #635 from Bytom/unit_test

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

diff --git a/test/tx_test_util.go b/test/tx_test_util.go
index 4710d23..997c904 100644 (file)
--- a/test/tx_test_util.go
+++ b/test/tx_test_util.go
@@ -71,7 +71,7 @@ func (g *TxGenerator) createAccount(name string, keys []string, quorum int) erro
                }
                xpubs = append(xpubs, *xpub)
        }
-       _, err := g.AccountManager.Create(nil, xpubs, quorum, name, nil)
+       _, err := g.AccountManager.Create(nil, xpubs, quorum, name)
        return err
 }
 
@@ -80,11 +80,11 @@ func (g *TxGenerator) createAsset(accountAlias string, assetAlias string) (*asse
        if err != nil {
                return nil, err
        }
-       return g.Assets.Define(acc.XPubs, len(acc.XPubs), nil, assetAlias, nil)
+       return g.Assets.Define(acc.XPubs, len(acc.XPubs), nil, assetAlias)
 }
 
 func (g *TxGenerator) mockUtxo(accountAlias, assetAlias string, amount uint64) (*account.UTXO, error) {
-       ctrlProg, err := g.createControlProgram(accountAlias)
+       ctrlProg, err := g.createControlProgram(accountAlias, false)
        if err != nil {
                return nil, err
        }
@@ -127,12 +127,12 @@ func (g *TxGenerator) assetAmount(assetAlias string, amount uint64) (*bc.AssetAm
        }, nil
 }
 
-func (g *TxGenerator) createControlProgram(accountAlias string) (*account.CtrlProgram, error) {
+func (g *TxGenerator) createControlProgram(accountAlias string, change bool) (*account.CtrlProgram, error) {
        acc, err := g.AccountManager.FindByAlias(nil, accountAlias)
        if err != nil {
                return nil, err
        }
-       return g.AccountManager.CreateAddress(nil, acc.ID)
+       return g.AccountManager.CreateAddress(nil, acc.ID, change)
 }
 
 // AddSpendInput add a spend input
@@ -208,7 +208,7 @@ func (g *TxGenerator) AddTxOutput(accountAlias, assetAlias string, amount uint64
        if err != nil {
                return err
        }
-       controlProgram, err := g.createControlProgram(accountAlias)
+       controlProgram, err := g.createControlProgram(accountAlias, false)
        if err != nil {
                return err
        }