unset PRUNE_AFTER_BLOCKS_CHAIN when exec query channel-upgrade

Signed-off-by: Daisuke Kanda <[email protected]>

Author: Daisuke Kanda

tests/cases/tm2eth/scripts/handshake

@@ -15,6 +15,7 @@ MOCKAPP_PATH=mockapp-path
 ICS20_PATH=ics20-path
 
 if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
+  export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
   export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
   export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
 fi

tests/cases/tm2eth/scripts/test-channel-upgrade

@@ -12,6 +12,7 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
 RLY="${RLY_BINARY} --debug"
 
 if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
+  export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
   export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
   export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
 fi
@@ -104,7 +105,7 @@ checkResult() {
     fi
 
     # confirm dst chain is not upgrading
-    upg=$($RLY query channel-upgrade $PATH_NAME ibc1)
+    upg=$(env -u DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1 $RLY query channel-upgrade $PATH_NAME ibc1)
     if [ $(echo "$upg" | jq '.fields|length') -ne 0 ]
     then
 	echo "dst chain is still in the process of upgrade: $upg"

tests/cases/tm2eth/scripts/test-ics20-packet-relay

@@ -10,6 +10,7 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
 RLY="${RLY_BINARY} --debug"
 
 if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
+  export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
   export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
   export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
 fi

tests/cases/tm2eth/scripts/test-mockapp-packet-relay

@@ -11,6 +11,7 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
 RLY="${RLY_BINARY} --debug"
 
 if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
+  export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
   export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
   export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
 fi
@@ -37,7 +38,6 @@ ${RLY} tx acks $PATH_NAME --dst-seqs 1
 sleep ${TX_INTERVAL}
 
 echo "!!! ibc1 -> ibc0 !!!"
-TX_INTERVAL=20
 sendPacketOnEth $PATH_NAME
 
 sleep ${TX_INTERVAL}

tests/cases/tm2eth/scripts/test-service

@@ -16,6 +16,7 @@ RLY_BIN=${SCRIPT_DIR}/../../../../build/yrly
 RLY="${RLY_BIN} --debug"
 
 if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
+    export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
     export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
     export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
 fi