fix: linting and apply review comments

Author: jpraynaud

mithril-test-lab/benchmark/aggregator-prover/benchmark-aggregator-prover.sh

@@ -25,8 +25,8 @@ fi
 if [ -z "${TRANSACTIONS_PER_REQUEST_MAX}" ]; then
     TRANSACTIONS_PER_REQUEST_MAX=100
 fi
-TRANSACTIONS=$(cat $TRANSACTIONS_FILE | tr "\n" " ")
-TRANSACTIONS_AVAILABLE=$(echo $TRANSACTIONS | wc -w)
+TRANSACTIONS=$(tr "\n" " " < "$TRANSACTIONS_FILE")
+TRANSACTIONS_AVAILABLE=$(echo "$TRANSACTIONS" | wc -w | xargs)
 TRANSACTIONS_PER_REQUEST_MAX=$(( TRANSACTIONS_AVAILABLE < TRANSACTIONS_PER_REQUEST_MAX ? TRANSACTIONS_AVAILABLE : TRANSACTIONS_PER_REQUEST_MAX ))
 
 if [ -z "${TRANSACTIONS_PER_REQUEST_STEP}" ]; then
@@ -58,7 +58,7 @@ if [ -z "${OUT_FILE}" ]; then
     rm -f $OUT_FILE
     echo "Using the default OUT_FILE: $OUT_FILE"
 fi
-mkdir -p $(dirname "$OUT_FILE")
+mkdir -p "$(dirname "$OUT_FILE")"
 
 # Run stress test
 RUN_STRESS_TEST() {
@@ -75,14 +75,14 @@ RUN_STRESS_TEST() {
     TRANSACTIONS_FILE=$8
     TMP_FILE="test.tmp"
     echo ">> [#$INDEX_RUN/$TOTAL_RUN] Running stress test with $AB_TOTAL_REQUESTS requests with $TRANSACTIONS_PER_REQUEST transactions per request and $AB_CONCURRENCY concurrency"
-    TRANSACTIONS_LIST=$(head -n $TRANSACTIONS_PER_REQUEST $TRANSACTIONS_FILE | tr "\n" ",")
+    TRANSACTIONS_LIST=$(head -n $TRANSACTIONS_PER_REQUEST "$TRANSACTIONS_FILE" | tr "\n" ",")
     AGGREGATOR_PROVER_URL="$AGGREGATOR_ENDPOINT/proof/cardano-transaction?transaction_hashes=$TRANSACTIONS_LIST"
-    if $(ab -n $AB_TOTAL_REQUESTS -c $AB_CONCURRENCY -s $AB_TIMEOUT $AGGREGATOR_PROVER_URL > $TMP_FILE) ; then
+    if ab -n $AB_TOTAL_REQUESTS -c $AB_CONCURRENCY -s "$AB_TIMEOUT" "$AGGREGATOR_PROVER_URL" > $TMP_FILE ; then
         REQUESTS_PER_SECOND=$(cat $TMP_FILE | awk '/Requests per second:/ {print $4}')
         if [[ $INDEX_RUN -eq 1 ]] ; then
-            echo "total_requests,concurrency,transactions/request,requests/s" >> $OUT_FILE
+            echo "total_requests,concurrency,transactions/request,requests/s" >> "$OUT_FILE"
         fi
-        echo "$AB_TOTAL_REQUESTS,$AB_CONCURRENCY,$TRANSACTIONS_PER_REQUEST,$REQUESTS_PER_SECOND" >> $OUT_FILE
+        echo "$AB_TOTAL_REQUESTS,$AB_CONCURRENCY,$TRANSACTIONS_PER_REQUEST,$REQUESTS_PER_SECOND" >> "$OUT_FILE"
         echo ">>>> Success ($REQUESTS_PER_SECOND requests/s)"
     else
         echo ">>>> Failure"
@@ -93,11 +93,11 @@ RUN_STRESS_TEST() {
 }
 
 # Run aggregator benchmark over a range of transactions and concurrency levels
-TRANSACTIONS_PER_REQUEST_RANGE=$(seq -s ' ' $TRANSACTIONS_PER_REQUEST_MIN $TRANSACTIONS_PER_REQUEST_STEP $TRANSACTIONS_PER_REQUEST_MAX)
-AB_CONCURRENCY_RANGE=$(seq -s ' ' $AB_CONCURRENCY_MIN $AB_CONCURRENCY_STEP $AB_CONCURRENCY_MAX)
-TRANSACTIONS_PER_REQUEST_RANGE_LENGTH=$(( $(echo $TRANSACTIONS_PER_REQUEST_RANGE | grep -o " " | wc -l) + 1 ))
-AB_CONCURRENCY_RANGE_LENGTH=$(( $(echo $AB_CONCURRENCY_RANGE | grep -o " " | wc -l) + 1 ))
-TOTAL_RUN=$(( $TRANSACTIONS_PER_REQUEST_RANGE_LENGTH * $AB_CONCURRENCY_RANGE_LENGTH ))
+TRANSACTIONS_PER_REQUEST_RANGE=$(seq -s ' ' "$TRANSACTIONS_PER_REQUEST_MIN" "$TRANSACTIONS_PER_REQUEST_STEP" $TRANSACTIONS_PER_REQUEST_MAX)
+AB_CONCURRENCY_RANGE=$(seq -s ' ' "$AB_CONCURRENCY_MIN" "$AB_CONCURRENCY_STEP" "$AB_CONCURRENCY_MAX")
+TRANSACTIONS_PER_REQUEST_RANGE_LENGTH=$(( $(echo "$TRANSACTIONS_PER_REQUEST_RANGE" | grep -o " " | wc -l) + 1 ))
+AB_CONCURRENCY_RANGE_LENGTH=$(( $(echo "$AB_CONCURRENCY_RANGE" | grep -o " " | wc -l) + 1 ))
+TOTAL_RUN=$(( TRANSACTIONS_PER_REQUEST_RANGE_LENGTH * AB_CONCURRENCY_RANGE_LENGTH ))
 echo ""
 echo "Run aggregator prover benchmark with:"
 echo ">> Aggregator endpoint: [$AGGREGATOR_ENDPOINT]"
@@ -113,13 +113,13 @@ echo ""
 INDEX_RUN=1
 for TRANSACTIONS_PER_REQUEST in $TRANSACTIONS_PER_REQUEST_RANGE; do 
     for AB_CONCURRENCY in $AB_CONCURRENCY_RANGE; do
-        RUN_STRESS_TEST $AGGREGATOR_ENDPOINT $TRANSACTIONS_PER_REQUEST $AB_TOTAL_REQUESTS $AB_CONCURRENCY $OUT_FILE $INDEX_RUN $TOTAL_RUN $TRANSACTIONS_FILE
-        INDEX_RUN=$(( ${INDEX_RUN} + 1))
+        RUN_STRESS_TEST "$AGGREGATOR_ENDPOINT" "$TRANSACTIONS_PER_REQUEST" "$AB_TOTAL_REQUESTS" "$AB_CONCURRENCY" "$OUT_FILE" $INDEX_RUN "$TOTAL_RUN" "$TRANSACTIONS_FILE"
+        INDEX_RUN=$(( INDEX_RUN + 1))
     done 
 done 
 
 echo ">> Benchmark completed:"
 echo ""
-cat $OUT_FILE
+cat "$OUT_FILE"