Skip to content
Snippets Groups Projects
Commit 5753dd13 authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	basice2e/permissioning.yaml
#	smokeinfra/permissioning.yaml
parents d36181ac 1b17ee39
No related branches found
No related tags found
1 merge request!4Release
...@@ -43,3 +43,24 @@ Message received: Hello from Niamh101, with E2E Encryption ...@@ -43,3 +43,24 @@ Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption Message received: Hello from Niamh101, with E2E Encryption
Received 20 Received 20
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Sent: Hello from Jake100, with E2E Encryption
Received 0
...@@ -42,3 +42,24 @@ Message received: Hello from Jake100, with E2E Encryption ...@@ -42,3 +42,24 @@ Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption Message received: Hello from Jake100, with E2E Encryption
Received 20 Received 20
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Received 20
...@@ -19,13 +19,17 @@ dbAddress: "0.0.0.0:6969" ...@@ -19,13 +19,17 @@ dbAddress: "0.0.0.0:6969"
minimumNodes: 5 minimumNodes: 5
minGatewayVersion: "1.1.0" minGatewayVersion: "2.0.0"
minServerVersion: "1.0.0" minServerVersion: "2.0.0"
minClientVersion: "1.0.0" minClientVersion: "2.0.0"
nodeMetricInterval: 3 nodeMetricInterval: 3
disableGatewayPing: true disableGatewayPing: true
# Disable pruning of NDF for offline nodes
# if set to false, network will sleep for five minutes on start
disableNDFPruning: true
# "Location of the user discovery contact file. # "Location of the user discovery contact file.
udContactPath: "results/udContact.bin" udContactPath: "results/udContact.bin"
udbAddress: "127.0.0.1:18001" udbAddress: "127.0.0.1:18001"
......
...@@ -351,6 +351,22 @@ eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true & ...@@ -351,6 +351,22 @@ eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
wait $PIDVAL2
# Now we are just going to exhaust all the keys we have and see if we
# use the unconfirmed channels
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 0 -m \"Hello from Jake100, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
# And receive those messages sent to us
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 0 --receiveCount 20"
eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL2
echo "FORCING HISTORICAL ROUNDS..." echo "FORCING HISTORICAL ROUNDS..."
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\"" 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\""
...@@ -370,7 +386,7 @@ wait $PIDVAL2 ...@@ -370,7 +386,7 @@ wait $PIDVAL2
echo "TESTING SINGLE-USE" echo "TESTING SINGLE-USE"
# Generate contact file for client52 # Generate contact file for client52
CLIENTCMD="../bin/client init -s blob52 -l $CLIENTOUT/client52.log --password hello --ndf ndf.json --writeContact $CLIENTOUT/jono52-contact.bin" CLIENTCMD="../bin/client init -s blob52 -l $CLIENTOUT/client52.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/jono52-contact.bin"
eval $CLIENTCMD >> /dev/null 2>&1 || true & eval $CLIENTCMD >> /dev/null 2>&1 || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
......
...@@ -21,13 +21,17 @@ dbAddress: "0.0.0.0:6969" ...@@ -21,13 +21,17 @@ dbAddress: "0.0.0.0:6969"
minimumNodes: 3 minimumNodes: 3
minGatewayVersion: "1.1.0" minGatewayVersion: "2.0.0"
minServerVersion: "1.0.0" minServerVersion: "2.0.0"
minClientVersion: "1.0.0" minClientVersion: "2.0.0"
nodeMetricInterval: 3 nodeMetricInterval: 3
disableGatewayPing: true disableGatewayPing: true
# Disable pruning of NDF for offline nodes
# if set to false, network will sleep for five minutes on start
disableNDFPruning: true
clientRegCodes: clientRegCodes:
- "FFFF" - "FFFF"
- "GGGG" - "GGGG"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment