REST/NAMESTORE: rework API

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

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 4508e9ca7ac7f317769e88945deb1cd5a31df859..6b5aaff49d72690be4408d0e54f379e1d3c2b62d 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,49 +1,19 @@
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
+
 [PATHS]
-SERVICEHOME = /tmp/test-nse-multipeer/
-DEFAULTCONFIG = test_nse.conf
+GNUNET_TEST_HOME = $GNUNET_TMP/test-nse-multipeer/
 
 [nse]
-PORT = 22353
-UNIXPATH = /tmp/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
-DEBUG = NO
-CONFIG = $DEFAULTCONFIG
-PROOFFILE = $SERVICEHOME/proof.nse
+IMMEDIATE_START = 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 = $SERVICEHOME/nse-histogram
-
-
-[arm]
-PORT = 22354
-DEFAULTSERVICES = nse core
-UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = YES
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
+HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
 
 [nat]
 DISABLEV6 = YES
@@ -54,26 +24,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
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-
-DELETE_FILES = NO
-
-