modify rpc test for oracle

plugin/dapp/oracle/cmd/build/test-rpc.sh

@@ -4,6 +4,7 @@
 MAIN_HTTP=""
 CASE_ERR=""
 oracle_addPublisher_unsignedTx="0a066d616e61676512410a3f0a146f7261636c652d7075626c6973682d6576656e741222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a0361646420a08d0630e6b685d696ee9394163a223151344e687572654a784b4e4266373164323642394a336642516f5163666d657a32"
+oracle_addPublisher_unsignedTx_para="0a12757365722e702e706172612e6d616e61676512410a3f0a146f7261636c652d7075626c6973682d6576656e741222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a0361646420a08d0630a186de8894c9aa864d3a22314469484633317577783977356a6a733571514269474a6b4e686e71656564763157"
 oracle_publisher_addr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 oracle_publishers_addr=""
 eventId=""
@@ -26,12 +27,18 @@ echo_rst() {
 
 oracle_AddPublisher(){
     echo "=============== # Add publisher ==============="
-    signAndSendRawTx "${oracle_addPublisher_unsignedTx}" "${oracle_publisher_addr}"
+    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
+    echo "ispara=$ispara"
+    if [ "$ispara" == true ]; then
+        signAndSendRawTx "${oracle_addPublisher_unsignedTx_para}" "${oracle_publisher_addr}"
+    else
+        signAndSendRawTx "${oracle_addPublisher_unsignedTx}" "${oracle_publisher_addr}"
+    fi
 }
 
 oracle_publish_transaction() {
     req='"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventPublish","payload":{"type":"football", "subType":"Premier League","time":1747814996,"content":"test","introduction":"test"}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
@@ -46,7 +53,7 @@ oracle_publish_transaction() {
 oracle_prePublishResult_transaction() {
     event_id=$1
     req='"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultPrePublish","payload":{"eventID":"'"$event_id"'", "source":"sina sport","result":"0:1"}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
@@ -59,7 +66,7 @@ oracle_prePublishResult_transaction() {
 oracle_eventAbort_transaction() {
     event_id=$1
     req='"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventAbort","payload":{"eventID":"'"$event_id"'"}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
@@ -72,7 +79,7 @@ oracle_eventAbort_transaction() {
 oracle_resultAbort_transaction() {
     event_id=$1
     req='"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultAbort","payload":{"eventID":"'"$event_id"'"}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
@@ -85,7 +92,7 @@ oracle_resultAbort_transaction() {
 oracle_publishResult_transaction() {
     event_id=$1
     req='"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultPublish","payload":{"eventID":"'"$event_id"'", "source":"sina sport","result":"1:1"}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
@@ -115,7 +122,7 @@ sendSignedTx() {
     ok=$(echo "${resp}" | jq -r ".error")
     [ "$ok" == null ]
     rst=$?
-    echo_rst "$FUNCNAME" "$rst"
+    #echo_rst "$FUNCNAME" "$rst"
     txhash=$(echo "${resp}" | jq -r ".result")
     echo "tx hash is $txhash"
 }
@@ -123,7 +130,7 @@ sendSignedTx() {
 oracle_QueryOraclesByID() {
     event_id=$1
     local req='"method":"Chain33.Query", "params":[{"execer":"oracle","funcName":"QueryOraclesByIDs","payload":{"eventID":["'"$event_id"'"]}}]'
-    echo "#request: $req"
+    #echo "#request: $req"
     resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
     echo "#response: $resp"
     ok=$(jq '(.error|not) and (.result.status[0] | [has("eventID", "status", "type", "subType", "source"),true] | unique | length == 1)' <<<"$resp")
@@ -183,7 +190,7 @@ function run_test() {
     # 事件正式发布
     oracle_publishResult_transaction "$eventId"
     # 根据ID查询事件
-    block_wait 1
+    block_wait 2
     oracle_QueryOraclesByID "$eventId"
 
     # 生成发布事件的交易
@@ -191,7 +198,7 @@ function run_test() {
     # 取消事件发布
     oracle_eventAbort_transaction "$eventId"
     # 根据ID查询事件
-    block_wait 1
+    block_wait 2
     oracle_QueryOraclesByID "$eventId"
 
     # 生成发布事件的交易
@@ -201,7 +208,7 @@ function run_test() {
     # 取消事件预发布
     oracle_resultAbort_transaction "$eventId"
     # 根据ID查询事件
-    block_wait 1
+    block_wait 2
     oracle_QueryOraclesByID "$eventId"
 
 }