X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Fbc%2Ftypes%2Fmap_test.go;h=6f0b2b5b5e53ec869a139144d99f997484f22efb;hb=5795ec4c889372675cc00b357aed34ea1cf940c0;hp=21913f3ffec83a3c77b2e830c5bc9f755926a37c;hpb=22951ebb6ef915d848593eea4ab2a46abdff681f;p=bytom%2Fbytom.git

diff --git a/protocol/bc/types/map_test.go b/protocol/bc/types/map_test.go
index 21913f3f..6f0b2b5b 100644
--- a/protocol/bc/types/map_test.go
+++ b/protocol/bc/types/map_test.go
@@ -2,23 +2,24 @@ package types
 
 import (
 	"bytes"
+	"reflect"
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
 
-	"github.com/bytom/consensus"
-	"github.com/bytom/protocol/bc"
-	"github.com/bytom/testutil"
+	"github.com/bytom/bytom/consensus"
+	"github.com/bytom/bytom/protocol/bc"
+	"github.com/bytom/bytom/testutil"
 )
 
 func TestMapSpendTx(t *testing.T) {
 	cases := []*TxData{
 		&TxData{
 			Inputs: []*TxInput{
-				NewSpendInput(nil, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), *consensus.BTMAssetID, 88, 3, []byte{1}),
+				NewSpendInput(nil, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), *consensus.BTMAssetID, 88, 3, []byte{1}, [][]byte{[]byte{2}}),
 			},
 			Outputs: []*TxOutput{
-				NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
+				NewOriginalTxOutput(*consensus.BTMAssetID, 80, []byte{1}, [][]byte{[]byte{2}}),
 			},
 		},
 		&TxData{
@@ -26,17 +27,17 @@ func TestMapSpendTx(t *testing.T) {
 				NewIssuanceInput([]byte("nonce"), 254354, []byte("issuanceProgram"), [][]byte{[]byte("arguments1"), []byte("arguments2")}, []byte("assetDefinition")),
 			},
 			Outputs: []*TxOutput{
-				NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
+				NewOriginalTxOutput(*consensus.BTMAssetID, 80, []byte{1}, [][]byte{[]byte{2}}),
 			},
 		},
 		&TxData{
 			Inputs: []*TxInput{
 				NewIssuanceInput([]byte("nonce"), 254354, []byte("issuanceProgram"), [][]byte{[]byte("arguments1"), []byte("arguments2")}, []byte("assetDefinition")),
-				NewSpendInput(nil, testutil.MustDecodeHash("db7b16ac737440d6e38559996ddabb207d7ce84fbd6f3bfd2525d234761dc863"), *consensus.BTMAssetID, 88, 3, []byte{1}),
+				NewSpendInput(nil, testutil.MustDecodeHash("db7b16ac737440d6e38559996ddabb207d7ce84fbd6f3bfd2525d234761dc863"), *consensus.BTMAssetID, 88, 3, []byte{1}, [][]byte{[]byte{2}}),
 			},
 			Outputs: []*TxOutput{
-				NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
-				NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
+				NewOriginalTxOutput(*consensus.BTMAssetID, 80, []byte{1}, [][]byte{[]byte{2}}),
+				NewOriginalTxOutput(*consensus.BTMAssetID, 80, []byte{1}, [][]byte{[]byte{2}}),
 			},
 		},
 	}
@@ -89,6 +90,9 @@ func TestMapSpendTx(t *testing.T) {
 			if !bytes.Equal(newOut.ControlProgram.Code, oldOut.ControlProgram) {
 				t.Errorf("header.ResultIds[%d].(*output).ControlProgram.Code is %x, expected %x", i, newOut.ControlProgram.Code, oldOut.ControlProgram)
 			}
+			if !reflect.DeepEqual(newOut.StateData.StateData, oldOut.StateData) {
+				t.Errorf("header.ResultIds[%d].(*output).StateData.StateData is %x, expected %x", i, newOut.StateData.StateData, oldOut.StateData)
+			}
 
 		}
 	}
@@ -100,7 +104,7 @@ func TestMapCoinbaseTx(t *testing.T) {
 			NewCoinbaseInput([]byte("TestMapCoinbaseTx")),
 		},
 		Outputs: []*TxOutput{
-			NewTxOutput(*consensus.BTMAssetID, 800000000000, []byte{1}),
+			NewOriginalTxOutput(*consensus.BTMAssetID, 800000000000, []byte{1}, [][]byte{[]byte{2}}),
 		},
 	}
 	oldOut := txData.Outputs[0]
@@ -114,8 +118,8 @@ func TestMapCoinbaseTx(t *testing.T) {
 	if len(tx.SpentOutputIDs) != 0 {
 		t.Errorf("coinbase tx doesn't spend any utxo")
 	}
-	if len(tx.GasInputIDs) != 0 {
-		t.Errorf("coinbase tx doesn't spend any gas input")
+	if len(tx.GasInputIDs) != 1 {
+		t.Errorf("coinbase tx should have 1 gas input")
 	}
 	if len(tx.ResultIds) != 1 {
 		t.Errorf("expect to  only have one output")