#484 update rpc_test

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

@@ -270,6 +270,31 @@ function queryTransaction() {
 function init() {
     ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
     echo "ipara=$ispara"
+
+    local main_ip=${MAIN_HTTP//8901/8801}
+    #main chain import pri key
+    #1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt
+    chain33_ImportPrivkey "0x4947ce3c4b845cfed59be2edf47320546116a3ff3af5715a7df094d116039b89" "1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt" "evm" "${main_ip}"
+
+    local ACCOUNT_A="1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt"
+
+    if [ "$ispara" == false ]; then
+        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${main_ip}"
+        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"
+    else
+        # tx fee
+        chain33_applyCoins "$ACCOUNT_A" 1000000000 "${main_ip}"
+        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"
+
+        local para_ip="${MAIN_HTTP}"
+        #para chain import pri key
+        chain33_ImportPrivkey "0x4947ce3c4b845cfed59be2edf47320546116a3ff3af5715a7df094d116039b89" "1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt" "evm" "$para_ip"
+
+        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${para_ip}"
+        chain33_QueryBalance "${ACCOUNT_A}" "$para_ip"
+    fi
+
+    Chain33_SendToAddress "$ACCOUNT_A" "$from" 11000000000
     from="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
     local evm_addr=""
     if [ "$ispara" == "true" ]; then

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

@@ -110,7 +110,7 @@ init() {
     local main_ip=${MAIN_HTTP//8901/8801}
     #main chain import pri key
     #1PdaXiQU994gzh4RcjLir2AbyqcQ3TwnBL
-    chain33_ImportPrivkey "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" "1PdaXiQU994gzh4RcjLir2AbyqcQ3TwnBL" "retrieve1" "${main_ip}"
+    chain33_ImportPrivkey "0x3665fa66d1a17d2fc319a45250c8c8b9302ae0c393c2e39f2ef3b2f6bc40a42d" "1PdaXiQU994gzh4RcjLir2AbyqcQ3TwnBL" "retrieve1" "${main_ip}"
     #13t1hnMNHqQ5K4QPeqq5xmdg2kTbDPtrgx
     chain33_ImportPrivkey "0xed8a078ee44eac473bd1d5c971e231c255badf7f0c2fbdbe31ef34669c441d6f" "13t1hnMNHqQ5K4QPeqq5xmdg2kTbDPtrgx" "retrieve2" "$main_ip"
 
@@ -132,7 +132,7 @@ init() {
         chain33_QueryBalance "${retrieve2}" "$main_ip"
         local para_ip="${MAIN_HTTP}"
         #para chain import pri key
-        chain33_ImportPrivkey "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" "1PdaXiQU994gzh4RcjLir2AbyqcQ3TwnBL" "retrieve1"  "$para_ip"
+        chain33_ImportPrivkey "0x3665fa66d1a17d2fc319a45250c8c8b9302ae0c393c2e39f2ef3b2f6bc40a42d" "1PdaXiQU994gzh4RcjLir2AbyqcQ3TwnBL" "retrieve1"  "$para_ip"
         chain33_ImportPrivkey "0xed8a078ee44eac473bd1d5c971e231c255badf7f0c2fbdbe31ef34669c441d6f" "13t1hnMNHqQ5K4QPeqq5xmdg2kTbDPtrgx" "retrieve2"  "$para_ip"
 
         chain33_applyCoins "$retrieve1" 12000000000 "${para_ip}"

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

@@ -6,9 +6,7 @@ source ../dapp-test-common.sh
 
 MAIN_HTTP=""
 CASE_ERR=""
-tokenAddr="1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
-recvAddr="1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq"
-superManager="0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc"
+tokenAddr="1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq"
 tokenSymbol="ABCDE"
 token_addr=""
 execName="token"
@@ -28,34 +26,6 @@ function echo_rst() {
     fi
 }
 
-function chain33_ImportPrivkey() {
-    local pri=$2
-    local acc=$3
-    local req='"method":"Chain33.ImportPrivkey", "params":[{"privkey":"'"$pri"'", "label":"tokenAddr"}]'
-    echo "#request: $req"
-    resp=$(curl -ksd "{$req}" "$1")
-    echo "#response: $resp"
-    ok=$(jq '(.error|not) and (.result.label=="tokenAddr") and (.result.acc.addr == "'"$acc"'")' <<<"$resp")
-    [ "$ok" == true ]
-    echo_rst "$FUNCNAME" "$?"
-}
-
-function Chain33_SendToAddress() {
-    local from="$1"
-    local to="$2"
-    local amount=$3
-    local req='"method":"Chain33.SendToAddress", "params":[{"from":"'"$from"'","to":"'"$to"'", "amount":'"$amount"', "note":"test\n"}]'
-    #    echo "#request: $req"
-    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
-    #    echo "#response: $resp"
-    ok=$(jq '(.error|not) and (.result.hash|length==66)' <<<"$resp")
-    [ "$ok" == true ]
-    echo_rst "$FUNCNAME" "$?"
-    hash=$(jq '(.result.hash)' <<<"$resp")
-    echo "hash=$hash"
-    #    query_tx "$hash"
-}
-
 function chain33_unlock() {
     ok=$(curl -k -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.isOK")
     [ "$ok" == true ]
@@ -116,7 +86,6 @@ function queryTransaction() {
 function init() {
     ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
     echo "ipara=$ispara"
-    chain33_ImportPrivkey "${MAIN_HTTP}" "${superManager}" "${tokenAddr}"
 
     local main_ip=${MAIN_HTTP//8901/8801}
     #main chain import pri key
@@ -142,14 +111,10 @@ function init() {
     if [ "$ispara" == true ]; then
         execName="user.p.para.token"
         token_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.token"}]}' ${MAIN_HTTP} | jq -r ".result")
-        Chain33_SendToAddress "$recvAddr" "$tokenAddr" 100000000000
-        block_wait 2
         Chain33_SendToAddress "$tokenAddr" "$token_addr" 1000000000
         block_wait 2
     else
         token_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"token"}]}' ${MAIN_HTTP} | jq -r ".result")
-        Chain33_SendToAddress "$recvAddr" "$tokenAddr" 10000000000
-        block_wait 2
         Chain33_SendToAddress "$tokenAddr" "$token_addr" 1000000000
         block_wait 2
     fi