Merge branch 'v1.2.7-candidate' into measure-block-propagation

maticnetwork · Mar 5, 2024 · d0e0efb · d0e0efb
2 parents e586a65 + 32a55dd
commit d0e0efb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/integration-tests/bor_health.sh b/integration-tests/bor_health.sh
@@ -3,8 +3,8 @@ set -e
 
 while true
 do
-    peers=$(docker exec bor0 bash -c "bor attach /root/var/lib/bor/data/bor.ipc -exec 'admin.peers'")
-    block=$(docker exec bor0 bash -c "bor attach /root/var/lib/bor/data/bor.ipc -exec 'eth.blockNumber'")
+    peers=$(docker exec bor0 bash -c "bor attach /var/lib/bor/data/bor.ipc -exec 'admin.peers'")
+    block=$(docker exec bor0 bash -c "bor attach /var/lib/bor/data/bor.ipc -exec 'eth.blockNumber'")
 
     if [[ -n "$peers" ]] && [[ -n "$block" ]]; then
         break

diff --git a/integration-tests/smoke_test.sh b/integration-tests/smoke_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-balanceInit=$(docker exec bor0 bash -c "bor attach /root/var/lib/bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'")
+balanceInit=$(docker exec bor0 bash -c "bor attach /var/lib/bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'")
 
 stateSyncFound="false"
 checkpointFound="false"
@@ -10,19 +10,19 @@ start_time=$SECONDS
 
 while true
 do
-  
-    balance=$(docker exec bor0 bash -c "bor attach /root/var/lib/bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'")
+
+    balance=$(docker exec bor0 bash -c "bor attach /var/lib/bor/data/bor.ipc -exec 'Math.round(web3.fromWei(eth.getBalance(eth.accounts[0])))'")
 
     if ! [[ "$balance" =~ ^[0-9]+$ ]]; then
         echo "Something is wrong! Can't find the balance of first account in bor network."
         exit 1
     fi
 
     if (( $balance > $balanceInit )); then
-        if [ $stateSyncFound != "true" ]; then 
+        if [ $stateSyncFound != "true" ]; then
             stateSyncTime=$(( SECONDS - start_time ))
-            stateSyncFound="true" 
-        fi      
+            stateSyncFound="true"
+        fi
     fi
 
     checkpointID=$(curl -sL http://localhost:1317/checkpoints/latest | jq .result.id)
@@ -31,12 +31,12 @@ do
         if [ $checkpointFound != "true" ]; then
             checkpointTime=$(( SECONDS - start_time ))
             checkpointFound="true"
-        fi    
+        fi
     fi
 
     if [ $stateSyncFound == "true" ]  && [ $checkpointFound == "true" ]; then
         break
-    fi    
+    fi
 
 done
 echo "Both state sync and checkpoint went through. All tests have passed!"