refactor DHT for new service API

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

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index b6239140ef2ee8ccb3b7d605e9a9fd700d642f4b..c6061f421b7d8a456da9630ef6bf71b52ab8bf09 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -2,45 +2,16 @@
 GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
 
 [nse]
-PORT = 22353
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-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
+FORCESTART = YES
 PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 1 ms
 INTERVAL = 60 s
 WORKBITS = 1
-
 HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
 
-
-[arm]
-PORT = 22354
-DEFAULTSERVICES = nse core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = YES
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1
@@ -50,27 +21,3 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[dns]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 10
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = SMALL_WORLD_RING
-PERCENTAGE = 3
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-
-DELETE_FILES = NO
-
-
-[consensus]
-AUTOSTART = NO