fix rpc test

Makefile

@@ -122,7 +122,7 @@ docker-compose: ## build docker-compose for chain33 run
 	@cd build && if ! [ -d ci ]; then \
 	 make -C ../ ; \
 	 fi; \
-	 ./docker-compose-pre.sh modify && cp chain33* Dockerfile  docker-compose.yml *.sh ci/ && cd ci/ && ./docker-compose-pre.sh run $(proj) $(dapp)  && cd ../..
+	 cp chain33* Dockerfile  docker-compose.yml *.sh ci/ && cd ci/ && ./docker-compose-pre.sh run $(proj) $(dapp)  && cd ../..
 
 docker-compose-down: ## build docker-compose for chain33 run
 	@cd build && if [ -d ci ]; then \
@@ -131,7 +131,7 @@ docker-compose-down: ## build docker-compose for chain33 run
 	 cd ..
 
 fork-test: ## build fork-test for chain33 run
-	@cd build && ./docker-compose-pre.sh modify && cp chain33* Dockerfile system-fork-test.sh docker-compose* ci/ && cd ci/ && ./docker-compose-pre.sh forktest $(proj) $(dapp) && cd ../..
+	@cd build && cp chain33* Dockerfile system-fork-test.sh docker-compose* ci/ && cd ci/ && ./docker-compose-pre.sh forktest $(proj) $(dapp) && cd ../..
 
 
 clean: ## Remove previous build

build/docker-compose-pre.sh

@@ -33,12 +33,15 @@ function down_dapp() {
 }
 
 function run_dapp() {
-    app=$1
-    test=$2
+    local app=$1
+    local test=$2
 
     echo "============ run dapp=$app start ================="
     rm -rf "${app}"-ci && mkdir -p "${app}"-ci && cp ./"${app}"/* ./"${app}"-ci && echo $?
     cp -n ./* ./"${app}"-ci/ && echo $?
+    if [ "$app" == "paracross" ]; then
+        cp -r dapptest/ "${app}"-ci/ && echo $?
+    fi
     cd "${app}"-ci/ && pwd
 
     if [ "$test" == "$FORKTESTFILE" ]; then

build/docker-compose.sh

@@ -339,10 +339,10 @@ function rpc_test() {
         system_test_rpc "http://${1}:8801"
         dapp_test_rpc "http://${1}:8801"
     fi
-    #    if [ "$DAPP" == "paracross" ]; then
-    #        system_test_rpc "http://${1}:8901"
-    #        dapp_test_rpc "http://${1}:8901"
-    #    fi
+    if [ "$DAPP" == "paracross" ]; then
+        #system_test_rpc "http://${1}:8901"
+        dapp_test_rpc "http://${1}:8901"
+    fi
 
 }
 function dapp_run() {

plugin/dapp/paracross/cmd/build/chain33.para.toml

@@ -133,7 +133,7 @@ minExecFee=100000
 enableStat=false
 
 [exec.sub.relay]
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+genesis="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 
 [exec.sub.manage]
 superManager=[

plugin/dapp/relay/cmd/test/test-rpc.sh

@@ -281,14 +281,13 @@ query_GetBTCHeaderCurHeight() {
 }
 
 init() {
-    chain33_ImportPrivkey "${MAIN_HTTP}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
-
     ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
     echo "ipara=$ispara"
     local relay_addr=""
     if [ "$ispara" == true ]; then
         relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.relay"}]}' ${MAIN_HTTP} | jq -r ".result")
     else
+        chain33_ImportPrivkey "${MAIN_HTTP}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
         relay_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"relay"}]}' ${MAIN_HTTP} | jq -r ".result")
     fi
     echo "relayaddr=$relay_addr"