fix

[oweals/gnunet.git] / src / nse / test_nse.conf

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index ab64dffe28fd205246f12c9f691a12d6fda2bf47..5652fa4ead2462b3fd6c1493f05290cde87f3f1b 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/test-nse-multipeer/
-DEFAULTCONFIG = test_nse.conf
 
 [nse]
 PORT = 22353
@@ -9,13 +8,11 @@ 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 = 120000
+WORKDELAY = 1 ms
+INTERVAL = 60 s
 WORKBITS = 1
 
 HISTOGRAM = $SERVICEHOME/nse-histogram
@@ -25,7 +22,6 @@ HISTOGRAM = $SERVICEHOME/nse-histogram
 PORT = 22354
 DEFAULTSERVICES = nse core
 UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
 
 [fs]
 AUTOSTART = NO
@@ -58,20 +54,23 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 100
 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
 
 
+[consensus]
+AUTOSTART = NO