fix test

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

@@ -135,7 +135,7 @@ function para_transfer() {
 
 function main_transfer2account() {
     echo "${1}"
-    hash1=$(${CLI} send coins transfer -a 500 -n test -t "${1}" -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
+    hash1=$(${CLI} send coins transfer -a 200 -n test -t "${1}" -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
     echo "${hash1}"
 }
 

plugin/dapp/privacy/cmd/build/test-rpc.sh

@@ -4,7 +4,6 @@ set -e
 set -o pipefail
 
 MAIN_HTTP=""
-PARA_HTTP=""
 CASE_ERR=""
 
 #color

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

@@ -122,7 +122,7 @@ sendTx() {
 }
 
 relay_CreateRawRelayOrderTx() {
-    req='"method":"relay.CreateRawRelayOrderTx","params":[{"operation":0,"coin":"BTC","amount":299000000,"addr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT","btyAmount":10000000000,"coinWaits":6}]'
+    req='"method":"relay.CreateRawRelayOrderTx","params":[{"operation":0,"coin":"BTC","amount":299000000,"addr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT","btyAmount":1000000000,"coinWaits":6}]'
     # echo "#request: $req"
     resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
     # echo "#resp: $resp"
@@ -294,10 +294,10 @@ init() {
     echo "relayaddr=$relay_addr"
 
     from="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
-    Chain33_SendToAddress "$from" "$relay_addr" 30000000000
+    Chain33_SendToAddress "$from" "$relay_addr" 10000000000
 
     from="1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
-    Chain33_SendToAddress "$from" "$relay_addr" 30000000000
+    Chain33_SendToAddress "$from" "$relay_addr" 10000000000
     block_wait 1
 
 }

plugin/dapp/relay/executor/relay.go

@@ -250,9 +250,9 @@ func (r *relay) CheckReceiptExecOk() bool {
 }
 
 // ExecutorOrder 设置localdb的EnableRead
-func (g *relay) ExecutorOrder() int64 {
-	if types.IsFork(g.GetHeight(), "ForkLocalDBAccess") {
+func (r *relay) ExecutorOrder() int64 {
+	if types.IsFork(r.GetHeight(), "ForkLocalDBAccess") {
 		return drivers.ExecLocalSameTime
 	}
-	return g.DriverBase.ExecutorOrder()
+	return r.DriverBase.ExecutorOrder()
 }