X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=protocol%2Fbc%2Ftypes%2Ftransaction_test.go;h=0213ebb9a3a7e49d1cf588bf446359653e701f3d;hp=993fe5e9c4985b6a4cf65181739d612af54ed115;hb=089cb9074ed375e28850d2ff8b5e91164a04046d;hpb=a8fcbab90cbbfcc0acea0a4bd1389e39ece3da56

diff --git a/protocol/bc/types/transaction_test.go b/protocol/bc/types/transaction_test.go
index 993fe5e9..0213ebb9 100644
--- a/protocol/bc/types/transaction_test.go
+++ b/protocol/bc/types/transaction_test.go
@@ -41,73 +41,6 @@ func TestTransaction(t *testing.T) {
 		{
 			tx: NewTx(TxData{
 				Version:        1,
-				SerializedSize: uint64(263),
-				TimeRange:      654,
-				Inputs: []*TxInput{
-					NewIssuanceInput([]byte("nonce"), 254354, []byte("issuanceProgram"), [][]byte{[]byte("arguments1"), []byte("arguments2")}, []byte("assetDefinition")),
-					NewSpendInput([][]byte{[]byte("arguments3"), []byte("arguments4")}, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), *consensus.BTMAssetID, 254354, 3, []byte("spendProgram")),
-				},
-				Outputs: []*TxOutput{
-					NewIntraChainOutput(testutil.MustDecodeAsset("a69849e11add96ac7053aad22ba2349a4abf5feb0475a0afcadff4e128be76cf"), 254354, []byte("true")),
-				},
-			}),
-			hex: strings.Join([]string{
-				"07",         // serflags
-				"01",         // transaction version
-				"8e05",       // tx time range
-				"02",         // inputs count
-				"01",         // input 0: asset version
-				"2a",         // input 0: serialization length
-				"00",         // input 0: issuance type flag
-				"05",         // input 0: nonce length
-				"6e6f6e6365", // input 0: nonce
-				"a69849e11add96ac7053aad22ba2349a4abf5feb0475a0afcadff4e128be76cf", // input 0: assetID
-				"92c30f", // input 0: amount
-				"38",     // input 0: input witness length
-				"0f",     // input 0: asset definition length
-				"6173736574446566696e6974696f6e", // input 0: asset definition
-				"01", // input 0: vm version
-				"0f", // input 0: issuanceProgram length
-				"69737375616e636550726f6772616d", // input 0: issuance program
-				"02", // input 0: argument array length
-				"0a", // input 0: first argument length
-				"617267756d656e747331", // input 0: first argument data
-				"0a", // input 0: second argument length
-				"617267756d656e747332", // input 0: second argument data
-				"01", // input 1: asset version
-				"54", // input 1: input commitment length
-				"01", // input 1: spend type flag
-				"52", // input 1: spend commitment length
-				"fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409", // input 1: source id
-				"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // input 1: assetID
-				"92c30f", // input 1: amount
-				"03",     // input 1: source position
-				"01",     // input 1: vm version
-				"0c",     // input 1: spend program length
-				"7370656e6450726f6772616d", // input 1: spend program
-				"17", // input 1: witness length
-				"02", // input 1: argument array length
-				"0a", // input 1: first argument length
-				"617267756d656e747333", // input 1: first argument data
-				"0a", // input 1: second argument length
-				"617267756d656e747334", // input 1: second argument data
-				"01", // outputs count
-				"01", // output 0: asset version
-				"2b", // output 0: serialization length
-				"00", // output 0: outType
-				"29", // output 0: output commitment length
-				"a69849e11add96ac7053aad22ba2349a4abf5feb0475a0afcadff4e128be76cf", // output 0: assetID
-				"92c30f",   // output 0: amount
-				"01",       // output 0: version
-				"04",       // output 0: control program length
-				"74727565", // output 0: control program
-				"00",       // output 0: witness length
-			}, ""),
-			hash: testutil.MustDecodeHash("d6a1f6ea3cc3c53c3cdcd10bbd446c643f23b37ca5e87665d03f204de8c7dc2a"),
-		},
-		{
-			tx: NewTx(TxData{
-				Version:        1,
 				SerializedSize: uint64(112),
 				Inputs: []*TxInput{
 					NewCoinbaseInput([]byte("arbitrary")),
@@ -189,84 +122,6 @@ func TestTransaction(t *testing.T) {
 	}
 }
 
-func TestTransactionTrailingGarbage(t *testing.T) {
-	// validTxHex is a valid tx, we don't care what's inside as long as it's valid
-	validTxHex := `07010001012b00030a0908916133a0d64d1d973b631e226ef95338ad4a536b95635f32f0d04708a6f2a26380a094a58d1d0900010101010301020301012b0029000000000000000000000000000000000000000000000000000000000000000080a094a58d1d01010100`
-	validTx := Tx{}
-	if err := validTx.UnmarshalText([]byte(validTxHex)); err != nil {
-		t.Fatal(err)
-	}
-
-	invalidTxHex := validTxHex + strings.Repeat("00", 10)
-	invalidTx := Tx{}
-	if err := invalidTx.UnmarshalText([]byte(invalidTxHex)); err == nil {
-		t.Fatal("expected error with trailing garbage but got nil")
-	}
-}
-
-func TestInvalidIssuance(t *testing.T) {
-	hex := strings.Join([]string{
-		"07",     // serflags
-		"01",     // transaction version
-		"00",     // tx maxtime
-		"01",     // inputs count
-		"01",     // input 0, asset version
-		"2b",     // input 0, input commitment length prefix
-		"00",     // input 0, input commitment, "issuance" type
-		"03",     // input 0, input commitment, nonce length prefix
-		"0a0908", // input 0, input commitment, nonce
-		"0000000000000000000000000000000000000000000000000000000000000000", // input 0, input commitment, WRONG asset id
-		"80a094a58d1d", // input 0, input commitment, amount
-		"29",           // input 0, issuance input witness length prefix
-		"03deff1d4319d67baa10a6d26c1fea9c3e8d30e33474efee1a610a9bb49d758d", // input 0, issuance input witness, initial block
-		"00",     // input 0, issuance input witness, asset definition
-		"01",     // input 0, issuance input witness, vm version
-		"01",     // input 0, issuance input witness, issuance program length prefix
-		"01",     // input 0, issuance input witness, issuance program
-		"01",     // input 0, issuance input witness, arguments count
-		"03",     // input 0, issuance input witness, argument 0 length prefix
-		"010203", // input 0, issuance input witness, argument 0
-		"01",     // outputs count
-		"01",     // output 0, asset version
-		"2b",     // output 0, serialization length
-		"00",     // output 0, outType
-		"29",     // output 0, output commitment length
-		"0000000000000000000000000000000000000000000000000000000000000000", // output 0, output commitment, asset id
-		"80a094a58d1d",   // output 0, output commitment, amount
-		"01",             // output 0, output commitment, vm version
-		"0101",           // output 0, output commitment, control program
-		"066f7574707574", // output 0, reference data
-		"00",             // output 0, output witness
-		"0869737375616e6365",
-	}, "")
-
-	tx := new(TxData)
-	if err := tx.UnmarshalText([]byte(hex)); errors.Root(err) != errBadAssetID {
-		t.Errorf("want errBadAssetID, got %v", err)
-	}
-}
-
-func TestFuzzUnknownAssetVersion(t *testing.T) {
-	rawTx := `07010001012b00030a0908916133a0d64d1d973b631e226ef95338ad4a536b95635f32f0d04708a6f2a26380a094a58d1d0900010101010301020301012b0029000000000000000000000000000000000000000000000000000000000000000080a094a58d1d01010100`
-	want := Tx{}
-	if err := want.UnmarshalText([]byte(rawTx)); err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := want.MarshalText()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	got := Tx{}
-	if err = got.UnmarshalText(b); err != nil {
-		t.Fatal(err)
-	}
-	if got.ID.String() != want.ID.String() {
-		t.Errorf("tx id changed to %s", got.ID.String())
-	}
-}
-
 func BenchmarkTxWriteToTrue(b *testing.B) {
 	tx := &Tx{}
 	for i := 0; i < b.N; i++ {