auto ci

plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh

@@ -306,8 +306,8 @@ function TestETH2Chain33Erc20() {
 
     # token4erc20 在 chain33 上先有 token,同时 mint
     tokenSymbol="testc"
-#    result=$(${CLIA} relayer ethereum token4erc20 -s "${tokenSymbol}")
-#    tokenAddr=$(cli_ret "${result}" "token4erc20" ".addr")
+    #    result=$(${CLIA} relayer ethereum token4erc20 -s "${tokenSymbol}")
+    #    tokenAddr=$(cli_ret "${result}" "token4erc20" ".addr")
     tokenAddr="0x47F62ba65bCa4150BE98F31566DC559b9b04fc2D"
 
     # 先铸币 1000
@@ -543,7 +543,7 @@ function TestETH2Chain33Erc20Kill() {
 
 function AllRelayerMainTest() {
     set +e
-#    docker cp ${GOPATH}/src/github.com/33cn/plugin/build/ci/x2Ethereum build_chain33_1:/root/x2Ethereum
+    #    docker cp ${GOPATH}/src/github.com/33cn/plugin/build/ci/x2Ethereum build_chain33_1:/root/x2Ethereum
 
     Chain33Cli="./../chain33-cli"
 
@@ -561,14 +561,14 @@ function AllRelayerMainTest() {
     EthImportKey
 
     # test
-#    TestChain33ToEthAssets
+    #    TestChain33ToEthAssets
     TestETH2Chain33Assets
     TestETH2Chain33Erc20
-#
-#    # kill relayer and start relayer
-#        TestChain33ToEthAssetsKill
-#        TestETH2Chain33AssetsKill
-#        TestETH2Chain33Erc20Kill
+    #
+    #    # kill relayer and start relayer
+    #        TestChain33ToEthAssetsKill
+    #        TestETH2Chain33AssetsKill
+    #        TestETH2Chain33Erc20Kill
 
     echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
 }

plugin/dapp/x2Ethereum/executor/exec_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/33cn/chain33/types"
 	chain33types "github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"
-	common2 "github.com/33cn/plugin/plugin/dapp/x2Ethereum/executor/common"
 	types2 "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"

plugin/dapp/x2Ethereum/testsh/publicTest.sh

@@ -314,7 +314,6 @@ function updata_relayer_toml_ropston() {
     #sed -i 's/192.168.3.156/'${pushHost}'/g' "../build/relayer.toml"
 }
 
-
 # 更新 B C D 的配置文件
 function updata_all_relayer_toml() {
     local port=9901
@@ -448,7 +447,7 @@ function eth_block_wait() {
     local cur_height=""
     local new_height=""
     local url=${2}
-    if [ "${url}" == "" ];then
+    if [ "${url}" == "" ]; then
         cur_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
     else
         cur_height=$(curl -H "Content-Type: application/json" -X POST --data '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' ${url} | jq -r ".result")
@@ -457,7 +456,7 @@ function eth_block_wait() {
     local expect=$((cur_height + ${1} + 1))
     local count=0
     while true; do
-        if [ "${url}" == "" ];then
+        if [ "${url}" == "" ]; then
             new_height=$(curl -ksd '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' http://localhost:7545 | jq -r ".result")
         else
             new_height=$(curl -H "Content-Type: application/json" -X POST --data '{"id":1,"jsonrpc":"2.0","method":"eth_blockNumber","params":[]}' ${url} | jq -r ".result")