fix relay

plugin/dapp/relay/cmd/build.sh

@@ -4,14 +4,14 @@ strpwd=$(pwd)
 strcmd=${strpwd##*dapp/}
 strapp=${strcmd%/cmd*}
 
-OUT_DIR="${1}/$strapp"
-SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd
-FLAG=$2
-
-# shellcheck disable=SC2086,1072
-go build -i ${FLAG} -v -o "${OUT_DIR}/relayd" "${SRC_RELAYD}"
-cp ./relayd/relayd.toml "${OUT_DIR}/relayd.toml"
-cp ./build/* "${OUT_DIR}"
+#OUT_DIR="${1}/$strapp"
+#SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd
+#FLAG=$2
+#
+## shellcheck disable=SC2086,1072
+#go build -i ${FLAG} -v -o "${OUT_DIR}/relayd" "${SRC_RELAYD}"
+#cp ./relayd/relayd.toml "${OUT_DIR}/relayd.toml"
+#cp ./build/* "${OUT_DIR}"
 
 OUT_TESTDIR="${1}/dapptest/$strapp"
 mkdir -p "${OUT_TESTDIR}"

plugin/dapp/relay/cmd/build/testcase.sh

@@ -152,13 +152,13 @@ function relay_test() {
     fi
 
     echo "=========== # create buy order ============="
-    buy_hash=$(${1} send relay create -m 2.99 -o 0 -c BTC -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -f 0.02 -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    buy_hash=$(${1} send relay create -m 2.99 -o 0 -c BTC -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
     echo "${buy_hash}"
     echo "=========== # create sell order ============="
-    sell_hash=$(${1} send relay create -m 2.99 -o 1 -c BTC -a 2Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -f 0.02 -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    sell_hash=$(${1} send relay create -m 2.99 -o 1 -c BTC -a 2Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
     echo "${sell_hash}"
     echo "=========== # create real buy order ============="
-    realbuy_hash=$(${1} send relay create -m 10 -o 0 -c BTC -a "${btcrcv_addr}" -f 0.02 -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    realbuy_hash=$(${1} send relay create -m 10 -o 0 -c BTC -a "${btcrcv_addr}" -b 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
     echo "${realbuy_hash}"
     echo "=========== # transfer to relay ============="
     hash=$(${1} send coins transfer -a 300 -t 1rhRgzbz264eyJu7Ac63wepsm9TsEpwXM -n "send to relay" -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
@@ -234,13 +234,13 @@ function relay_test() {
     fi
 
     echo "=========== # accept buy order ============="
-    buy_hash=$(${1} send relay accept -f 0.001 -o "${buy_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
+    buy_hash=$(${1} send relay accept  -o "${buy_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
     echo "${buy_hash}"
     echo "=========== # accept real buy order ============="
-    realbuy_hash=$(${1} send relay accept -f 0.001 -o "${realbuy_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k "${real_buy_addr}")
+    realbuy_hash=$(${1} send relay accept  -o "${realbuy_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k "${real_buy_addr}")
     echo "${realbuy_hash}"
     echo "=========== # accept sell order ============="
-    sell_hash=$(${1} send relay accept -f 0.001 -o "${sell_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
+    sell_hash=$(${1} send relay accept -o "${sell_id}" -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
     echo "${sell_hash}"
     block_wait "${1}" 1
 
@@ -294,13 +294,13 @@ function relay_test() {
 
     wait_btc_height "${1}" $((acceptHeight + 72))
 
-    revoke_hash=$(${1} send relay revoke -a 0 -t 1 -f 0.01 -i "${buy_id}" -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
+    revoke_hash=$(${1} send relay revoke -a 0 -t 1  -i "${buy_id}" -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
     echo "${revoke_hash}"
     echo "=========== # confirm real buy order ============="
-    confirm_hash=$(${1} send relay confirm -f 0.001 -t "${btc_tx_hash}" -o "${realbuy_id}" -k "${real_buy_addr}")
+    confirm_hash=$(${1} send relay confirm -t "${btc_tx_hash}" -o "${realbuy_id}" -k "${real_buy_addr}")
     echo "${confirm_hash}"
     echo "=========== # confirm sell order ============="
-    confirm_hash=$(${1} send relay confirm -f 0.001 -t 6359f0868171b1d194cbee1af2f16ea598ae8fad666d9b012c8ed2b79a236ec4 -o "${sell_id}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    confirm_hash=$(${1} send relay confirm -t 6359f0868171b1d194cbee1af2f16ea598ae8fad666d9b012c8ed2b79a236ec4 -o "${sell_id}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
     echo "${confirm_hash}"
 
     block_wait "${1}" 1
@@ -338,10 +338,10 @@ function relay_test() {
 
     wait_btc_height "${1}" $((confirmHeight + 288))
 
-    revoke_hash=$(${1} send relay revoke -a 0 -t 0 -f 0.01 -i "${sell_id}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
+    revoke_hash=$(${1} send relay revoke -a 0 -t 0  -i "${sell_id}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
     echo "${revoke_hash}"
     echo "=========== # test cancel create order ==="
-    cancel_hash=$(${1} send relay create -m 2.99 -o 0 -c BTC -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -f 0.02 -b 200 -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
+    cancel_hash=$(${1} send relay create -m 2.99 -o 0 -c BTC -a 1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT -b 200 -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
     echo "${cancel_hash}"
 
     block_wait "${1}" 1
@@ -386,7 +386,7 @@ function relay_test() {
     fi
 
     echo "=========== # cancel order ============="
-    hash=$(${1} send relay revoke -a 1 -t 0 -f 0.01 -i "${cancel_id}" -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
+    hash=$(${1} send relay revoke -a 1 -t 0 -i "${cancel_id}" -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt)
     echo "${hash}"
     block_wait "${1}" 1
     echo "${hash}"

plugin/dapp/relay/cmd/relayd/relayd.toml

@@ -11,7 +11,7 @@ syncSetupCount = 10
 
 [auth]
 # test private key
-privateKey = "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
+privateKey = "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01"
 publicKey = ""
 address = ""
 

plugin/dapp/relay/cmd/test/test-rpc.sh

@@ -330,7 +330,7 @@ function rpc_test() {
     echo "main_ip=$MAIN_HTTP"
 
     init
-#    run_testcases
+    run_testcases
 
     if [ -n "$CASE_ERR" ]; then
         echo -e "${RED}=============Relay Rpc Test Fail=============${NOC}"