X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=application%2Fmov%2Fdatabase%2Fmov_store_test.go;fp=application%2Fmov%2Fdatabase%2Fmov_store_test.go;h=022051f58741cee76c3881afd3d0954d72be7dfa;hp=aeb9c3f3aac125bee333531f17b4730d9ea47c72;hb=c3da0e7253209c3b89ea90f21299c6f0821019b7;hpb=77cc98c7744df353f5bdcb3984fcbb56451fd902

diff --git a/application/mov/database/mov_store_test.go b/application/mov/database/mov_store_test.go
index aeb9c3f3..022051f5 100644
--- a/application/mov/database/mov_store_test.go
+++ b/application/mov/database/mov_store_test.go
@@ -26,6 +26,9 @@ var (
 	assetID6 = &bc.AssetID{V0: 6}
 	assetID7 = &bc.AssetID{V0: 7}
 	assetID8 = &bc.AssetID{V0: 8}
+	
+	orderProgram = testutil.MustDecodeHexString("0020184e1cc4ee4845023888810a79eed7a42c02c544cf2c61ceac05e176d575bd4603ed4e0e0210272200204775b9e167e2c1ffe57ae3e5088af69e518be010529b5fdadf4be97656084eec20a3e21b55f44403884457166ad5847fdb5489512ba9611eee466efb9f94319143")
+	sellerProgram = testutil.MustDecodeHexString("00204775b9e167e2c1ffe57ae3e5088af69e518be010529b5fdadf4be97656084eec")
 
 	mockOrders = []*common.Order{
 		&common.Order{
@@ -37,8 +40,9 @@ var (
 				SourceID:       &bc.Hash{V0: 21},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -49,8 +53,9 @@ var (
 				SourceID:       &bc.Hash{V0: 22},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -61,8 +66,9 @@ var (
 				SourceID:       &bc.Hash{V0: 23},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -73,8 +79,9 @@ var (
 				SourceID:       &bc.Hash{V0: 13},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -85,8 +92,9 @@ var (
 				SourceID:       &bc.Hash{V0: 24},
 				Amount:         10,
 				SourcePos:      1,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -97,8 +105,9 @@ var (
 				SourceID:       &bc.Hash{V0: 24},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -109,8 +118,9 @@ var (
 				SourceID:       &bc.Hash{V0: 25},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -121,8 +131,9 @@ var (
 				SourceID:       &bc.Hash{V0: 26},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -133,8 +144,9 @@ var (
 				SourceID:       &bc.Hash{V0: 1},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID1,
@@ -145,8 +157,9 @@ var (
 				SourceID:       &bc.Hash{V0: 2},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID3,
@@ -157,8 +170,9 @@ var (
 				SourceID:       &bc.Hash{V0: 33},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID4,
@@ -169,8 +183,9 @@ var (
 				SourceID:       &bc.Hash{V0: 34},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID4,
@@ -181,8 +196,9 @@ var (
 				SourceID:       &bc.Hash{V0: 36},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID5,
@@ -193,8 +209,9 @@ var (
 				SourceID:       &bc.Hash{V0: 37},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 		&common.Order{
 			FromAssetID:      assetID6,
@@ -205,8 +222,9 @@ var (
 				SourceID:       &bc.Hash{V0: 38},
 				Amount:         1,
 				SourcePos:      0,
-				ControlProgram: []byte("aa"),
+				ControlProgram: orderProgram,
 			},
+			SellerProgram: sellerProgram,
 		},
 	}
 )
@@ -624,8 +642,8 @@ func TestMovStore(t *testing.T) {
 				mockOrders[7],
 				mockOrders[6],
 				mockOrders[2],
-				mockOrders[3],
 				mockOrders[4],
+				mockOrders[3],
 				mockOrders[5],
 				mockOrders[0],
 			},
@@ -663,8 +681,8 @@ func TestMovStore(t *testing.T) {
 			wantOrders: []*common.Order{
 				mockOrders[7],
 				mockOrders[6],
-				mockOrders[3],
 				mockOrders[4],
+				mockOrders[3],
 				mockOrders[5],
 			},
 			wantTradePairs: []*common.TradePair{
@@ -943,8 +961,8 @@ func TestListOrders(t *testing.T) {
 				mockOrders[7],
 				mockOrders[6],
 				mockOrders[2],
-				mockOrders[3],
 				mockOrders[4],
+				mockOrders[3],
 				mockOrders[5],
 				mockOrders[0],
 			},
@@ -963,7 +981,6 @@ func TestListOrders(t *testing.T) {
 			},
 			query: mockOrders[3],
 			wantOrders: []*common.Order{
-				mockOrders[4],
 				mockOrders[5],
 				mockOrders[0],
 			},
@@ -1030,8 +1047,8 @@ func TestAddOrders(t *testing.T) {
 				mockOrders[7],
 				mockOrders[6],
 				mockOrders[2],
-				mockOrders[3],
 				mockOrders[4],
+				mockOrders[3],
 				mockOrders[5],
 				mockOrders[0],
 			},
@@ -1055,8 +1072,8 @@ func TestAddOrders(t *testing.T) {
 				mockOrders[7],
 				mockOrders[6],
 				mockOrders[2],
-				mockOrders[3],
 				mockOrders[4],
+				mockOrders[3],
 				mockOrders[5],
 				mockOrders[0],
 			},