Merge branch 'revert-21db36bc' into 'master'

Revert "Modified integration test to use nicknames. This inserts GetContactList…"

See merge request privategrity/integration!2

basice2e/clients.goldoutput/client12.out

-Sending Message to 2, Jim: Hello, 2
-Message from 4, Rick Received: Hello, 1
-Sending Message to 2, Jim: Hello, 2
-Message from 4, Rick Received: Hello, 1
+Sending Message to 2: Hello, 2
+Message from 4 Received: Hello, 1
+Sending Message to 2: Hello, 2
+Message from 4 Received: Hello, 1

basice2e/clients.goldoutput/client23.out

-Sending Message to 3, Ben: Hello, 3
-Message from 1, David Received: Hello, 2
-Sending Message to 3, Ben: Hello, 3
-Message from 1, David Received: Hello, 2
+Sending Message to 3: Hello, 3
+Message from 1 Received: Hello, 2
+Sending Message to 3: Hello, 3
+Message from 1 Received: Hello, 2

basice2e/clients.goldoutput/client34.out

-Sending Message to 4, Rick: Hello, 4
-Message from 2, Jim Received: Hello, 3
-Sending Message to 4, Rick: Hello, 4
-Message from 2, Jim Received: Hello, 3
+Sending Message to 4: Hello, 4
+Message from 2 Received: Hello, 3
+Sending Message to 4: Hello, 4
+Message from 2 Received: Hello, 3

basice2e/clients.goldoutput/client41.out

-Sending Message to 1, David: Hello, 1
-Message from 3, Ben Received: Hello, 4
-Sending Message to 1, David: Hello, 1
-Message from 3, Ben Received: Hello, 4
+Sending Message to 1: Hello, 1
+Message from 3 Received: Hello, 4
+Sending Message to 1: Hello, 1
+Message from 3 Received: Hello, 4

basice2e/run.sh

@@ -46,10 +46,7 @@ sleep 20 # FIXME: We should not need this, but the servers don't respond quickly
          #        enough on boot right now.
 
 LASTNODE="localhost:50004"
-NICK1="David"
-NICK2="Jim"
-NICK3="Ben"
-NICK4="Rick"
+
 
 echo "STARTING CLIENTS..."
 CTR=0
@@ -63,8 +60,7 @@ do
     for nid in 1
     do
         nid=$((($cid % 4) + 1))
-        NICK=NICK${cid}
-        CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}"
+        CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\""
         eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 &
         RETVAL=$!
         eval CLIENTS${CTR}=$RETVAL
@@ -90,8 +86,7 @@ do
     for nid in 1
     do
         nid=$((($cid % 4) + 1))
-        NICK=NICK${cid}
-        CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --nick ${!NICK}"
+        CLIENTCMD="../bin/client -f blob$cid$nid --numnodes 5 -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\""
         eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.out 2>&1 &
         RETVAL=$!
         eval CLIENTS${CTR}=$RETVAL