feat: add cross-chain output (#56)

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

diff --git a/test/tx_test_util.go b/test/tx_test_util.go
index 009a51c..3279fe7 100644 (file)
--- a/test/tx_test_util.go
+++ b/test/tx_test_util.go
@@ -212,7 +212,7 @@ func (g *TxGenerator) AddTxOutput(accountAlias, assetAlias string, amount uint64
        if err != nil {
                return err
        }
-       out := types.NewTxOutput(*assetAmount.AssetId, assetAmount.Amount, controlProgram.ControlProgram)
+       out := types.NewIntraChainOutput(*assetAmount.AssetId, assetAmount.Amount, controlProgram.ControlProgram)
        return g.Builder.AddOutput(out)
 }
 
@@ -223,7 +223,7 @@ func (g *TxGenerator) AddRetirement(assetAlias string, amount uint64) error {
                return err
        }
        retirementProgram := []byte{byte(vm.OP_FAIL)}
-       out := types.NewTxOutput(*assetAmount.AssetId, assetAmount.Amount, retirementProgram)
+       out := types.NewIntraChainOutput(*assetAmount.AssetId, assetAmount.Amount, retirementProgram)
        return g.Builder.AddOutput(out)
 }
 
@@ -264,8 +264,8 @@ func txFee(tx *types.Tx) uint64 {
        }
 
        for _, output := range tx.Outputs {
-               if *output.AssetId == *consensus.BTMAssetID {
-                       outputSum += output.Amount
+               if *output.AssetAmount().AssetId == *consensus.BTMAssetID {
+                       outputSum += output.AssetAmount().Amount
                }
        }
        return inputSum - outputSum
@@ -274,7 +274,7 @@ func txFee(tx *types.Tx) uint64 {
 // CreateSpendInput create SpendInput which spent the output from tx
 func CreateSpendInput(tx *types.Tx, outputIndex uint64) (*types.SpendInput, error) {
        outputID := tx.ResultIds[outputIndex]
-       output, ok := tx.Entries[*outputID].(*bc.Output)
+       output, ok := tx.Entries[*outputID].(*bc.IntraChainOutput)
        if !ok {
                return nil, fmt.Errorf("retirement can't be spent")
        }
@@ -362,7 +362,7 @@ func CreateCoinbaseTx(controlProgram []byte, height, txsFee uint64) (*types.Tx,
        if err := builder.AddInput(types.NewCoinbaseInput([]byte(string(height))), &txbuilder.SigningInstruction{}); err != nil {
                return nil, err
        }
-       if err := builder.AddOutput(types.NewTxOutput(*consensus.BTMAssetID, coinbaseValue, controlProgram)); err != nil {
+       if err := builder.AddOutput(types.NewIntraChainOutput(*consensus.BTMAssetID, coinbaseValue, controlProgram)); err != nil {
                return nil, err
        }
 
@@ -392,7 +392,7 @@ func CreateTxFromTx(baseTx *types.Tx, outputIndex uint64, outputAmount uint64, c
                AssetVersion: assetVersion,
                TypedInput:   spendInput,
        }
-       output := types.NewTxOutput(*consensus.BTMAssetID, outputAmount, ctrlProgram)
+       output := types.NewIntraChainOutput(*consensus.BTMAssetID, outputAmount, ctrlProgram)
        builder := txbuilder.NewBuilder(time.Now())
        if err := builder.AddInput(txInput, &txbuilder.SigningInstruction{}); err != nil {
                return nil, err