X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnse%2Ftest_nse.conf;h=003703bb7d841120412d42fe43a94c18642bbff2;hb=9b0414d6f98f33d7e1c33dafe105eb58da0bf79b;hp=35adc0cad3b9e9ef56f1bbe994fc1dab5a1fb932;hpb=8cfd6503c9292c8fb2d5b4a6ee00193645bd86d4;p=oweals%2Fgnunet.git

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 35adc0cad..003703bb7 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,6 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-nse/
-DEFAULTCONFIG = test_nse.conf
+SERVICEHOME = /tmp/test-nse-multipeer/
 
 [nse]
 PORT = 22353
@@ -9,22 +8,20 @@ BINARY = gnunet-service-nse
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
 AUTOSTART = YES
-DEBUG = YES
-CONFIG = $DEFAULTCONFIG
-
+PROOFFILE = $SERVICEHOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
-WORKDELAY = 1
-INTERVAL = 15000
-WORKBITS = 8
+WORKDELAY = 1 ms
+INTERVAL = 60 s
+WORKBITS = 1
 
+HISTOGRAM = $SERVICEHOME/nse-histogram
 
 
 [arm]
 PORT = 22354
 DEFAULTSERVICES = nse core
 UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
 
 [fs]
 AUTOSTART = NO
@@ -57,19 +54,21 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 10
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 10
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = SMALL_WORLD_RING
 PERCENTAGE = 3
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
 
+DELETE_FILES = NO