Commit 4f10b8d6 authored by vipwzw's avatar vipwzw Committed by mdj33

auto ci

parent 97cc9c23
...@@ -166,8 +166,7 @@ chain33_LastBlockhash() { ...@@ -166,8 +166,7 @@ chain33_LastBlockhash() {
echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######" echo -e "######\\n last blockhash is $LAST_BLOCK_HASH \\n######"
} }
ip=$(echo "$ip" | cut -d':' -f 1) ip=$(echo "$ip" | cut -d':' -f 1)
chain33_getMainChainCoins() { chain33_getMainChainCoins() {
echo "chain33_getMainChainCoins" echo "chain33_getMainChainCoins"
...@@ -189,7 +188,6 @@ chain33_getMainChainCoins() { ...@@ -189,7 +188,6 @@ chain33_getMainChainCoins() {
} }
chain33_getParaChainCoins() { chain33_getParaChainCoins() {
echo "chain33_getParaChainCoins" echo "chain33_getParaChainCoins"
if [ "$#" -lt 3 ]; then if [ "$#" -lt 3 ]; then
...@@ -208,4 +206,4 @@ chain33_getParaChainCoins() { ...@@ -208,4 +206,4 @@ chain33_getParaChainCoins() {
P_HTTP=${MAIN_HTTP//8801/8901} P_HTTP=${MAIN_HTTP//8801/8901}
chain33_SendToAddress "${poolAddr}" "${targetAddr}" $count "${P_HTTP}" chain33_SendToAddress "${poolAddr}" "${targetAddr}" $count "${P_HTTP}"
} }
\ No newline at end of file
...@@ -10,7 +10,7 @@ function dapp_test_rpc() { ...@@ -10,7 +10,7 @@ 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 multisig ! -name paracross ! -name evm ! -name game ! -name guess ! -name hashlock ! -name js ! -name lottery ! -name pokerbull ! -name . | sed 's/^\.\///' | sort) dir=$(find . -maxdepth 1 -type d ! -name dapptest ! -name multisig ! -name paracross ! -name evm ! -name game ! -name guess ! -name hashlock ! -name js ! -name lottery ! -name pokerbull ! -name . | sed 's/^\.\///' | sort)
echo "dapps list: $dir" echo "dapps list: $dir"
for app in $dir; do for app in $dir; do
echo "=========== # $app rpc test =============" echo "=========== # $app rpc test ============="
......
...@@ -64,9 +64,6 @@ function query_tx() { ...@@ -64,9 +64,6 @@ function query_tx() {
done done
} }
signrawtx() { signrawtx() {
txHex="$1" txHex="$1"
priKey="$2" priKey="$2"
...@@ -264,7 +261,7 @@ init() { ...@@ -264,7 +261,7 @@ init() {
if [ "$ispara" == true ]; then if [ "$ispara" == true ]; then
relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.relay"}]}' ${MAIN_HTTP} | jq -r ".result") relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.relay"}]}' ${MAIN_HTTP} | jq -r ".result")
else else
# chain33_ImportPrivkey "${MAIN_HTTP}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY" # chain33_ImportPrivkey "${MAIN_HTTP}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"relay"}]}' ${MAIN_HTTP} | jq -r ".result") relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"relay"}]}' ${MAIN_HTTP} | jq -r ".result")
fi fi
echo "relayaddr=$relay_addr" echo "relayaddr=$relay_addr"
......
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