update master (#487)

[bytom/bytom-spv.git] / protocol / validation / vmcontext_test.go

diff --git a/protocol/validation/vmcontext_test.go b/protocol/validation/vmcontext_test.go
index b31471b..c9e3996 100644 (file)
--- a/protocol/validation/vmcontext_test.go
+++ b/protocol/validation/vmcontext_test.go
@@ -1,29 +1,27 @@
 package validation
 
 import (
-       "encoding/hex"
        "fmt"
        "testing"
 
        "github.com/bytom/errors"
        "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/legacy"
+       "github.com/bytom/protocol/bc/types"
        "github.com/bytom/protocol/vm"
 )
 
 func TestCheckOutput(t *testing.T) {
-       tx := legacy.NewTx(legacy.TxData{
-               ReferenceData: []byte("txref"),
-               Inputs: []*legacy.TxInput{
-                       legacy.NewSpendInput(nil, bc.Hash{}, bc.NewAssetID([32]byte{1}), 5, 1, []byte("spendprog"), bc.Hash{}, []byte("ref")),
-                       legacy.NewIssuanceInput(nil, 6, nil, bc.Hash{}, []byte("issueprog"), nil, nil),
+       tx := types.NewTx(types.TxData{
+               Inputs: []*types.TxInput{
+                       types.NewSpendInput(nil, bc.Hash{}, bc.NewAssetID([32]byte{1}), 5, 1, []byte("spendprog")),
+                       types.NewIssuanceInput(nil, 6, []byte("issueprog"), nil, nil),
                },
-               Outputs: []*legacy.TxOutput{
-                       legacy.NewTxOutput(bc.NewAssetID([32]byte{3}), 8, []byte("wrongprog"), nil),
-                       legacy.NewTxOutput(bc.NewAssetID([32]byte{3}), 8, []byte("controlprog"), nil),
-                       legacy.NewTxOutput(bc.NewAssetID([32]byte{2}), 8, []byte("controlprog"), nil),
-                       legacy.NewTxOutput(bc.NewAssetID([32]byte{2}), 7, []byte("controlprog"), nil),
-                       legacy.NewTxOutput(bc.NewAssetID([32]byte{2}), 7, []byte("controlprog"), []byte("outref")),
+               Outputs: []*types.TxOutput{
+                       types.NewTxOutput(bc.NewAssetID([32]byte{3}), 8, []byte("wrongprog")),
+                       types.NewTxOutput(bc.NewAssetID([32]byte{3}), 8, []byte("controlprog")),
+                       types.NewTxOutput(bc.NewAssetID([32]byte{2}), 8, []byte("controlprog")),
+                       types.NewTxOutput(bc.NewAssetID([32]byte{2}), 7, []byte("controlprog")),
+                       types.NewTxOutput(bc.NewAssetID([32]byte{2}), 7, []byte("controlprog")),
                },
        })
 
@@ -35,7 +33,6 @@ func TestCheckOutput(t *testing.T) {
        cases := []struct {
                // args to CheckOutput
                index     uint64
-               data      []byte
                amount    uint64
                assetID   []byte
                vmVersion uint64
@@ -46,7 +43,6 @@ func TestCheckOutput(t *testing.T) {
        }{
                {
                        index:     4,
-                       data:      mustDecodeHex("1f2a05f881ed9fa0c9068a84823677409f863891a2196eb55dbfbb677a566374"),
                        amount:    7,
                        assetID:   append([]byte{2}, make([]byte, 31)...),
                        vmVersion: 1,
@@ -55,16 +51,14 @@ func TestCheckOutput(t *testing.T) {
                },
                {
                        index:     3,
-                       data:      mustDecodeHex("1f2a05f881ed9fa0c9068a84823677409f863891a2196eb55dbfbb677a566374"),
                        amount:    7,
                        assetID:   append([]byte{2}, make([]byte, 31)...),
                        vmVersion: 1,
                        code:      []byte("controlprog"),
-                       wantOk:    false,
+                       wantOk:    true,
                },
                {
                        index:     0,
-                       data:      []byte{},
                        amount:    1,
                        assetID:   append([]byte{9}, make([]byte, 31)...),
                        vmVersion: 1,
@@ -73,7 +67,6 @@ func TestCheckOutput(t *testing.T) {
                },
                {
                        index:     5,
-                       data:      mustDecodeHex("1f2a05f881ed9fa0c9068a84823677409f863891a2196eb55dbfbb677a566374"),
                        amount:    7,
                        assetID:   append([]byte{2}, make([]byte, 31)...),
                        vmVersion: 1,
@@ -84,27 +77,19 @@ func TestCheckOutput(t *testing.T) {
 
        for i, test := range cases {
                t.Run(fmt.Sprintf("case %d", i), func(t *testing.T) {
-                       gotOk, err := txCtx.checkOutput(test.index, test.data, test.amount, test.assetID, test.vmVersion, test.code, false)
+                       gotOk, err := txCtx.checkOutput(test.index, test.amount, test.assetID, test.vmVersion, test.code, false)
                        if g := errors.Root(err); g != test.wantErr {
-                               t.Errorf("checkOutput(%v, %v, %v, %x, %v, %x) err = %v, want %v",
-                                       test.index, test.data, test.amount, test.assetID, test.vmVersion, test.code,
+                               t.Errorf("checkOutput(%v, %v, %x, %v, %x) err = %v, want %v",
+                                       test.index, test.amount, test.assetID, test.vmVersion, test.code,
                                        g, test.wantErr)
                                return
                        }
                        if gotOk != test.wantOk {
-                               t.Errorf("checkOutput(%v, %v, %v, %x, %v, %x) ok = %v, want %v",
-                                       test.index, test.data, test.amount, test.assetID, test.vmVersion, test.code,
+                               t.Errorf("checkOutput(%v, %v, %x, %v, %x) ok = %t, want %v",
+                                       test.index, test.amount, test.assetID, test.vmVersion, test.code,
                                        gotOk, test.wantOk)
                        }
 
                })
        }
 }
-
-func mustDecodeHex(h string) []byte {
-       bits, err := hex.DecodeString(h)
-       if err != nil {
-               panic(err)
-       }
-       return bits
-}