Add vote output (#1879)

[bytom/bytom.git] / wallet / utxo_test.go

diff --git a/wallet/utxo_test.go b/wallet/utxo_test.go
index 85157e3..8fc96aa 100644 (file)
--- a/wallet/utxo_test.go
+++ b/wallet/utxo_test.go
@@ -8,13 +8,12 @@ import (
        "sort"
        "testing"
 
-       dbm "github.com/tendermint/tmlibs/db"
-
-       "github.com/bytom/account"
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/consensus"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestGetAccountUtxos(t *testing.T) {
@@ -251,11 +250,6 @@ func TestFilterAccountUtxo(t *testing.T) {
                                        ControlProgramIndex: 53,
                                        Change:              true,
                                },
-                               &account.UTXO{
-                                       ControlProgram: []byte{0x91},
-                                       AssetID:        bc.AssetID{V0: 1},
-                                       Amount:         4,
-                               },
                        },
                },
                {
@@ -272,13 +266,7 @@ func TestFilterAccountUtxo(t *testing.T) {
                                        Amount:         3,
                                },
                        },
-                       wantUtxos: []*account.UTXO{
-                               &account.UTXO{
-                                       ControlProgram: []byte{0x91},
-                                       AssetID:        bc.AssetID{V0: 1},
-                                       Amount:         3,
-                               },
-                       },
+                       wantUtxos: []*account.UTXO{},
                },
                {
                        dbPrograms: map[string]*account.CtrlProgram{
@@ -388,7 +376,7 @@ func TestTxInToUtxos(t *testing.T) {
                                        types.NewCoinbaseInput([]byte{0x51}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(*consensus.BTMAssetID, 41250000000, []byte{0x51}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 41250000000, []byte{0x51}),
                                },
                        }),
                        statusFail: false,
@@ -400,7 +388,7 @@ func TestTxInToUtxos(t *testing.T) {
                                        types.NewIssuanceInput([]byte{}, 4125, []byte{0x51}, [][]byte{}, []byte{}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(*consensus.BTMAssetID, 4125, []byte{0x51}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 4125, []byte{0x51}),
                                },
                        }),
                        statusFail: false,
@@ -415,8 +403,8 @@ func TestTxInToUtxos(t *testing.T) {
                                        types.NewSpendInput([][]byte{}, bc.Hash{V0: 4}, *consensus.BTMAssetID, 7, 4, []byte{0x54}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 4, []byte{0x51}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 12, []byte{0x53}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 4, []byte{0x51}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 12, []byte{0x53}),
                                },
                        }),
                        statusFail: false,
@@ -464,8 +452,8 @@ func TestTxInToUtxos(t *testing.T) {
                                        types.NewSpendInput([][]byte{}, bc.Hash{V0: 4}, *consensus.BTMAssetID, 7, 4, []byte{0x54}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 4, []byte{0x51}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 12, []byte{0x53}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 4, []byte{0x51}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 12, []byte{0x53}),
                                },
                        }),
                        statusFail: true,
@@ -518,7 +506,7 @@ func TestTxOutToUtxos(t *testing.T) {
                                        types.NewCoinbaseInput([]byte{0x51}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(*consensus.BTMAssetID, 41250000000, []byte{0x51}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 41250000000, []byte{0x51}),
                                },
                        }),
                        statusFail:  false,
@@ -542,10 +530,10 @@ func TestTxOutToUtxos(t *testing.T) {
                                        types.NewSpendInput([][]byte{}, bc.Hash{V0: 2}, *consensus.BTMAssetID, 7, 1, []byte{0x51}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 2, []byte{0x51}),
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 3, []byte{0x52}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 2, []byte{0x53}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 5, []byte{0x54}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 2, []byte{0x51}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 3, []byte{0x52}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 2, []byte{0x53}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 5, []byte{0x54}),
                                },
                        }),
                        statusFail:  false,
@@ -592,10 +580,10 @@ func TestTxOutToUtxos(t *testing.T) {
                                        types.NewSpendInput([][]byte{}, bc.Hash{V0: 2}, *consensus.BTMAssetID, 7, 1, []byte{0x51}),
                                },
                                Outputs: []*types.TxOutput{
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 2, []byte{0x51}),
-                                       types.NewTxOutput(bc.AssetID{V0: 1}, 3, []byte{0x52}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 2, []byte{0x53}),
-                                       types.NewTxOutput(*consensus.BTMAssetID, 5, []byte{0x54}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 2, []byte{0x51}),
+                                       types.NewOriginalTxOutput(bc.AssetID{V0: 1}, 3, []byte{0x52}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 2, []byte{0x53}),
+                                       types.NewOriginalTxOutput(*consensus.BTMAssetID, 5, []byte{0x54}),
                                },
                        }),
                        statusFail:  true,