Merge pull request #693 from caopingcp/ticket_rpctest

build/dapp-test-rpc.sh

@@ -16,7 +16,7 @@ function dapp_test_rpc() {
         dapps=$(find . -maxdepth 1 -type d ! -name dapptest ! -name . | sed 's/^\.\///' | sort)
         echo "dapps list: $dapps"
         set +e
-        parallel -k --retries 3 --joblog ./jobs.log 'echo tried {} >>./retries.log; ./{}/"'"${RPC_TESTFILE}"'" "'"$ip"'"' ::: "$dapps"
+        parallel -k --joblog ./jobs.log 'echo tried {} >>./retries.log; ./{}/"'"${RPC_TESTFILE}"'" "'"$ip"'"' ::: "$dapps"
         local ret=$?
         # retries 3 times if one dapp fail
         echo "============ # retried dapps log: ============="

build/docker-compose.sh

@@ -382,6 +382,17 @@ function transfer() {
 }
 
 function dapp_test_address() {
+    echo "=========== # allocation for ticket rpc test ============="
+    hash=$(${1} send coins transfer -a 8600 -n transfer -t 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138)
+    echo "${hash}"
+
+    tx_wait "${1}" "${hash}"
+
+    hash=$(${1} send coins transfer -a 1500 -n transfer -t 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
+    echo "${hash}"
+
+    tx_wait "${1}" "${hash}"
+
     echo "=========== # import private key dapptest1 mining ============="
     result=$(${1} account import_key -k 56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138 -l dapptest1 | jq ".label")
     echo "${result}"
@@ -403,11 +414,6 @@ function dapp_test_address() {
 
     block_wait "${1}" 1
 
-    hash=$(${1} send coins transfer -a 1500 -n transfer -t 1PUiGcbsccfxW3zuvHXZBJfznziph5miAo -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
-    echo "${hash}"
-
-    tx_wait "${1}" "${hash}"
-
     #total allocation for rpc test
     hash=$(${1} send coins transfer -a 8000 -n transfer -t 1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
     echo "${hash}"

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

@@ -130,8 +130,8 @@ function run_testcases() {
     returnAddr2="1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB"
     returnPriv2="0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d"
 
-    chain33_SendToAddress "${minerAddr1}" "${minerAddr2}" 100000000 "${MAIN_HTTP}"
-    chain33_SendToAddress "${minerAddr1}" "${returnAddr2}" $((price + 5 * 100000000)) "${MAIN_HTTP}"
+    chain33_QueryBalance "${returnAddr2}" "${MAIN_HTTP}"
+    chain33_applyCoins "${minerAddr2}" 1000000000 "${MAIN_HTTP}"
 
     ticket_SetAutoMining 0
     ticket_GetTicketCount