updata test sh

build/docker-compose.sh

@@ -73,7 +73,6 @@ echo "CLI=$CLI"
 ####################
 
 function base_init() {
-
     # update test environment
     sed -i $sedfix 's/^Title.*/Title="local"/g' chain33.toml
     sed -i $sedfix 's/^TestNet=.*/TestNet=true/g' chain33.toml
@@ -116,8 +115,9 @@ function base_init() {
     sed -i $sedfix 's/^useBalance=.*/useBalance=true/g' chain33.toml
     sed -i $sedfix 's/^total="16htvcBNS.*/total="1Q9sQwothzM1gKSzkVZ8Dt1tqKX1uzSagx"/g' chain33.toml
 
-    if [ "$DAPP" == "x2Ethereum" ]; then
+    if [ "$DAPP" == "x2ethereum" ]; then
         sed -i $sedfix 's/^enableReduceLocaldb=.*/enableReduceLocaldb=false/g' chain33.toml
+        sed -i $sedfix 's/^enablePushSubscribe=.*/enablePushSubscribe=true/g' chain33.toml
     fi
 }
 

chain33.toml

@@ -42,6 +42,7 @@ enableTxQuickIndex=true
 enableReExecLocal=true
 # 使能精简localdb
 enableReduceLocaldb=true
+enablePushSubscribe=false
 
 [p2p]
 # p2p类型

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

@@ -11,7 +11,7 @@ function x2ethereum() {
     elif [ "${2}" == "config" ]; then
         return
     elif [ "${2}" == "test" ]; then
-        echo "========================== x2Ethereum test =========================="
+        echo "========================== x2ethereum test =========================="
         set +e
         set -x
         AllRelayerMainTest 1

plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/chain33_test.go

@@ -200,7 +200,7 @@ func (r *suiteChain33Relayer) deployContracts() {
 }
 
 func (r *suiteChain33Relayer) syncProc(syncCfg *ebTypes.SyncTxReceiptConfig) {
-	var ret = types.ReplySubTxReceipt{IsOk: true}
+	var ret = types.ReplySubscribePush{IsOk: true}
 	var he = types.Header{Height: 10000}
 
 	mockapi := &mocks.QueueProtocolAPI{}

plugin/dapp/x2ethereum/testsh/publicTest.sh

@@ -349,6 +349,9 @@ function updata_relayer_toml() {
     sed -i 's/EthMaturityDegree=10/'EthMaturityDegree="${maturityDegree}"'/g' "${file}"
     sed -i 's/maturityDegree=10/'maturityDegree="${maturityDegree}"'/g' "${file}"
 
+    sed -i 's/^EthBlockFetchPeriod=.*/EthBlockFetchPeriod=500/g' "${file}"
+    sed -i 's/^fetchHeightPeriodMs=.*/fetchHeightPeriodMs=500/g' "${file}"
+
     #sed -i 's/#BridgeRegistry=\"0x40BFE5eD039A9a2Eb42ece2E2CA431bFa7Cf4c42\"/BridgeRegistry=\"'${BridgeRegistry}'\"/g' "../build/relayer.toml"
     #sed -i 's/192.168.64.2/'${chain33Host}'/g' "../build/relayer.toml"
     #sed -i 's/192.168.3.156/'${pushHost}'/g' "../build/relayer.toml"