WIP: Change flags

basice2e/run.sh

@@ -1206,25 +1206,25 @@ echo "RUNNING CLIENTS..."
 echo "TESTING CHANNELS..."
 
 # Initialize creator of channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 240s ../bin/client channels -s blob500 -l $CLIENTOPTS $CLIENTOUT/client500.log --channelIdentityPath $CLIENTOUT/channel500 --new --send \"Hello channel, this is 500\""
+CLIENTCMD="timeout 240s ../bin/client channels -s blob500 $CLIENTOPTS -l $CLIENTOUT/client500.log --channelIdentityPath $CLIENTOUT/channel500 --newChannel --sendToChannel --message \"Hello, channel, this is 500\""
 eval $CLIENTCMD > $CLIENTOUT/client500.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-wait PIDVAL1
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
 
 # Initialize client which will join channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 240s ../bin/client channels -s blob501 -l $CLIENTOPTS $CLIENTOUT/client501.log --channelIdentityPath $CLIENTOUT/channel501 --join --send \"Hello channel, this is 501\""
+CLIENTCMD="timeout 240s ../bin/client channels -s blob501 -l $CLIENTOPTS $CLIENTOUT/client501.log --channelIdentityPath $CLIENTOUT/channel501 --join --send -m \"Hello, channel, this is 501\""
 eval $CLIENTCMD > $CLIENTOUT/client501.txt 2>&1 &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
-wait PIDVAL2
+wait $PIDVAL2
 
 # Initialize another client which will join channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 240s ../bin/client channels -s blob502 -l $CLIENTOPTS $CLIENTOUT/client502.log --channelIdentityPath $CLIENTOUT/channel502 --join --send \"Hello channel, this is 502\""
+CLIENTCMD="timeout 240s ../bin/client channels -s blob502 -l $CLIENTOPTS $CLIENTOUT/client502.log --channelIdentityPath $CLIENTOUT/channel502 --join --send -m \"Hello, channel, this is 502\""
 eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 &
 PIDVAL3=$!
 echo "$CLIENTCMD -- $PIDVAL3"
-wait PIDVAL3
+wait $PIDVAL3
 
 # All clients will leave the channel
 CLIENTCMD="timeout 240s ../bin/client channels -s blob500 -l $CLIENTOPTS $CLIENTOUT/client500.log --channelIdentityPath $CLIENTOUT/channel500 --leave"
@@ -1234,14 +1234,18 @@ echo "$CLIENTCMD -- $PIDVAL1"
 
 CLIENTCMD="timeout 240s ../bin/client channels -s blob501 -l $CLIENTOPTS $CLIENTOUT/client501.log --channelIdentityPath $CLIENTOUT/channel501 --leave"
 eval $CLIENTCMD > $CLIENTOUT/client501.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL2"
 
 # Initialize another client which will join channel (will use default channel file path in CLI)
 CLIENTCMD="timeout 240s ../bin/client channels -s blob502 -l $CLIENTOPTS $CLIENTOUT/client502.log --channelIdentityPath $CLIENTOUT/channel502 --leave"
 eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
+PIDVAL3=$!
+echo "$CLIENTCMD -- $PIDVAL3"
+
+wait $PIDVAL3
+wait $PIDVAL2
+wait $PIDVAL1
 
 echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..."