feat: add cross-chain output (#56)

[bytom/vapor.git] / protocol / bc / types / map_test.go

diff --git a/protocol/bc/types/map_test.go b/protocol/bc/types/map_test.go
index 459c107..724ae49 100644 (file)
--- a/protocol/bc/types/map_test.go
+++ b/protocol/bc/types/map_test.go
@@ -18,7 +18,7 @@ func TestMapSpendTx(t *testing.T) {
                                NewSpendInput(nil, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), *consensus.BTMAssetID, 88, 3, []byte{1}),
                        },
                        Outputs: []*TxOutput{
-                               NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
+                               NewIntraChainOutput(*consensus.BTMAssetID, 80, []byte{1}),
                        },
                },
                &TxData{
@@ -26,7 +26,7 @@ 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}),
+                               NewIntraChainOutput(*consensus.BTMAssetID, 80, []byte{1}),
                        },
                },
                &TxData{
@@ -35,8 +35,8 @@ func TestMapSpendTx(t *testing.T) {
                                NewSpendInput(nil, testutil.MustDecodeHash("db7b16ac737440d6e38559996ddabb207d7ce84fbd6f3bfd2525d234761dc863"), *consensus.BTMAssetID, 88, 3, []byte{1}),
                        },
                        Outputs: []*TxOutput{
-                               NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
-                               NewTxOutput(*consensus.BTMAssetID, 80, []byte{1}),
+                               NewIntraChainOutput(*consensus.BTMAssetID, 80, []byte{1}),
+                               NewIntraChainOutput(*consensus.BTMAssetID, 80, []byte{1}),
                        },
                },
        }
@@ -58,7 +58,7 @@ func TestMapSpendTx(t *testing.T) {
                                        t.Errorf("tx.InputIDs[%d]'s asset amount is not equal after map'", i)
                                }
                        case *bc.Spend:
-                               spendOut, err := tx.Output(*newInput.SpentOutputId)
+                               spendOut, err := tx.IntraChainOutput(*newInput.SpentOutputId)
                                if err != nil {
                                        t.Fatal(err)
                                }
@@ -75,19 +75,19 @@ func TestMapSpendTx(t *testing.T) {
                        if !ok {
                                t.Errorf("entryMap contains nothing for header.ResultIds[%d] (%x)", i, tx.ResultIds[i].Bytes())
                        }
-                       newOut, ok := resultEntry.(*bc.Output)
+                       newOut, ok := resultEntry.(*bc.IntraChainOutput)
                        if !ok {
                                t.Errorf("header.ResultIds[%d] has type %T, expected *Output", i, resultEntry)
                        }
 
-                       if *newOut.Source.Value != oldOut.AssetAmount {
-                               t.Errorf("header.ResultIds[%d].(*output).Source is %v, expected %v", i, newOut.Source.Value, oldOut.AssetAmount)
+                       if *newOut.Source.Value != oldOut.AssetAmount() {
+                               t.Errorf("header.ResultIds[%d].(*output).Source is %v, expected %v", i, newOut.Source.Value, oldOut.AssetAmount())
                        }
                        if newOut.ControlProgram.VmVersion != 1 {
                                t.Errorf("header.ResultIds[%d].(*output).ControlProgram.VMVersion is %d, expected 1", i, newOut.ControlProgram.VmVersion)
                        }
-                       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 !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())
                        }
 
                }
@@ -100,7 +100,7 @@ func TestMapCoinbaseTx(t *testing.T) {
                        NewCoinbaseInput([]byte("TestMapCoinbaseTx")),
                },
                Outputs: []*TxOutput{
-                       NewTxOutput(*consensus.BTMAssetID, 800000000000, []byte{1}),
+                       NewIntraChainOutput(*consensus.BTMAssetID, 800000000000, []byte{1}),
                },
        }
        oldOut := txData.Outputs[0]
@@ -125,12 +125,12 @@ func TestMapCoinbaseTx(t *testing.T) {
        if !ok {
                t.Errorf("entryMap contains nothing for output")
        }
-       newOut, ok := outEntry.(*bc.Output)
+       newOut, ok := outEntry.(*bc.IntraChainOutput)
        if !ok {
                t.Errorf("header.ResultIds[0] has type %T, expected *Output", outEntry)
        }
-       if *newOut.Source.Value != oldOut.AssetAmount {
-               t.Errorf("(*output).Source is %v, expected %v", newOut.Source.Value, oldOut.AssetAmount)
+       if *newOut.Source.Value != oldOut.AssetAmount() {
+               t.Errorf("(*output).Source is %v, expected %v", newOut.Source.Value, oldOut.AssetAmount())
        }
 
        muxEntry, ok := tx.Entries[*newOut.Source.Ref]