fix test

plugin/dapp/relay/cmd/test/test-rpc.sh

@@ -18,7 +18,7 @@ relay_CreateRawRelaySaveBTCHeadTx_11() {
 }
 
 relay_CreateRawRelayOrderTx() {
-    local req='{"method":"relay.CreateRawRelayOrderTx","params":[{"operation":0,"coin":"BTC","amount":299000000,"addr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT","btyAmount":1000000000,"coinWaits":6}]}'
+    local req='{"method":"relay.CreateRawRelayOrderTx","params":[{"operation":0,"xCoin":"BTC","xAmount":299000000,"xAddr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT","localCoinAmount":1000000000,"coinWaits":6}]}'
     chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
     chain33_SignAndSendTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
 }
@@ -33,7 +33,7 @@ relay_CreateRawRelayAcceptTx() {
         exit 1
     fi
 
-    local req='{"method":"relay.CreateRawRelayAcceptTx","params":[{"orderId":"'"$id"'","coinAddr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT"}]}'
+    local req='{"method":"relay.CreateRawRelayAcceptTx","params":[{"orderId":"'"$id"'","xAddr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT"}]}'
     chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
     chain33_SignAndSendTx "$RETURN_RESP" "0xec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "${MAIN_HTTP}"
 }
@@ -76,7 +76,7 @@ query_GetRelayOrderByStatus() {
 
 query_GetSellRelayOrder() {
     local req='{"method":"Chain33.Query", "params":[{"execer":"relay","funcName":"GetSellRelayOrder","payload":{"addr":"1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3","status":"pending","coins":["BTC"],"pageNumber":0,"pageSize":0}}]}'
-    resok='(.error|not) and (.result.relayorders[0].status == "pending") and (.result.relayorders[0].coinOperation == 0) and (.result.relayorders[0].id != null)'
+    resok='(.error|not) and (.result.relayorders[0].status == "pending") and (.result.relayorders[0].operation == 0) and (.result.relayorders[0].id != null)'
     chain33_Http "$req" ${MAIN_HTTP} "$resok" "$FUNCNAME"
 }
 

plugin/dapp/relay/executor/relay_test.go

@@ -159,7 +159,7 @@ func (s *suiteRelay) TestExec_1() {
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
 
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 
 	//s.testExecLocal(tx, receipt)
 	//s.testExecDelLocal(tx, receipt)
@@ -319,45 +319,15 @@ func (s *suiteRelay) TestExec_9_QryStatus1() {
 	}
 
 	var OrderIds [][]byte
-	OrderIds = append(OrderIds, []byte(s.orderID))
+	OrderIds = append(OrderIds, []byte(calcRelayOrderID(s.orderID)))
 	s.kvdb.On("List", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(OrderIds, nil).Once()
 	msg, err := s.relay.Query_GetRelayOrderByStatus(addrCoins)
 	s.Nil(err)
-	//s.T().Log(msg.String())
+	s.T().Log(msg.String())
 	s.Contains(msg.String(), "status:finished")
 	//s.Equal(ty.RelayOrderStatus_finished,)
 }
 
-func (s *suiteRelay) TestExec_9_QryStatus2() {
-	addrCoins := &ty.ReqRelayAddrCoins{
-		Addr: addrFrom,
-		//Status: ty.RelayOrderStatus_finished,
-		Coins: []string{"BTC"},
-	}
-
-	var OrderIds [][]byte
-	OrderIds = append(OrderIds, []byte(s.orderID))
-	s.kvdb.On("List", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(OrderIds, nil).Once()
-	msg, err := s.relay.Query_GetSellRelayOrder(addrCoins)
-	s.Nil(err)
-	s.Contains(msg.String(), "status:finished")
-}
-
-func (s *suiteRelay) TestExec_9_QryStatus3() {
-	addrCoins := &ty.ReqRelayAddrCoins{
-		Addr: addrTo,
-		//Status: ty.RelayOrderStatus_finished,
-		Coins: []string{"BTC"},
-	}
-
-	var OrderIds [][]byte
-	OrderIds = append(OrderIds, []byte(s.orderID))
-	s.kvdb.On("List", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(OrderIds, nil).Once()
-	msg, err := s.relay.Query_GetBuyRelayOrder(addrCoins)
-	s.Nil(err)
-	s.Contains(msg.String(), "status:finished")
-}
-
 func (s *suiteRelay) TestExec_9_QryStatus4() {
 	addrCoins := &ty.ReqRelayBtcHeaderHeightList{
 		ReqHeight: 12,

plugin/dapp/relay/executor/relaydb_test.go

@@ -195,7 +195,7 @@ func (s *suiteRelayDB) TestRelayCreate_1() {
 	types.Decode(receipt.Logs[len(receipt.Logs)-1].Log, &log)
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 }
 
 // the test suite function name need sequence so here aUnlock, bCancel
@@ -332,7 +332,7 @@ func (s *suiteAccept) setupRelayCreate() {
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
 
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 }
 
 func (s *suiteAccept) SetupSuite() {
@@ -537,7 +537,7 @@ func (s *suiteConfirm) setupRelayCreate() {
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
 
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 }
 
 func (s *suiteConfirm) SetupSuite() {
@@ -772,7 +772,7 @@ func (s *suiteVerify) setupRelayCreate() {
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
 
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 }
 
 func (s *suiteVerify) setupAccept() {
@@ -1009,7 +1009,7 @@ func (s *suiteVerifyCli) setupRelayCreate() {
 	s.Equal("200.0000", log.LocalCoinAmount)
 	s.Equal(uint64(10), log.XHeight)
 
-	s.orderID = log.OrderId
+	s.orderID = getRealTxHashID(log.OrderId)
 }
 
 func (s *suiteVerifyCli) setupAccept() {