Commit dee470bc authored by vipwzw's avatar vipwzw

auto ci

parent e6cee5e5
...@@ -65,7 +65,6 @@ importPrivkey2() { ...@@ -65,7 +65,6 @@ importPrivkey2() {
echo_rst "$FUNCNAME" "$?" echo_rst "$FUNCNAME" "$?"
} }
sendTransaction() { sendTransaction() {
ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")') ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
echo "ipara=$ispara" echo "ipara=$ispara"
...@@ -74,7 +73,7 @@ sendTransaction() { ...@@ -74,7 +73,7 @@ sendTransaction() {
Chain33_SendToAddress 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv 12000000000 Chain33_SendToAddress 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv 12000000000
fi fi
Chain33_SendToAddress 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt 12000000000 Chain33_SendToAddress 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt 12000000000
} }
sendToExec() { sendToExec() {
...@@ -82,7 +81,6 @@ sendToExec() { ...@@ -82,7 +81,6 @@ sendToExec() {
Chain33_SendToAddress "$from" "$hashlock_addr" 2000000000 Chain33_SendToAddress "$from" "$hashlock_addr" 2000000000
} }
queryBalance() { queryBalance() {
addr=$1 addr=$1
req='"method":"Chain33.GetAllExecBalance","params":[{"addr":"'"${addr}"'"}]' req='"method":"Chain33.GetAllExecBalance","params":[{"addr":"'"${addr}"'"}]'
...@@ -92,7 +90,7 @@ queryBalance() { ...@@ -92,7 +90,7 @@ queryBalance() {
ok=$(jq '(.error|not) and (.result != "")' <<<"$resp") ok=$(jq '(.error|not) and (.result != "")' <<<"$resp")
[ "$ok" == true ] [ "$ok" == true ]
echo_rst "$FUNCNAME" "$?" echo_rst "$FUNCNAME" "$?"
echo $resp|jq -r ".result" echo $resp | jq -r ".result"
} }
hashlock_lock() { hashlock_lock() {
...@@ -235,7 +233,6 @@ init() { ...@@ -235,7 +233,6 @@ init() {
echo "hashlock_addr=$hashlock_addr" echo "hashlock_addr=$hashlock_addr"
} }
function run_test() { function run_test() {
#保存seed #保存seed
...@@ -296,7 +293,6 @@ function run_test() { ...@@ -296,7 +293,6 @@ function run_test() {
queryBalance $addr_A queryBalance $addr_A
queryBalance $addr_B queryBalance $addr_B
#lock #lock
hashlock_lock hashlock_lock
...@@ -307,7 +303,6 @@ function run_test() { ...@@ -307,7 +303,6 @@ function run_test() {
#unlock failed #unlock failed
hashlock_unlock hashlock_unlock
#等待2个区块 #等待2个区块
block_wait 2 block_wait 2
...@@ -335,4 +330,4 @@ function main() { ...@@ -335,4 +330,4 @@ function main() {
main "$1" main "$1"
set +x set +x
\ No newline at end of file
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