Commit d21a8b15 authored by pengjun's avatar pengjun

fix rpc-test shell check error

parent e0c3ab44
...@@ -65,13 +65,11 @@ function query_tx() { ...@@ -65,13 +65,11 @@ function query_tx() {
retrieve_Backup() { retrieve_Backup() {
echo "========== # retrieve backup begin ==========" echo "========== # retrieve backup begin =========="
local backupaddr=$1 req='"method":"retrieve.CreateRawRetrieveBackupTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt","delayPeriod": 61}]'
local defaultaddr=$2 tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
local delayPeriod=$3
tx=$(curl -ksd '{"method":"retrieve.CreateRawRetrieveBackupTx","params":[{"backupAddr":"'$backupaddr'","defaultAddr":"'$defaultaddr'","delayPeriod": '$delayPeriod'}]}' ${MAIN_HTTP} | jq -r ".result") reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
data=$(curl -ksd "{$reqDecode}" ${MAIN_HTTP} | jq -r ".result.txs[0]")
data=$(curl -ksd '{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]}' ${MAIN_HTTP} | jq -r ".result.txs[0]")
ok=$(jq '(.execer == "retrieve")' <<<"$data") ok=$(jq '(.execer == "retrieve")' <<<"$data")
[ "$ok" == true ] [ "$ok" == true ]
...@@ -86,12 +84,11 @@ retrieve_Backup() { ...@@ -86,12 +84,11 @@ retrieve_Backup() {
retrieve_Prepare() { retrieve_Prepare() {
echo "========== # retrieve prepare begin ==========" echo "========== # retrieve prepare begin =========="
local backupaddr=$1 req='"method":"retrieve.CreateRawRetrievePrepareTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
local defaultaddr=$2 tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
tx=$(curl -ksd '{"method":"retrieve.CreateRawRetrievePrepareTx","params":[{"backupAddr":"'$backupaddr'","defaultAddr":"'$defaultaddr'"}]}' ${MAIN_HTTP} | jq -r ".result")
data=$(curl -ksd '{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]}' ${MAIN_HTTP} | jq -r ".result.txs[0]") reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
data=$(curl -ksd "{$reqDecode}" ${MAIN_HTTP} | jq -r ".result.txs[0]")
ok=$(jq '(.execer == "retrieve")' <<<"$data") ok=$(jq '(.execer == "retrieve")' <<<"$data")
[ "$ok" == true ] [ "$ok" == true ]
...@@ -106,12 +103,11 @@ retrieve_Prepare() { ...@@ -106,12 +103,11 @@ retrieve_Prepare() {
retrieve_Perform() { retrieve_Perform() {
echo "========== # retrieve perform begin ==========" echo "========== # retrieve perform begin =========="
local backupaddr=$1 req='"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
local defaultaddr=$2 tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
tx=$(curl -ksd '{"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"'$backupaddr'","defaultAddr":"'$defaultaddr'"}]}' ${MAIN_HTTP} | jq -r ".result") reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
data=$(curl -ksd "{$reqDecode}" ${MAIN_HTTP} | jq -r ".result.txs[0]")
data=$(curl -ksd '{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]}' ${MAIN_HTTP} | jq -r ".result.txs[0]")
ok=$(jq '(.execer == "retrieve")' <<<"$data") ok=$(jq '(.execer == "retrieve")' <<<"$data")
[ "$ok" == true ] [ "$ok" == true ]
...@@ -126,12 +122,11 @@ retrieve_Perform() { ...@@ -126,12 +122,11 @@ retrieve_Perform() {
retrieve_Cancel() { retrieve_Cancel() {
echo "========== # retrieve cancel begin ==========" echo "========== # retrieve cancel begin =========="
local backupaddr=$1 req='"method":"retrieve.CreateRawRetrieveCancelTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
local defaultaddr=$2 tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
tx=$(curl -ksd '{"method":"retrieve.CreateRawRetrieveCancelTx","params":[{"backupAddr":"'$backupaddr'","defaultAddr":"'$defaultaddr'"}]}' ${MAIN_HTTP} | jq -r ".result")
data=$(curl -ksd '{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]}' ${MAIN_HTTP} | jq -r ".result.txs[0]") reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
data=$(curl -ksd "{$reqDecode}" ${MAIN_HTTP} | jq -r ".result.txs[0]")
ok=$(jq '(.execer == "retrieve")' <<<"$data") ok=$(jq '(.execer == "retrieve")' <<<"$data")
[ "$ok" == true ] [ "$ok" == true ]
...@@ -146,12 +141,11 @@ retrieve_Cancel() { ...@@ -146,12 +141,11 @@ retrieve_Cancel() {
retrieve_QueryResult() { retrieve_QueryResult() {
echo "========== # retrieve query result begin ==========" echo "========== # retrieve query result begin =========="
local backupaddr=$1
local defaultaddr=$2
local status=$3 local status=$3
data=$(curl -ksd '{"method":"Chain33.Query","params":[{"execer":"retrieve","funcName":"GetRetrieveInfo","payload":{"backupAddress":"'$backupaddr'", "defaultAddress":"'$defaultaddr'"}}]}' ${MAIN_HTTP} | jq -r ".result") req='"method":"Chain33.Query","params":[{"execer":"retrieve","funcName":"GetRetrieveInfo","payload":{"backupAddress":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY", "defaultAddress":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}}]'
ok=$(jq '(.status == '$status')' <<<"$data") data=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
ok=$(jq '(.status == '"$status"')' <<<"$data")
[ "$ok" == true ] [ "$ok" == true ]
echo_rst "$FUNCNAME" "$?" echo_rst "$FUNCNAME" "$?"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment