Skip to content
Snippets Groups Projects
Commit 4e1d54ca authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Push fix for historical rounds

parent cb2e5d82
No related branches found
No related tags found
No related merge requests found
......@@ -34,9 +34,9 @@ DUMMYOUT=results/dummy-console.txt
UDBOUT=results/udb-console.txt
CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS="--password hello --ndf results/ndf.json --waitTimeout 90 --unsafe-channel-creation -v 1"
CLIENTUDOPTS="--password hello --ndf results/ndf.json -v 1"
CLIENTSINGLEOPTS="--password hello --ndf results/ndf.json -v 1"
CLIENTOPTS="--password hello --ndf results/ndf.json --waitTimeout 90 --unsafe-channel-creation -v 2"
CLIENTUDOPTS="--password hello --ndf results/ndf.json -v 2"
CLIENTSINGLEOPTS="--password hello --ndf results/ndf.json -v 2"
mkdir -p $SERVERLOGS
mkdir -p $GATEWAYLOGS
......@@ -250,7 +250,6 @@ then
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL || true
fi
echo "FORCING HISTORICAL ROUNDS... (NON-E2E, PRECAN)"
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceHistoricalRounds --unsafe -l $CLIENTOUT/client35.log -s blob35 --sendid 1 --destid 2 --sendCount 5 --receiveCount 5 -m \"Hello from 1, without E2E Encryption\""
......@@ -264,6 +263,8 @@ echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
wait $PIDVAL2
fi
# Non-precanned E2E user messaging
echo "SENDING E2E MESSAGES TO NEW USERS..."
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --writeContact $CLIENTOUT/rick42-contact.bin --unsafe -m \"Hello from Rick42 to myself, without E2E Encryption\""
......@@ -456,7 +457,7 @@ cp $CLIENTOUT/*.txt $CLIENTCLEAN/
sed -i.bak 's/Sending\ to\ .*\:/Sent:/g' $CLIENTCLEAN/client*.txt
sed -i.bak 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client*.txt
sed -i.bak 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt
sed -i.bak 's/uthenticat.*$//g' $CLIENTCLEAN/client*.txt
#sed -i.bak 's/uthenticat.*$//g' $CLIENTCLEAN/client*.txt
rm $CLIENTCLEAN/client*.txt.bak
# for C in $(ls -1 $CLIENTCLEAN); do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment