Commit ff4b4ccd authored by vipwzw's avatar vipwzw

auto ci

parent 28715397
...@@ -27,4 +27,3 @@ strapp=${strcmd%/cmd*} ...@@ -27,4 +27,3 @@ strapp=${strcmd%/cmd*}
OUT_TESTDIR="${1}/dapptest/$strapp" OUT_TESTDIR="${1}/dapptest/$strapp"
mkdir -p "${OUT_TESTDIR}" mkdir -p "${OUT_TESTDIR}"
cp ./test/* "${OUT_TESTDIR}" cp ./test/* "${OUT_TESTDIR}"
...@@ -403,29 +403,29 @@ ...@@ -403,29 +403,29 @@
#} #}
# #
function rpc_test() { function rpc_test() {
# set +e # set +e
# set -x # set -x
chain33_RpcTestBegin x2ethereum chain33_RpcTestBegin x2ethereum
# MAIN_HTTP="$1" # MAIN_HTTP="$1"
# dockerNamePrefix="$2" # dockerNamePrefix="$2"
# echo "main_ip=$MAIN_HTTP" # echo "main_ip=$MAIN_HTTP"
# #
## ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")') ## ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
## if [ "$ispara" == false ]; then ## if [ "$ispara" == false ]; then
## # init ## # init
## StartRelayerAndDeploy ## StartRelayerAndDeploy
## InitChain33Vilators ## InitChain33Vilators
## EthImportKey ## EthImportKey
## ##
## # test ## # test
## TestChain33ToEthAssets ## TestChain33ToEthAssets
## TestETH2Chain33Assets ## TestETH2Chain33Assets
## TestETH2Chain33Erc20 ## TestETH2Chain33Erc20
## ##
## copyErrLogs ## copyErrLogs
## ##
## docker-compose -f ./x2ethereum/docker-compose-x2ethereum.yml down ## docker-compose -f ./x2ethereum/docker-compose-x2ethereum.yml down
## fi ## fi
chain33_RpcTestRst x2ethereum "$CASE_ERR" chain33_RpcTestRst x2ethereum "$CASE_ERR"
} }
......
...@@ -6,10 +6,11 @@ package types ...@@ -6,10 +6,11 @@ package types
import ( import (
context "context" context "context"
fmt "fmt" fmt "fmt"
math "math"
types "github.com/33cn/chain33/types" types "github.com/33cn/chain33/types"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
math "math"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment