Fix golds

basice2e/clients.goldoutput/client20.txt

@@ -3,23 +3,12 @@ Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
-Received 8
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
-Sent: Hello from 20, without E2E Encryption
+Received 5
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
@@ -30,7 +19,4 @@ Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
-Message received: Hello from 21, without E2E Encryption
-Received 8
+Received 5

basice2e/clients.goldoutput/client21.txt

@@ -3,32 +3,20 @@ Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 8
+Received 5
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
 Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Sent: Hello from 21, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
-Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 8
+Received 5

basice2e/run.sh

@@ -272,11 +272,11 @@ then
 
     echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)"
     # Higher timeouts for this test to allow message pickup retry to function
-    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 8 --receiveCount 8 -m \"Hello from 20, without E2E Encryption\""
+    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
     PIDVAL=$!
     echo "$CLIENTCMD -- $PIDVAL"
-    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 8 --receiveCount 8 -m \"Hello from 21, without E2E Encryption\""
+    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
     PIDVAL2=$!
     echo "$CLIENTCMD -- $PIDVAL"
@@ -404,11 +404,11 @@ wait $PIDVAL2
 
 echo "FORCING MESSAGE PICKUP RETRY... "
 # Higher timeouts for this test to allow message pickup retry to function
-CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 8 --receiveCount 8 -m \"Hello from 20, without E2E Encryption\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 8 --receiveCount 8 -m \"Hello from 21, without E2E Encryption\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"