format

.github/workflows/build.yml

@@ -83,7 +83,7 @@ jobs:
           make autotest dapp=all
 
   ci_base:
-    name: base
+    name: ci_base
     runs-on: ubuntu-latest
     steps:
       - name: Set up Golang
@@ -100,8 +100,8 @@ jobs:
           make docker-compose
           make docker-compose-down
 
-  ci_paracross:
-    name: paracross
+  ci_relay:
+    name: ci_relay
     runs-on: ubuntu-latest
     steps:
       - name: Set up Golang
@@ -115,11 +115,11 @@ jobs:
         uses: actions/checkout@v2
       - name: deploy
         run: |
-          make docker-compose dapp=paracross
-          make docker-compose-down dapp=paracross
+          make docker-compose dapp=relay
+          make docker-compose-down dapp=relay
 
-  ci_x2ethereum:
-    name: x2ethereum
+  ci_paracross:
+    name: ci_paracross
     runs-on: ubuntu-latest
     steps:
       - name: Set up Golang
@@ -133,11 +133,11 @@ jobs:
         uses: actions/checkout@v2
       - name: deploy
         run: |
-          make docker-compose dapp=x2ethereum
-          make docker-compose-down dapp=x2ethereum
+          make docker-compose dapp=paracross
+          make docker-compose-down dapp=paracross
 
-  ci_relay:
-    name: relay
+  ci_x2ethereum:
+    name: ci_x2ethereum
     runs-on: ubuntu-latest
     steps:
       - name: Set up Golang
@@ -151,6 +151,9 @@ jobs:
         uses: actions/checkout@v2
       - name: deploy
         run: |
-          make docker-compose dapp=relay
-          make docker-compose-down dapp=relay
+          make
+          make docker-compose dapp=x2ethereum
+          make docker-compose-down dapp=x2ethereum
+
+
 

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

@@ -529,9 +529,11 @@ function TestETH2Chain33Erc20Kill() {
 
 function AllRelayerMainTest() {
     set +e
-    #    docker_chain33_ip=$(docker inspect "${NODE3}" | jq ".[].NetworkSettings.Networks" | grep "IPAddress" | awk '{ print $2}' | sed 's/\"//g' | sed 's/,//g')
-    #    Chain33Cli="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
+    docker_chain33_ip=$(docker inspect "${NODE3}" | jq ".[].NetworkSettings.Networks" | grep "IPAddress" | awk '{ print $2}' | sed 's/\"//g' | sed 's/,//g')
 
+    Chain33Cli="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
+    echo "GOPATH=$GOPATH"
+    echo "Chain33Cli=$Chain33Cli"
     echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
 
     if [[ ${1} != "" ]]; then