Update golds

basice2e/clients.goldoutput/client18.out → basice2e/clients.goldoutput/client18.txt

-Received: Hello, 18, with E2E Encryption
+Message from 1122492445..., +CrSKtshK1HhaYaw+S8ePLYeVru/E+z/bwVOpfn3noY= Received: Hello, 18, with E2E Encryption
 Sending Message to 9, Spencer: Hello, 9, with E2E Encryption

basice2e/clients.goldoutput/client9.out → basice2e/clients.goldoutput/client9.txt

-Received: Hello, 9, with E2E Encryption
+Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption

basice2e/run.sh

@@ -158,9 +158,9 @@ wait $PIDVAL || true
 # FIXME: Go into client and clean up it's output so this is not necessary
 for C in $(ls -1 $CLIENTOUT); do
     # Remove the [CLIENT] Lines and cut them down
-    cat $CLIENTOUT/$C | grep "[CLIENT]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
+    cat $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
     # Take the clean lines and add them
-    cat $CLIENTOUT/$C | grep -v "[CLIENT]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
+    cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
 done
 
 # only expect up to 10c messages from the e2e clients

basice2e/tmp

-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
+Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption