auto ci

plugin/dapp/x2ethereum/cmd/build/allRelayerTest.sh

@@ -74,19 +74,19 @@ function StartRelayerAndDeploy() {
     # stop all docker
     docker-compose -f docker-compose-ebrelayer.yml down
     for name in b c d; do
-         docker-compose -f "docker-compose-ebrelayer${name}.yml" down
+        docker-compose -f "docker-compose-ebrelayer${name}.yml" down
     done
 
     # change EthProvider url
-          dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1")
-        ethUrl="http://${dockerAddr}:8545"
+    dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1")
+    ethUrl="http://${dockerAddr}:8545"
 
-        # shellcheck disable=SC2155
-        local line=$(delete_line_show "./relayer.toml" "EthProvider=\"ws:")
-        sed -i ''"${line}"' a EthProvider="ws://'"${dockerAddr}"':8545/"' "./relayer.toml"
+    # shellcheck disable=SC2155
+    local line=$(delete_line_show "./relayer.toml" 'EthProvider="ws:')
+    sed -i ''"${line}"' a EthProvider="ws://'"${dockerAddr}"':8545/"' "./relayer.toml"
 
-        line=$(delete_line_show "./relayer.toml" "EthProviderCli=\"http:")
-        sed -i ''"${line}"' a EthProviderCli="http://'"${dockerAddr}"':8545"' "./relayer.toml"
+    line=$(delete_line_show "./relayer.toml" 'EthProviderCli="http:')
+    sed -i ''"${line}"' a EthProviderCli="http://'"${dockerAddr}"':8545"' "./relayer.toml"
 
     grep_port=$(netstat -tlpn | grep "\b${portRelayer}\b")
     while [ -n "$grep_port" ]; do
@@ -581,5 +581,3 @@ function AllRelayerMainTest() {
 
     echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
 }
-
-

plugin/dapp/x2ethereum/cmd/build/publicTest.sh

@@ -399,8 +399,8 @@ function updata_relayer_toml() {
     line=$(delete_line_show "${file}" "pushHost")
     sed -i ''"${line}"' a pushHost="http://'"${pushHost}"':20000"' "${file}"
 
-#    line=$(delete_line_show "${file}" "pushBind")
-#    sed -i ''"${line}"' a pushBind="'"${pushHost}"':20000"' "${file}"
+    #    line=$(delete_line_show "${file}" "pushBind")
+    #    sed -i ''"${line}"' a pushBind="'"${pushHost}"':20000"' "${file}"
 
     line=$(delete_line_show "${file}" "BridgeRegistry")
     sed -i ''"${line}"' a BridgeRegistry="'"${BridgeRegistry}"'"' "${file}"
@@ -441,8 +441,8 @@ function updata_docker_relayer_toml() {
     local portRelayer=$1
 
     if [ "${portRelayer}" != "20000" ]; then
-      sed -i 's/20000/'"${portRelayer}"'/g' "./relayer.toml"
-      sed -i 's/20000/'"${portRelayer}"'/g' "./Dockerfile-x2ethrelay"
+        sed -i 's/20000/'"${portRelayer}"'/g' "./relayer.toml"
+        sed -i 's/20000/'"${portRelayer}"'/g' "./Dockerfile-x2ethrelay"
     fi
 
     for name in b c d; do
@@ -451,7 +451,7 @@ function updata_docker_relayer_toml() {
 
         # 删除配置文件中不需要的字段
         for deleteName in "deployerPrivateKey" "operatorAddr" "validatorsAddr" "initPowers" "deployerPrivateKey" "deploy"; do
-           delete_line "${file}" "${deleteName}"
+            delete_line "${file}" "${deleteName}"
         done
 
         port=$((port + 1))
@@ -526,7 +526,7 @@ function updata_docker_relayer_toml_rpc() {
 
         # 删除配置文件中不需要的字段
         for deleteName in "deployerPrivateKey" "operatorAddr" "validatorsAddr" "initPowers" "deployerPrivateKey" "deploy"; do
-           delete_line "${file}" "${deleteName}"
+            delete_line "${file}" "${deleteName}"
         done
 
         port=$((port - 1))

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

@@ -93,16 +93,15 @@ function StartRelayerAndDeploy() {
     sleep 5
 
     # change EthProvider url
-          dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_rpc_1")
-        ethUrl="http://${dockerAddr}:8545"
+    dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_rpc_1")
+    ethUrl="http://${dockerAddr}:8545"
 
-        # shellcheck disable=SC2155
-        local line=$(delete_line_show "./x2ethereum/relayer.toml" "EthProvider=\"ws:")
-        sed -i ''"${line}"' a EthProvider="ws://'"${dockerAddr}"':8545/"' "./x2ethereum/relayer.toml"
-
-        line=$(delete_line_show "./x2ethereum/relayer.toml" "EthProviderCli=\"http:")
-        sed -i ''"${line}"' a EthProviderCli="http://'"${dockerAddr}"':8545"' "./x2ethereum/relayer.toml"
+    # shellcheck disable=SC2155
+    local line=$(delete_line_show "./x2ethereum/relayer.toml" 'EthProvider="ws:')
+    sed -i ''"${line}"' a EthProvider="ws://'"${dockerAddr}"':8545/"' "./x2ethereum/relayer.toml"
 
+    line=$(delete_line_show "./x2ethereum/relayer.toml" 'EthProviderCli="http:')
+    sed -i ''"${line}"' a EthProviderCli="http://'"${dockerAddr}"':8545"' "./x2ethereum/relayer.toml"
 
     grep_port=$(netstat -tlpn | grep "\b${portRelayer}\b")
     while [ -n "$grep_port" ]; do