Skip to content

P
plugin
Commit f6c994eb authored by QM's avatar QM
Browse files
Options

updata perf_test.sh

parent 96875878
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 37 deletions
plugin/dapp/x2Ethereum/cmd/build/allRelayerTest.sh
View file @ f6c994eb
...@@ -52,12 +52,16 @@ function kill_ebrelayerD() { ...@@ -52,12 +52,16 @@ function kill_ebrelayerD() {
function start_ebrelayerC() { function start_ebrelayerC() {
start_ebrelayer "./C/ebrelayer" "./C/ebrelayer.log" start_ebrelayer "./C/ebrelayer" "./C/ebrelayer.log"
${CLIC} relayer unlock -p 123456hzj ${CLIC} relayer unlock -p 123456hzj
sleep 60 sleep 5
eth_block_wait 1
sleep 1
} }
function start_ebrelayerD() { function start_ebrelayerD() {
start_ebrelayer "./D/ebrelayer" "./D/ebrelayer.log" start_ebrelayer "./D/ebrelayer" "./D/ebrelayer.log"
${CLID} relayer unlock -p 123456hzj ${CLID} relayer unlock -p 123456hzj
sleep 60 sleep 5
eth_block_wait 1
sleep 1
} }
function InitAndDeploy() { function InitAndDeploy() {
...@@ -537,12 +541,12 @@ function TestETH2Chain33Erc20Kill() { ...@@ -537,12 +541,12 @@ function TestETH2Chain33Erc20Kill() {
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
function MainTest() { function AllRelayerMainTest() {
set +e set +e
docker_chain33_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' build_chain33_1) docker_chain33_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' build_chain33_1)
Chain33Cli="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801" Chain33Cli="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
echo -e "${GRE}===========allTest $FUNCNAME begin ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
if [[ ${1} != "" ]]; then if [[ ${1} != "" ]]; then
maturityDegree=${1} maturityDegree=${1}
...@@ -560,9 +564,9 @@ function MainTest() { ...@@ -560,9 +564,9 @@ function MainTest() {
TestETH2Chain33Erc20 TestETH2Chain33Erc20
# kill relayer and start relayer # kill relayer and start relayer
TestChain33ToEthAssetsKill # TestChain33ToEthAssetsKill
TestETH2Chain33AssetsKill # TestETH2Chain33AssetsKill
TestETH2Chain33Erc20Kill # TestETH2Chain33Erc20Kill
echo -e "${GRE}===========allTest $FUNCNAME end ===========${NOC}" echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
plugin/dapp/x2Ethereum/build/perf_test.sh → plugin/dapp/x2Ethereum/cmd/build/perf_test.sh
View file @ f6c994eb
#!/usr/bin/env bash #!/usr/bin/env bash
set -x set -x
source "./../ebrelayer/publicTest.sh" source "./publicTest.sh"
CLI="./ebcli_A" CLIA="./ebcli_A"
docker_chain33_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' build_chain33_1) Chain33_CLI=""
Chain33_CLI="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
Ethsender="0xa4ea64a583f6e51c3799335b28a8f0529570a635" Ethsender="0xa4ea64a583f6e51c3799335b28a8f0529570a635"
tokenAddr="0x9C3D40A44a2F61Ef8D46fa8C7A731C08FB16cCEF" tokenAddr="0x9C3D40A44a2F61Ef8D46fa8C7A731C08FB16cCEF"
...@@ -35,6 +34,8 @@ ethAddress[7]="0x1919203bA8b325278d28Fb8fFeac49F2CD881A4e" ...@@ -35,6 +34,8 @@ ethAddress[7]="0x1919203bA8b325278d28Fb8fFeac49F2CD881A4e"
ethAddress[8]="0xA4Ea64a583F6e51C3799335b28a8F0529570A635" ethAddress[8]="0xA4Ea64a583F6e51C3799335b28a8F0529570A635"
ethAddress[9]="0x0C05bA5c230fDaA503b53702aF1962e08D0C60BF" ethAddress[9]="0x0C05bA5c230fDaA503b53702aF1962e08D0C60BF"
maturityDegree=10
loop_send_lock_eth() { loop_send_lock_eth() {
#while 遍历数组 #while 遍历数组
# ======================== Ethereum Lock ========================================= # ======================== Ethereum Lock =========================================
...@@ -44,12 +45,12 @@ loop_send_lock_eth() { ...@@ -44,12 +45,12 @@ loop_send_lock_eth() {
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
preEthBalance[$i]=$(curl -ksd '{"jsonrpc":"2.0","method":"eth_getBalance","params":["'${ethAddress[i]}'", "latest"],"id":1}' http://localhost:7545 | jq -r ".result") preEthBalance[$i]=$(curl -ksd '{"jsonrpc":"2.0","method":"eth_getBalance","params":["'${ethAddress[i]}'", "latest"],"id":1}' http://localhost:7545 | jq -r ".result")
ethTxHash=$(${CLI} relayer ethereum lock-async -m 0.1 -k "${privateKeys[i]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv) ethTxHash=$(${CLIA} relayer ethereum lock-async -m 0.1 -k "${privateKeys[i]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
echo ${i} "lock-async tx hash:" ${ethTxHash} echo ${i} "lock-async tx hash:" ${ethTxHash}
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
...@@ -64,16 +65,15 @@ loop_send_lock_eth() { ...@@ -64,16 +65,15 @@ loop_send_lock_eth() {
fi fi
let i++ let i++
done done
nowChain33Balance=$(${Chain33_CLI} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]" | jq ".balance") nowChain33Balance=$(${Chain33_CLI} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]" | jq ".balance")
diff=$(gawk -M 'BEGIN{printf "%d\n", \ diff=$(gawk -M 'BEGIN{printf "%d\n", \
'${nowChain33Balance}' - \ '${nowChain33Balance}' - \
'${preChain33Balance}'}') '${preChain33Balance}'}')
check_number "${diff}" 1 check_number "${diff}" 1
} }
loop_send_burn_eth() { loop_send_burn_eth() {
# =========================== Chain33 Burn ======================================== # =========================== Chain33 Burn ========================================
echo -e "${GRE}=========== Chain33 Burn begin ===========${NOC}" echo -e "${GRE}=========== Chain33 Burn begin ===========${NOC}"
...@@ -87,7 +87,7 @@ loop_send_burn_eth() { ...@@ -87,7 +87,7 @@ loop_send_burn_eth() {
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
...@@ -119,17 +119,17 @@ loop_send_lock_bty() { ...@@ -119,17 +119,17 @@ loop_send_lock_bty() {
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
preEthBalance[$i]=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance") preEthBalance[$i]=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance")
ethTxHash=$(${Chain33_CLI} send x2ethereum lock -q "${tokenAddr}" -a 1 -r ${ethAddress[i]} -t bty -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv) ethTxHash=$(${Chain33_CLI} send x2ethereum lock -q "${tokenAddr}" -a 1 -r ${ethAddress[i]} -t bty -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
echo ${i} "lock chain33 tx hash:" ${ethTxHash} echo ${i} "lock chain33 tx hash:" ${ethTxHash}
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
nowEthBalance=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance") nowEthBalance=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance")
res=$(gawk -M 'BEGIN{printf "%d\n", \ res=$(gawk -M 'BEGIN{printf "%d\n", \
'${nowEthBalance}' - \ '${nowEthBalance}' - \
'${preEthBalance[i]}'}') '${preEthBalance[i]}'}')
...@@ -154,18 +154,18 @@ loop_send_burn_bty() { ...@@ -154,18 +154,18 @@ loop_send_burn_bty() {
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
preEthBalance[$i]=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance") preEthBalance[$i]=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance")
approveTxHash=$(${CLI} relayer ethereum approve -m 1 -k "${privateKeys[i]}" -t "${tokenAddr}") approveTxHash=$(${CLIA} relayer ethereum approve -m 1 -k "${privateKeys[i]}" -t "${tokenAddr}")
ethTxHash=$(${CLI} relayer ethereum burn-async -m 1 -k "${privateKeys[i]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t "${tokenAddr}") ethTxHash=$(${CLIA} relayer ethereum burn-async -m 1 -k "${privateKeys[i]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t "${tokenAddr}")
echo ${i} "burn-async tx hash:" ${ethTxHash} echo ${i} "burn-async tx hash:" ${ethTxHash}
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
nowEthBalance=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance") nowEthBalance=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${tokenAddr}" | jq -r ".balance")
res=$(gawk -M 'BEGIN{printf "%d\n", \ res=$(gawk -M 'BEGIN{printf "%d\n", \
'${preEthBalance[i]}' - \ '${preEthBalance[i]}' - \
'${nowEthBalance}'}') '${nowEthBalance}'}')
...@@ -188,20 +188,20 @@ loop_send_lock_erc20() { ...@@ -188,20 +188,20 @@ loop_send_lock_erc20() {
preChain33Balance=$(${Chain33_CLI} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t testc | jq ".res" | jq ".[]" | jq ".balance") preChain33Balance=$(${Chain33_CLI} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t testc | jq ".res" | jq ".[]" | jq ".balance")
i=0 i=0
preEthBalance=$(${CLI} relayer ethereum balance -o "${Ethsender}" -t "${testcAddr}" | jq -r ".balance") preEthBalance=$(${CLIA} relayer ethereum balance -o "${Ethsender}" -t "${testcAddr}" | jq -r ".balance")
approveTxHash=$(${CLI} relayer ethereum approve -m 10 -k "${privateKeys[8]}" -t "${testcAddr}") approveTxHash=$(${CLIA} relayer ethereum approve -m 10 -k "${privateKeys[8]}" -t "${testcAddr}")
echo ${i} "lock-async erc20 approve tx hash:" ${approveTxHash} echo ${i} "lock-async erc20 approve tx hash:" ${approveTxHash}
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
ethTxHash=$(${CLI} relayer ethereum lock-async -m 1 -k "${privateKeys[8]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t "${testcAddr}") ethTxHash=$(${CLIA} relayer ethereum lock-async -m 1 -k "${privateKeys[8]}" -r 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t "${testcAddr}")
echo ${i} "lock-async erc20 tx hash:" ${ethTxHash} echo ${i} "lock-async erc20 tx hash:" ${ethTxHash}
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
nowEthBalance=$(${CLI} relayer ethereum balance -o "${Ethsender}" -t "${testcAddr}" | jq -r ".balance") nowEthBalance=$(${CLIA} relayer ethereum balance -o "${Ethsender}" -t "${testcAddr}" | jq -r ".balance")
res=$(gawk -M 'BEGIN{printf "%d\n", \ res=$(gawk -M 'BEGIN{printf "%d\n", \
'${preEthBalance}' - \ '${preEthBalance}' - \
'${nowEthBalance}'}') '${nowEthBalance}'}')
...@@ -225,17 +225,17 @@ loop_send_burn_erc20() { ...@@ -225,17 +225,17 @@ loop_send_burn_erc20() {
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
preEthBalance[i]=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${testcAddr}" | jq -r ".balance") preEthBalance[i]=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${testcAddr}" | jq -r ".balance")
ethTxHash=$(${Chain33_CLI} send x2ethereum burn -a 1 -r ${ethAddress[i]} -t testc -q "${testcAddr}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv) ethTxHash=$(${Chain33_CLI} send x2ethereum burn -a 1 -r ${ethAddress[i]} -t testc -q "${testcAddr}" -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
echo ${i} "burn chain33 tx hash:" ${ethTxHash} echo ${i} "burn chain33 tx hash:" ${ethTxHash}
let i++ let i++
done done
eth_block_wait 12 eth_block_wait $((maturityDegree + 2))
i=0 i=0
while [[ i -lt ${#privateKeys[@]} ]]; do while [[ i -lt ${#privateKeys[@]} ]]; do
nowEthBalance=$(${CLI} relayer ethereum balance -o "${ethAddress[i]}" -t "${testcAddr}" | jq -r ".balance") nowEthBalance=$(${CLIA} relayer ethereum balance -o "${ethAddress[i]}" -t "${testcAddr}" | jq -r ".balance")
res=$(gawk -M 'BEGIN{printf "%d\n", \ res=$(gawk -M 'BEGIN{printf "%d\n", \
'${nowEthBalance}' - \ '${nowEthBalance}' - \
'${preEthBalance[i]}'}') '${preEthBalance[i]}'}')
...@@ -249,16 +249,26 @@ loop_send_burn_erc20() { ...@@ -249,16 +249,26 @@ loop_send_burn_erc20() {
'${preChain33Balance}' - \ '${preChain33Balance}' - \
'${nowChain33Balance}'}') '${nowChain33Balance}'}')
check_number "${diff}" 10 check_number "${diff}" 10
} }
main() { perf_test_main() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
docker_chain33_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' build_chain33_1)
Chain33_CLI="$GOPATH/src/github.com/33cn/plugin/build/chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
if [[ ${1} != "" ]]; then
maturityDegree=${1}
echo -e "${GRE}maturityDegree is ${maturityDegree} ${NOC}"
fi
loop_send_lock_eth loop_send_lock_eth
loop_send_burn_eth loop_send_burn_eth
loop_send_lock_bty loop_send_lock_bty
loop_send_burn_bty loop_send_burn_bty
loop_send_lock_erc20 loop_send_lock_erc20
loop_send_burn_erc20 loop_send_burn_erc20
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
} }
main
plugin/dapp/x2Ethereum/cmd/build/testcase.sh
View file @ f6c994eb
#!/usr/bin/env bash #!/usr/bin/env bash
source "./allRelayerTest.sh" source "./allRelayerTest.sh"
source "./perf_test.sh"
function x2Ethereum() { function x2Ethereum() {
if [ "${2}" == "init" ]; then if [ "${2}" == "init" ]; then
...@@ -10,6 +11,7 @@ function x2Ethereum() { ...@@ -10,6 +11,7 @@ function x2Ethereum() {
echo "========================== x2Ethereum test ==========================" echo "========================== x2Ethereum test =========================="
set +e set +e
set -x set -x
MainTest 1 AllRelayerMainTest 1
perf_test_main 1
fi fi
} }
plugin/dapp/x2Ethereum/ebrelayer/relayer.toml
View file @ f6c994eb
...@@ -3,6 +3,8 @@ title="x2Ethereum_relayer" ...@@ -3,6 +3,8 @@ title="x2Ethereum_relayer"
#用于cli向该relayer进行配置 #用于cli向该relayer进行配置
JrpcBindAddr="localhost:9901" JrpcBindAddr="localhost:9901"
EthProvider="ws://127.0.0.1:7545/" EthProvider="ws://127.0.0.1:7545/"
#EthProvider="wss://rinkeby.infura.io/ws/v3/404eb4acc421426ebeb6e92c7ce9a270"
#EthProvider="wss://ropsten.infura.io/ws/v3/404eb4acc421426ebeb6e92c7ce9a270"
EthMaturityDegree=10 EthMaturityDegree=10
EthBlockFetchPeriod=5000 EthBlockFetchPeriod=5000
#BridgeRegistry="0x5331F912027057fBE8139D91B225246e8159232f" #BridgeRegistry="0x5331F912027057fBE8139D91B225246e8159232f"
......
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