Commit e96589b1 authored by vipwzw's avatar vipwzw

auto ci

parent e8808e5a
...@@ -89,7 +89,7 @@ function StartRelayerAndDeploy() { ...@@ -89,7 +89,7 @@ function StartRelayerAndDeploy() {
获取 BridgeRegistry 地址 获取 BridgeRegistry 地址
result=$(${CLIA} relayer ethereum bridgeRegistry) result=$(${CLIA} relayer ethereum bridgeRegistry)
BridgeRegistry=$(cli_ret "${result}" "bridgeRegistry" ".addr") BridgeRegistry=$(cli_ret "${result}" "bridgeRegistry" ".addr")
# BridgeRegistry="0x212ae3c705DA7E3568a85595E8e16268FE7F6448" # BridgeRegistry="0x212ae3c705DA7E3568a85595E8e16268FE7F6448"
kill_ebrelayer "./A/ebrelayer" kill_ebrelayer "./A/ebrelayer"
# 修改 relayer.toml 配置文件 # 修改 relayer.toml 配置文件
...@@ -432,7 +432,6 @@ function TestETH2Chain33AssetsKill() { ...@@ -432,7 +432,6 @@ function TestETH2Chain33AssetsKill() {
start_ebrelayerC start_ebrelayerC
start_ebrelayerD start_ebrelayerD
result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]" | jq -r ".balance") result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]" | jq -r ".balance")
balance_ret "${result}" "0.133" balance_ret "${result}" "0.133"
...@@ -537,7 +536,7 @@ function TestETH2Chain33Erc20Kill() { ...@@ -537,7 +536,7 @@ function TestETH2Chain33Erc20Kill() {
function AllRelayerMainTest() { function AllRelayerMainTest() {
set +e 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
# docker cp ${GOPATH}/src/github.com/33cn/plugin/plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh build_chain33_1:/root/x2Ethereum/RopstenTest.sh # docker cp ${GOPATH}/src/github.com/33cn/plugin/plugin/dapp/x2Ethereum/cmd/build/RopstenTest.sh build_chain33_1:/root/x2Ethereum/RopstenTest.sh
Chain33Cli="./../chain33-cli" Chain33Cli="./../chain33-cli"
...@@ -561,7 +560,7 @@ function AllRelayerMainTest() { ...@@ -561,7 +560,7 @@ function AllRelayerMainTest() {
# # kill relayer and start relayer # # kill relayer and start relayer
# TestChain33ToEthAssetsKill # TestChain33ToEthAssetsKill
# TestETH2Chain33AssetsKill # TestETH2Chain33AssetsKill
# TestETH2Chain33Erc20Kill # TestETH2Chain33Erc20Kill
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
......
...@@ -536,4 +536,4 @@ function eth_block_wait() { ...@@ -536,4 +536,4 @@ function eth_block_wait() {
sleep 1 sleep 1
set -x set -x
echo -e "${GRE}eth wait new block $count s, cur height=$expect,old=$((cur_height))${NOC}" echo -e "${GRE}eth wait new block $count s, cur height=$expect,old=$((cur_height))${NOC}"
} }
\ No newline at end of file
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