X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=wallet%2Futxo_test.go;h=2df108c3bc27ab9fe63b05818e80d3cdc3de55f6;hp=67780ff95c561806ace931806a131e94ffe86b68;hb=51100c2a5afb320a9b16674f8c66b067fe760eb3;hpb=f30b7541256e6a7f6f875994cb08edf3bddab93c

diff --git a/wallet/utxo_test.go b/wallet/utxo_test.go
index 67780ff9..2df108c3 100644
--- a/wallet/utxo_test.go
+++ b/wallet/utxo_test.go
@@ -18,6 +18,7 @@ import (
 
 func TestGetAccountUtxos(t *testing.T) {
 	testDB := dbm.NewDB("testdb", "leveldb", "temp")
+	testStore := NewMockWalletStore(testDB)
 	defer func() {
 		testDB.Close()
 		os.RemoveAll("temp")
@@ -40,16 +41,16 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 		{
 			dbUtxos: map[string]*account.UTXO{
-				string(account.StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
 					OutputID: bc.Hash{V0: 1},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
 					OutputID: bc.Hash{V0: 2},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
 					OutputID: bc.Hash{V0: 3},
 				},
-				string(account.ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
+				string(ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
 					OutputID: bc.Hash{V0: 4},
 				},
 			},
@@ -64,16 +65,16 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 		{
 			dbUtxos: map[string]*account.UTXO{
-				string(account.StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
 					OutputID: bc.Hash{V0: 1},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
 					OutputID: bc.Hash{V0: 2},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
 					OutputID: bc.Hash{V0: 3},
 				},
-				string(account.ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
+				string(ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
 					OutputID: bc.Hash{V0: 4},
 				},
 			},
@@ -92,16 +93,16 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 		{
 			dbUtxos: map[string]*account.UTXO{
-				string(account.StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 1})): &account.UTXO{
 					OutputID: bc.Hash{V0: 1},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 1, V1: 2})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 1, V1: 2})): &account.UTXO{
 					OutputID: bc.Hash{V0: 1, V1: 2},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 2})): &account.UTXO{
 					OutputID: bc.Hash{V0: 2},
 				},
-				string(account.StandardUTXOKey(bc.Hash{V0: 2, V1: 2})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 2, V1: 2})): &account.UTXO{
 					OutputID: bc.Hash{V0: 2, V1: 2},
 				},
 			},
