Skip to content

P
plugin
Unverified Commit bccbf066 authored by vipwzw's avatar vipwzw Committed by GitHub
Browse files
Options

Merge pull request #510 from mdj33/issue484_rpc_test_issue

rpc test
parents fa08450c 6624d035
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 29 deletions
build/dapp-test-common.sh
View file @ bccbf066
...@@ -96,6 +96,7 @@ chain33_SendToAddress() { ...@@ -96,6 +96,7 @@ chain33_SendToAddress() {
[ "$ok" == true ] [ "$ok" == true ]
hash=$(jq -r ".result.hash" <<<"$resp") hash=$(jq -r ".result.hash" <<<"$resp")
echo "hash"
chain33_QueryTx "$hash" "$MAIN_HTTP" chain33_QueryTx "$hash" "$MAIN_HTTP"
} }
...@@ -164,3 +165,28 @@ chain33_LastBlockhash() { ...@@ -164,3 +165,28 @@ chain33_LastBlockhash() {
LAST_BLOCK_HASH=$result LAST_BLOCK_HASH=$result
echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######" echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######"
} }
chain33_applyCoins() {
echo "chain33_getMainChainCoins"
if [ "$#" -lt 3 ]; then
echo "chain33_getMainCoins wrong params"
exit 1
fi
local targetAddr=$1
local count=$2
local ip=$3
if [ "$count" -gt 15000000000 ]; then
echo "chain33_getMainCoins wrong coins count,should less than 150 00000000"
exit 1
fi
local poolAddr="1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx"
chain33_SendToAddress "${poolAddr}" "${targetAddr}" "$count" "${ip}"
}
chain33_debug_function() {
set -x
eval "$@"
set +x
}
build/dapp-test-rpc.sh
View file @ bccbf066
...@@ -10,7 +10,8 @@ function dapp_test_rpc() { ...@@ -10,7 +10,8 @@ function dapp_test_rpc() {
if [ -d dapptest ]; then if [ -d dapptest ]; then
cp $DAPP_TEST_COMMON dapptest/ cp $DAPP_TEST_COMMON dapptest/
cd dapptest || return cd dapptest || return
dir=$(find . -maxdepth 1 -type d ! -name dapptest ! -name . | sed 's/^\.\///') dir=$(find . -maxdepth 1 -type d ! -name dapptest ! -name multisig ! -name paracross ! -name evm ! -name game ! -name guess ! -name hashlock ! -name js ! -name ticket ! -name lottery ! -name pokerbull ! -name retrieve ! -name token ! -name trade ! -name unfreeze ! -name . | sed 's/^\.\///' | sort)
echo "dapps list: $dir"
for app in $dir; do for app in $dir; do
echo "=========== # $app rpc test =============" echo "=========== # $app rpc test ============="
./"$app/${RPC_TESTFILE}" "$ip" ./"$app/${RPC_TESTFILE}" "$ip"
......
build/docker-compose.sh
View file @ bccbf066
...@@ -103,6 +103,9 @@ function base_init() { ...@@ -103,6 +103,9 @@ function base_init() {
# ticket # ticket
sed -i $sedfix 's/^ticketPrice =.*/ticketPrice = 10000/g' chain33.toml sed -i $sedfix 's/^ticketPrice =.*/ticketPrice = 10000/g' chain33.toml
#relay genesis
sed -i $sedfix 's/^genesis="12qyocayNF7.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g' chain33.toml
} }
function start() { function start() {
...@@ -377,11 +380,21 @@ function dapp_test_address() { ...@@ -377,11 +380,21 @@ function dapp_test_address() {
if [ -z "${result}" ]; then if [ -z "${result}" ]; then
exit 1 exit 1
fi fi
result=$(${1} account import_key -k 9d315182e56fde7fadb94408d360203894e5134216944e858f9b31f70e9ecf40 -l rpctestpooladdr | jq ".label")
echo "${result}"
if [ -z "${result}" ]; then
exit 1
fi
sleep 1 sleep 1
hash=$(${1} send coins transfer -a 1500 -n transfer -t 1PUiGcbsccfxW3zuvHXZBJfznziph5miAo -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989) hash=$(${1} send coins transfer -a 1500 -n transfer -t 1PUiGcbsccfxW3zuvHXZBJfznziph5miAo -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
echo "${hash}" echo "${hash}"
#total allocation for rpc test
hash=$(${1} send coins transfer -a 8000 -n transfer -t 1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
echo "${hash}"
block_wait "${1}" 1 block_wait "${1}" 1
} }
...@@ -430,7 +443,7 @@ function main() { ...@@ -430,7 +443,7 @@ function main() {
dapp_run test "${ip}" dapp_run test "${ip}"
### rpc test ### ### rpc test ###
#rpc_test "${ip}" rpc_test "${ip}"
### finish ### ### finish ###
check_docker_container check_docker_container
......
plugin/dapp/multisig/cmd/build/test-rpc.sh 100644 → 100755
View file @ bccbf066
File mode changed from 100644 to 100755
plugin/dapp/paracross/cmd/build/testcase.sh
View file @ bccbf066
...@@ -50,7 +50,7 @@ function para_set_toml() { ...@@ -50,7 +50,7 @@ function para_set_toml() {
sed -i $xsedfix 's/^whitelist=.*/whitelist=["localhost","127.0.0.1","0.0.0.0"]/g' "${1}" sed -i $xsedfix 's/^whitelist=.*/whitelist=["localhost","127.0.0.1","0.0.0.0"]/g' "${1}"
sed -i $xsedfix 's/^ParaRemoteGrpcClient=.*/ParaRemoteGrpcClient="nginx:8803"/g' "${1}" sed -i $xsedfix 's/^ParaRemoteGrpcClient=.*/ParaRemoteGrpcClient="nginx:8803"/g' "${1}"
sed -i $xsedfix 's/^genesis="1JmFaA6unrCFYEWP.*/genesis="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"/g' "${1}" sed -i $xsedfix 's/^genesis="1JmFaA6unrCFYEWP.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g' "${1}"
# shellcheck disable=SC1004 # shellcheck disable=SC1004
sed -i $xsedfix 's/^superManager=.*/superManager=["1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",\ sed -i $xsedfix 's/^superManager=.*/superManager=["1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",\
"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",\ "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",\
...@@ -67,10 +67,10 @@ function para_set_toml() { ...@@ -67,10 +67,10 @@ function para_set_toml() {
function para_set_wallet() { function para_set_wallet() {
echo "=========== # para set wallet =============" echo "=========== # para set wallet ============="
para_import_key "${PARA_CLI}" "0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b" "paraAuthAccount" para_import_wallet "${PARA_CLI}" "0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b" "paraAuthAccount"
para_import_key "${PARA_CLI2}" "0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4" "paraAuthAccount" para_import_wallet "${PARA_CLI2}" "0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4" "paraAuthAccount"
para_import_key "${PARA_CLI1}" "0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115" "paraAuthAccount" para_import_wallet "${PARA_CLI1}" "0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115" "paraAuthAccount"
para_import_key "${PARA_CLI4}" "0xcacb1f5d51700aea07fca2246ab43b0917d70405c65edea9b5063d72eb5c6b71" "paraAuthAccount" para_import_wallet "${PARA_CLI4}" "0xcacb1f5d51700aea07fca2246ab43b0917d70405c65edea9b5063d72eb5c6b71" "paraAuthAccount"
#14KEKbYtKKQm4wMthSK9J4La4nAiidGozt #14KEKbYtKKQm4wMthSK9J4La4nAiidGozt
para_import_key "${PARA_CLI}" "0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "genesis" para_import_key "${PARA_CLI}" "0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "genesis"
...@@ -82,6 +82,8 @@ function para_set_wallet() { ...@@ -82,6 +82,8 @@ function para_set_wallet() {
para_import_key "${PARA_CLI}" "0x56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138" "dapptest1" para_import_key "${PARA_CLI}" "0x56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138" "dapptest1"
#1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX #1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX
para_import_key "${PARA_CLI}" "0x2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989" "dapptest2" para_import_key "${PARA_CLI}" "0x2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989" "dapptest2"
#1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx
para_import_key "${PARA_CLI}" "9d315182e56fde7fadb94408d360203894e5134216944e858f9b31f70e9ecf40" "rpctestpooladdr"
#super node behalf test #super node behalf test
#1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj #1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj
...@@ -92,7 +94,7 @@ function para_set_wallet() { ...@@ -92,7 +94,7 @@ function para_set_wallet() {
para_import_key "${PARA_CLI}" "0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d" "othernode2" para_import_key "${PARA_CLI}" "0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d" "othernode2"
} }
function para_import_key() { function para_import_wallet() {
local lable=$3 local lable=$3
echo "=========== # save seed to wallet =============" echo "=========== # save seed to wallet ============="
result=$(${1} seed save -p 1314fuzamei -s "tortoise main civil member grace happy century convince father cage beach hip maid merry rib" | jq ".isok") result=$(${1} seed save -p 1314fuzamei -s "tortoise main civil member grace happy century convince father cage beach hip maid merry rib" | jq ".isok")
...@@ -123,6 +125,16 @@ function para_import_key() { ...@@ -123,6 +125,16 @@ function para_import_key() {
${1} wallet status ${1} wallet status
} }
function para_import_key() {
local lable=$3
echo "=========== # import private key ============="
echo "key: ${2}"
result=$(${1} account import_key -k "${2}" -l "$lable" | jq ".label")
if [ -z "${result}" ]; then
exit 1
fi
}
function para_transfer() { function para_transfer() {
echo "=========== # para chain transfer =============" echo "=========== # para chain transfer ============="
main_transfer2account "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK" main_transfer2account "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
...@@ -140,6 +152,8 @@ function para_transfer() { ...@@ -140,6 +152,8 @@ function para_transfer() {
para_transfer2account "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY" para_transfer2account "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
para_transfer2account "1PUiGcbsccfxW3zuvHXZBJfznziph5miAo" para_transfer2account "1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
para_transfer2account "1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX" para_transfer2account "1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX"
#rpc test pool addr
para_transfer2account "1PcGKYYoLn1PLLJJodc1UpgWGeFAQasAkx" 500000
block_wait "${CLI}" 2 block_wait "${CLI}" 2
echo "=========== # main chain send to paracross =============" echo "=========== # main chain send to paracross ============="
...@@ -148,9 +162,6 @@ function para_transfer() { ...@@ -148,9 +162,6 @@ function para_transfer() {
#1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj #1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj
main_transfer2paracross "0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5" 100 main_transfer2paracross "0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5" 100
#relay rpc test
para_transfer2exec "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "relay"
para_transfer2exec "0x4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" "relay"
block_wait "${CLI}" 2 block_wait "${CLI}" 2
# para_create_manage_nodegroup # para_create_manage_nodegroup
...@@ -175,7 +186,11 @@ function main_transfer2account() { ...@@ -175,7 +186,11 @@ function main_transfer2account() {
function para_transfer2account() { function para_transfer2account() {
echo "${1}" echo "${1}"
hash1=$(${PARA_CLI} send coins transfer -a 1000 -n transfer -t "${1}" -k 0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944) local coins=1000
if [ "$#" -ge 2 ]; then
coins="$2"
fi
hash1=$(${PARA_CLI} send coins transfer -a "$coins" -n transfer -t "${1}" -k 0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944)
echo "${hash1}" echo "${hash1}"
} }
...@@ -189,12 +204,6 @@ function main_transfer2paracross() { ...@@ -189,12 +204,6 @@ function main_transfer2paracross() {
echo "${hash1}" echo "${hash1}"
} }
function para_transfer2exec() {
echo "exec=$2,addr=${1}"
hash1=$(${PARA_CLI} send coins send_exec -a 500 -e "$2" -k "${1}")
echo "${hash1}"
}
function para_create_manage_nodegroup() { function para_create_manage_nodegroup() {
echo "=========== # para chain send config =============" echo "=========== # para chain send config ============="
para_configkey "${CLI}" "paracross-nodes-user.p.${PARANAME}." "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4" para_configkey "${CLI}" "paracross-nodes-user.p.${PARANAME}." "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
......
plugin/dapp/privacy/cmd/build/test-rpc.sh
View file @ bccbf066
...@@ -24,7 +24,7 @@ echo_rst() { ...@@ -24,7 +24,7 @@ echo_rst() {
privacy_CreateRawTransaction() { privacy_CreateRawTransaction() {
local ip=$1 local ip=$1
req='"method":"privacy.CreateRawTransaction","params":[{"pubkeypair":"0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb", "tokenname":"BTY", "type":1, "amount":100000000}]' req='"method":"privacy.CreateRawTransaction","params":[{"pubkeypair":"0a9d212b2505aefaa8da370319088bbccfac097b007f52ed71d8133456c8185823c8eac43c5e937953d7b6c8e68b0db1f4f03df4946a29f524875118960a35fb", "assetExec":"coins", "tokenname":"BTY", "type":1, "amount":100000000}]'
echo "#request: $req" echo "#request: $req"
resp=$(curl -ksd "{$req}" "$ip") resp=$(curl -ksd "{$req}" "$ip")
echo "#response: $resp" echo "#response: $resp"
......
plugin/dapp/relay/cmd/test/test-rpc.sh
View file @ bccbf066
This diff is collapsed.
plugin/dapp/unfreeze/cmd/build/test-rpc.sh
View file @ bccbf066
...@@ -18,7 +18,7 @@ function query_unfreezeID() { ...@@ -18,7 +18,7 @@ function query_unfreezeID() {
tx=$(jq -r ".result.tx.hash" <<<"$ret") tx=$(jq -r ".result.tx.hash" <<<"$ret")
echo "====query tx= ${txhash}, return=$ret " echo "====query tx= ${txhash}, return=$ret "
if [ "${tx}" != "${txhash}" ]; then if [ "${tx}" != "${txhash}" ]; then
block_wait 1 chain33_BlockWait 1 "${MAIN_HTTP}"
times=$((times - 1)) times=$((times - 1))
if [ $times -le 0 ]; then if [ $times -le 0 ]; then
echo "====query tx=$txhash failed" echo "====query tx=$txhash failed"
...@@ -49,15 +49,14 @@ function init() { ...@@ -49,15 +49,14 @@ function init() {
exec_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"'${exec_name}'"}]}' ${MAIN_HTTP} | jq -r ".result") exec_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"'${exec_name}'"}]}' ${MAIN_HTTP} | jq -r ".result")
echo "exec_addr=${exec_addr}" echo "exec_addr=${exec_addr}"
beneficiary=12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv beneficiary=1PUiGcbsccfxW3zuvHXZBJfznziph5miAo
beneficiary_key=0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01 beneficiary_key=0x56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138
owner=14KEKbYtKKQm4wMthSK9J4La4nAiidGozt owner=1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX
owner_key=CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944 owner_key=0x2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989
#unfreeze_exec_addr=15YsqAuXeEXVHgm6RVx4oJaAAnhtwqnu3H
Chain33_SendToAddress "$owner" "$exec_addr" 500000000 "${MAIN_HTTP}" chain33_SendToAddress "$owner" "$exec_addr" 500000000 "${MAIN_HTTP}"
Chain33_SendToAddress "$beneficiary" "$exec_addr" 500000000 "${MAIN_HTTP}" chain33_SendToAddress "$beneficiary" "$exec_addr" 500000000 "${MAIN_HTTP}"
block_wait 1 chain33_BlockWait 1 "${MAIN_HTTP}"
} }
function CreateRawUnfreezeCreate() { function CreateRawUnfreezeCreate() {
...@@ -96,7 +95,7 @@ function CreateRawUnfreezeTerminate() { ...@@ -96,7 +95,7 @@ function CreateRawUnfreezeTerminate() {
echo_rst "$FUNCNAME" "$?" echo_rst "$FUNCNAME" "$?"
rawtx=$(jq -r ".result" <<<"$resp") rawtx=$(jq -r ".result" <<<"$resp")
chain33_SignRawTx "$rawtx" "$owner_key" "${MAIN_HTTP}" chain33_SignRawTx "$rawtx" "$owner_key" "${MAIN_HTTP}"
block_wait 2 chain33_BlockWait 2 "${MAIN_HTTP}"
} }
function GetUnfreeze() { function GetUnfreeze() {
......
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