Merge branch 'remove_noratchet' into 'master'

Remove noratchet

See merge request privategrity/integration!18

basice2e/run.sh

@@ -22,7 +22,7 @@ echo "STARTING SERVERS..."
 for SERVERID in $(seq 5 -1 1)
 do
     IDX=$(($SERVERID - 1))
-    SERVERCMD="../bin/server -v -i $IDX --config server-$SERVERID.yaml --noratchet"
+    SERVERCMD="../bin/server -v -i $IDX --config server-$SERVERID.yaml"
     if [ $SERVERID -eq 4 ]; then
         sleep 15 # This will force a CDE timeout
     fi
@@ -69,7 +69,7 @@ runclients() {
             nid=$((($cid % 4) + 1))
             eval NICK=\${NICK${cid}}
             # Send a regular message
-            CLIENTCMD="timeout 240s ../bin/client -f blob$cid --numnodes 5 -g $GATEWAY -i $cid -d $nid -m \"Hello, $nid\" --noratchet"
+            CLIENTCMD="timeout 240s ../bin/client -f blob$cid --numnodes 5 -g $GATEWAY -i $cid -d $nid -m \"Hello, $nid\""
             eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 &
             PIDVAL=$!
             eval CLIENTS${CTR}=$PIDVAL
@@ -101,7 +101,7 @@ echo $PIDVAL >> results/serverpids
 echo "$UDBCMD -- $PIDVAL"
 
 # Start a dummy client
-DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 2 --noratchet -f blobdummy"
+DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 2 -f blobdummy"
 $DUMMYCMD >> $DUMMYOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
@@ -117,7 +117,7 @@ echo "$GATEWAYCMD -- $PIDVAL"
 # Send a registration command
 #cat registration-commands.txt | while read LINE
 #do
-#    CLIENTCMD="timeout 240s ../bin/client -f blob6 --numnodes 5 -g $GATEWAY -i 6 -d 13 -m \"$LINE\" --noratchet"
+#    CLIENTCMD="timeout 240s ../bin/client -f blob6 --numnodes 5 -g $GATEWAY -i 6 -d 13 -m \"$LINE\""
 #    eval $CLIENTCMD >> $CLIENTOUT/client6.out 2>&1 &
 #    PIDVAL=$!
 #    echo "$CLIENTCMD -- $PIDVAL"
@@ -125,7 +125,7 @@ echo "$GATEWAYCMD -- $PIDVAL"
 #done
 
 # Send a channel message that all clients will receive
-CLIENTCMD="timeout 240s ../bin/client -f blob5 --numnodes 5 -g $GATEWAY -i 5 -d 31 -m \"Channel, Hello\" --noratchet"
+CLIENTCMD="timeout 240s ../bin/client -f blob5 --numnodes 5 -g $GATEWAY -i 5 -d 31 -m \"Channel, Hello\""
 eval $CLIENTCMD >> $CLIENTOUT/client5.out 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -138,14 +138,6 @@ runclients
 echo "RUNNING CLIENTS (2nd time)..."
 runclients
 
-# HACK HACK HACK: Remove the ratchet warning from client output
-for F in $(find results/clients -type f)
-do
-    cat $F | grep -v "[Rr]atcheting" > $F.tmp
-    mv $F.tmp $F
-done
-
-
 diff -ruN clients.goldoutput $CLIENTOUT
 cat $SERVERLOGS/*.log | grep "ERROR" > results/server-errors.txt || true
 cat $SERVERLOGS/*.log | grep "FATAL" >> results/server-errors.txt || true