@@ -121,10 +122,10 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 		{
 			dbUtxos: map[string]*account.UTXO{
-				string(account.StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
 					OutputID: bc.Hash{V0: 3},
 				},
-				string(account.ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
+				string(ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
 					OutputID: bc.Hash{V0: 4},
 				},
 			},
@@ -153,10 +154,10 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 		{
 			dbUtxos: map[string]*account.UTXO{
-				string(account.StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
+				string(StandardUTXOKey(bc.Hash{V0: 3})): &account.UTXO{
 					OutputID: bc.Hash{V0: 3},
 				},
-				string(account.ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
+				string(ContractUTXOKey(bc.Hash{V0: 4})): &account.UTXO{
 					OutputID: bc.Hash{V0: 4},
 				},
 			},
@@ -185,7 +186,7 @@ func TestGetAccountUtxos(t *testing.T) {
 		},
 	}
 
-	w := &Wallet{DB: testDB}
+	w := &Wallet{Store: testStore}
 	for i, c := range cases {
 		for k, u := range c.dbUtxos {
 			data, err := json.Marshal(u)
@@ -195,7 +196,8 @@ func TestGetAccountUtxos(t *testing.T) {
 			testDB.Set([]byte(k), data)
 		}
 
-		w.AccountMgr = account.NewManager(testDB, nil)
+		acccountStore := NewMockAccountStore(testDB)
+		w.AccountMgr = account.NewManager(acccountStore, nil)
 		w.AccountMgr.AddUnconfirmedUtxo(c.unconfirmedUtxos)
 		gotUtxos := w.GetAccountUtxos("", c.id, c.unconfirmed, c.isSmartContract, false)
 		if !testutil.DeepEqual(gotUtxos, c.wantUtxos) {
@@ -210,6 +212,7 @@ func TestGetAccountUtxos(t *testing.T) {
 
 func TestFilterAccountUtxo(t *testing.T) {
 	testDB := dbm.NewDB("testdb", "leveldb", "temp")
+	testStore := NewMockWalletStore(testDB)
 	defer func() {
 		testDB.Close()
 		os.RemoveAll("temp")
@@ -227,7 +230,7 @@ func TestFilterAccountUtxo(t *testing.T) {
 		},
 		{
 			dbPrograms: map[string]*account.CtrlProgram{
-				"436f6e74726163743a2a37a64a4e15a772ab43bf3f5956d0d1f353946496788e7f40d0ff1796286a6f": &account.CtrlProgram{
+				"41533a013a2a37a64a4e15a772ab43bf3f5956d0d1f353946496788e7f40d0ff1796286a6f": &account.CtrlProgram{
 					AccountID: "testAccount",
 					Address:   "testAddress",
 					KeyIndex:  53,
@@ -287,13 +290,13 @@ func TestFilterAccountUtxo(t *testing.T) {
 		},
 		{
 			dbPrograms: map[string]*account.CtrlProgram{
-				"436f6e74726163743a2a37a64a4e15a772ab43bf3f5956d0d1f353946496788e7f40d0ff1796286a6f": &account.CtrlProgram{
+				"41533a013a2a37a64a4e15a772ab43bf3f5956d0d1f353946496788e7f40d0ff1796286a6f": &account.CtrlProgram{
 					AccountID: "testAccount",
 					Address:   "testAddress",
 					KeyIndex:  53,
 					Change:    true,
 				},
-				"436f6e74726163743adb4d86262c12ba70d50b3ca3ae102d5682436243bd1e8c79569603f75675036a": &account.CtrlProgram{
+				"41533a013adb4d86262c12ba70d50b3ca3ae102d5682436243bd1e8c79569603f75675036a": &account.CtrlProgram{
 					AccountID: "testAccount2",
 					Address:   "testAddress2",
 					KeyIndex:  72,
@@ -349,7 +352,12 @@ func TestFilterAccountUtxo(t *testing.T) {
 		},
 	}
 
-	w := &Wallet{DB: testDB}
+	accountStore := NewMockAccountStore(testDB)
+	accountManager := account.NewManager(accountStore, nil)
+	w := &Wallet{
+		Store:      testStore,
+		AccountMgr: accountManager,
+	}
 	for i, c := range cases {
 		for s, p := range c.dbPrograms {
 			data, err := json.Marshal(p)
@@ -717,6 +725,30 @@ func TestTxOutToUtxos(t *testing.T) {
 				},
 			},
 		},
+		{
+			tx: types.NewTx(types.TxData{
+				Inputs: []*types.TxInput{
+					types.NewCoinbaseInput([]byte{0x51}),
+				},
+				Outputs: []*types.TxOutput{
+					types.NewIntraChainOutput(*consensus.BTMAssetID, 0, []byte{0x51}),
+					types.NewIntraChainOutput(*consensus.BTMAssetID, 3, []byte{0x52}),
+				},
+			}),
+			statusFail:  false,
+			blockHeight: 0,
+			wantUtxos: []*account.UTXO{
+				&account.UTXO{
+					OutputID:       bc.Hash{V0: 17248080803965266442, V1: 11280159100206427956, V2: 14296992668077839045, V3: 10053986081220066749},
+					AssetID:        *consensus.BTMAssetID,
+					Amount:         3,
+					ControlProgram: []byte{0x52},
+					SourceID:       bc.Hash{V0: 14680680172533616824, V1: 32429899179491316, V2: 15399988966960786775, V3: 17411722803888206567},
+					SourcePos:      1,
+					ValidHeight:    100,
+				},
+			},
+		},
 	}
 
 	for i, c := range cases {