up shell

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

@@ -9,16 +9,7 @@ set +e
 source "./mainPubilcRelayerTest.sh"
 
 function start_docker_ebrelayerProxy() {
-    # shellcheck disable=SC2154
-    cp './relayer.toml' "./relayerproxy.toml"
-
-    # 删除配置文件中不需要的字段
-    for deleteName in "deploy4chain33" "deployerPrivateKey" "operatorAddr" "validatorsAddr" "initPowers" "deploy" "deployerPrivateKey" "operatorAddr" "validatorsAddr" "initPowers"; do
-        delete_line "./relayerproxy.toml" "${deleteName}"
-    done
-
-    pushNameChange "./relayerproxy.toml"
-
+    updata_toml proxy
     # 代理转账中继器中的标志位ProcessWithDraw设置为true
     sed -i 's/^ProcessWithDraw=.*/ProcessWithDraw=true/g' "./relayerproxy.toml"
 
@@ -183,7 +174,7 @@ function TestETH2Chain33USDT_proxy() {
 }
 
 function TestRelayerProxy() {
-    start_docker_ebrelayerProxy
+#    start_docker_ebrelayerProxy
     setWithdraw
 
     TestETH2Chain33Assets_proxy
@@ -219,7 +210,7 @@ function AllRelayerMainTest() {
     test_all
 
     TestRelayerProxy
-    
+
     echo_addrs
     echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
 }

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

@@ -88,10 +88,9 @@ function start_docker_ebrelayerA() {
     sleep 5
 }
 
-# start ebrelayer B C D
-function updata_toml_start_bcd() {
-    for name in b c d; do
-        local file="./relayer$name.toml"
+function updata_toml() {
+  local name=$1
+    local file="./relayer$name.toml"
         cp './relayer.toml' "${file}"
 
         # 删除配置文件中不需要的字段
@@ -107,6 +106,12 @@ function updata_toml_start_bcd() {
 
         line=$(delete_line_show "${file}" "pushBind")
         sed -i ''"${line}"' a pushBind="'"${pushHost}"':20000"' "${file}"
+}
+
+# start ebrelayer B C D
+function updata_toml_start_bcd() {
+    for name in b c d; do
+        updata_toml $name
 
         docker cp "${file}" "${dockerNamePrefix}_ebrelayer${name}_1":/root/relayer.toml
         start_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebrelayer" "./ebrelayer${name}.log"
@@ -117,20 +122,6 @@ function updata_toml_start_bcd() {
         eval ethValidatorAddrKey=\$ethValidatorAddrKey${name}
         # shellcheck disable=SC2154
         init_validator_relayer "${CLI}" "${validatorPwd}" "${chain33ValidatorKey}" "${ethValidatorAddrKey}"
-
-#        result=$(${CLI} set_pwd -p 123456hzj)
-#        cli_ret "${result}" "set_pwd"
-#
-#        result=$(${CLI} unlock -p 123456hzj)
-#        cli_ret "${result}" "unlock"
-#
-#        # shellcheck disable=SC2154
-#        result=$(${CLI} chain33 import_privatekey -k "${chain33ValidatorKey}")
-#        cli_ret "${result}" "chain33 import_privatekey"
-#
-#        # shellcheck disable=SC2154
-#        result=$(${CLI} ethereum import_privatekey -k "${ethValidatorAddrKey}")
-#        cli_ret "${result}" "ethereum import_privatekey"
     done
 }
 

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

@@ -99,20 +99,6 @@ function InitRelayerA() {
     # shellcheck disable=SC2154
     init_validator_relayer "${CLIA}" "${validatorPwd}" "${chain33ValidatorKeya}" "${ethValidatorAddrKeya}"
 
-#    result=$(${CLIA} set_pwd -p 123456hzj)
-#    cli_ret "${result}" "set_pwd"
-#
-#    result=$(${CLIA} unlock -p 123456hzj)
-#    cli_ret "${result}" "unlock"
-#
-#    # shellcheck disable=SC2154
-#    result=$(${CLIA} chain33 import_privatekey -k "${chain33ValidatorKeya}")
-#    cli_ret "${result}" "chain33 import_privatekey"
-#
-#    # shellcheck disable=SC2154
-#    result=$(${CLIA} ethereum import_privatekey -k "${ethValidatorAddrKeya}")
-#    cli_ret "${result}" "ethereum import_privatekey"
-
     ${CLIA} chain33 multisign set_multiSign -a "${multisignChain33Addr}"
 
     # 拷贝 BridgeRegistry.abi 和 BridgeBank.abi