Commit be4a0821 authored by pengjun's avatar pengjun

fix test error

parent 8063591f
......@@ -201,24 +201,6 @@ function miner() {
sleep 1
echo "=========== # import private key dapptest1 mining ============="
result=$(${1} account import_key -k 56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138 -l dapptest1 | jq ".label")
echo "${result}"
if [ -z "${result}" ]; then
exit 1
fi
sleep 1
echo "=========== # import private key dapptest2 mining ============="
result=$(${1} account import_key -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989 -l dapptest2 | jq ".label")
echo "${result}"
if [ -z "${result}" ]; then
exit 1
fi
sleep 1
echo "=========== # close auto mining ============="
result=$(${1} wallet auto_mine -f 0 | jq ".isok")
if [ "${result}" = "false" ]; then
......@@ -345,6 +327,26 @@ function transfer() {
hash=$(${1} send coins transfer -a 1000 -n transfer -t 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
echo "${hash}"
block_wait "${1}" 1
}
function dapp_test_address() {
echo "=========== # import private key dapptest1 mining ============="
result=$(${1} account import_key -k 56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138 -l dapptest1 | jq ".label")
echo "${result}"
if [ -z "${result}" ]; then
exit 1
fi
sleep 1
echo "=========== # import private key dapptest2 mining ============="
result=$(${1} account import_key -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989 -l dapptest2 | jq ".label")
echo "${result}"
if [ -z "${result}" ]; then
exit 1
fi
sleep 1
hash=$(${1} send coins transfer -a 1500 -n transfer -t 1PUiGcbsccfxW3zuvHXZBJfznziph5miAo -k 2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989)
echo "${hash}"
......@@ -360,10 +362,12 @@ function base_config() {
function rpc_test() {
if [ "$DAPP" == "" ]; then
system_test_rpc "http://${1}:8801"
dapp_test_address "${CLI}"
dapp_test_rpc "http://${1}:8801"
fi
if [ "$DAPP" == "paracross" ]; then
#system_test_rpc "http://${1}:8901"
dapp_test_address "${CLI}"
dapp_test_rpc "http://${1}:8901"
fi
......
......@@ -217,10 +217,10 @@ init() {
fi
echo "pokerbulladdr=$pokerbull_addr"
from="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
from="1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
Chain33_SendToAddress "$from" "$pokerbull_addr" 10000000000
from="1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
from="1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX"
Chain33_SendToAddress "$from" "$pokerbull_addr" 10000000000
block_wait 1
}
......
......@@ -292,10 +292,10 @@ init() {
fi
echo "relayaddr=$relay_addr"
from="1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
from="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
Chain33_SendToAddress "$from" "$relay_addr" 10000000000
from="1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX"
from="1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
Chain33_SendToAddress "$from" "$relay_addr" 10000000000
block_wait 1
......
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