Remove channels from integration

basice2e/clients.goldoutput/client45.out

 Sending Message to 5, Ben: Hello, 5
-Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello
 Message from 7, Rick Received: Hello, 4
 Sending Message to 5, Ben: Hello, 5
 Message from 7, Rick Received: Hello, 4

basice2e/clients.goldoutput/client56.out

 Sending Message to 6, Steph: Hello, 6
-Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello
 Message from 4, Jim Received: Hello, 5
 Sending Message to 6, Steph: Hello, 6
 Message from 4, Jim Received: Hello, 5

basice2e/clients.goldoutput/client67.out

 Sending Message to 7, Rick: Hello, 7
-Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello
 Message from 5, Ben Received: Hello, 6
 Sending Message to 7, Rick: Hello, 7
 Message from 5, Ben Received: Hello, 6

basice2e/clients.goldoutput/client74.out

 Sending Message to 4, Jim: Hello, 4
-Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello
 Message from 6, Steph Received: Hello, 7
 Sending Message to 4, Jim: Hello, 4
 Message from 6, Steph Received: Hello, 7

basice2e/clients.goldoutput/client8.out

-Sending Message to 31, #General: Channel, Hello

basice2e/run.sh

@@ -10,7 +10,6 @@ rm blob* || true
 SERVERLOGS=results/servers
 GATEWAYLOGS=results/gateways
 CLIENTOUT=results/clients
-CHANNELOUT=results/channelbot.console
 DUMMYOUT=results/dummy.console
 UDBOUT=results/udb.console
 
@@ -87,13 +86,6 @@ runclients() {
     done
 }
 
-# Start a channelbot server
-CHANNELCMD="../bin/channelbot -v -i 31 -c ..//keys/gateway.cmix.rip.crt -g $GATEWAY -f blobchannel"
-$CHANNELCMD >> $CHANNELOUT 2>&1 &
-PIDVAL=$!
-echo $PIDVAL >> results/serverpids
-echo "$CHANNELCMD -- $PIDVAL"
-
 # Start a user discovery bot server
 UDBCMD="../bin/udb -v --config udb.yaml"
 $UDBCMD >> $UDBOUT 2>&1 &
@@ -102,7 +94,7 @@ echo $PIDVAL >> results/serverpids
 echo "$UDBCMD -- $PIDVAL"
 
 # Start a dummy client
-DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY -m \"dummy\" --dummyfrequency 2 -c ../keys/gateway.cmix.rip.crt -f blobdummy"
+DUMMYCMD="../bin/client -i 23 -d 23 -g $GATEWAY -m \"dummy\" --dummyfrequency 2 -c ../keys/gateway.cmix.rip.crt -f blobdummy"
 $DUMMYCMD >> $DUMMYOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
@@ -150,14 +142,7 @@ eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.out 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 
-# Send a channel message that all clients will receive
-CLIENTCMD="timeout 60s ../bin/client -f blob8 -c ../keys/gateway.cmix.rip.crt -g $GATEWAY -i 8 -d 31 -m \"Channel, Hello\""
-eval $CLIENTCMD >> $CLIENTOUT/client8.out 2>&1 &
-PIDVAL=$!
-echo "$CLIENTCMD -- $PIDVAL"
-wait $PIDVAL
-
-sleep 10 # Spend some time waiting for the channel bot to send messages
+sleep 10
 
 echo "RUNNING CLIENTS..."
 runclients
@@ -180,9 +165,6 @@ 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
 diff -ruN results/server-errors.txt noerrors.txt
-cat $CHANNELOUT | grep "ERROR" > results/channel-errors.txt || true
-cat $CHANNELOUT | grep "FATAL" >> results/channel-errors.txt || true
-diff -ruN results/channel-errors.txt noerrors.txt
 cat $DUMMYOUT | grep "ERROR" > results/dummy-errors.txt || true
 cat $DUMMYOUT | grep "FATAL" >> results/dummy-errors.txt || true
 diff -ruN results/dummy-errors.txt noerrors.txt

basice2e/udb.yaml

@@ -6,4 +6,5 @@ gateways:
     - "localhost:8442"
     - "localhost:8441"
     - "localhost:8440"
-certPath: "../keys/gateway.cmix.rip.crt"
+gwCertPath: "../keys/gateway.cmix.rip.crt"
+regCertPath: "../keys/gateway.cmix.rip.crt"