Merge branch 'withdraw_opt_1217' of github.com:zhengjunhe/plugin into withdraw_opt_1217

plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh

@@ -22,13 +22,10 @@ function start_docker_ebrelayerProxy() {
     init_validator_relayer "${CLIP}" "${validatorPwd}" "${chain33ValidatorKeyp}" "${ethValidatorAddrKeyp}"
 }
 
-#strle18="000000000000000000"
-#strle6="000000"
-
 function setWithdraw() {
-    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s ETH -a "500000000000000000000")
+    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s ETH -a 500 -d 18)
     cli_ret "${result}" "cfgWithdraw"
-    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s USDT -a "500000000")
+    result=$(${CLIP} ethereum cfgWithdraw -f 1 -s USDT -a 500 -d 6)
     cli_ret "${result}" "cfgWithdraw"
 
     # 在chain33上的bridgeBank合约中设置proxyReceiver
@@ -174,7 +171,7 @@ function TestETH2Chain33USDT_proxy() {
 }
 
 function TestRelayerProxy() {
-#    start_docker_ebrelayerProxy
+    start_docker_ebrelayerProxy
     setWithdraw
 
     TestETH2Chain33Assets_proxy
@@ -207,7 +204,7 @@ function AllRelayerMainTest() {
     initPara
 
     StartDockerRelayerDeploy
-    test_all
+#    test_all
 
     TestRelayerProxy
 

plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh

@@ -112,7 +112,7 @@ function updata_toml() {
 function updata_toml_start_bcd() {
     for name in b c d; do
         updata_toml $name
-    local file="./relayer$name.toml"
+        local file="./relayer$name.toml"
 
         docker cp "${file}" "${dockerNamePrefix}_ebrelayer${name}_1":/root/relayer.toml
         start_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebrelayer" "./ebrelayer${name}.log"