RECLAIM: refactoring; cleanup

[oweals/gnunet.git] / src / dht / test_dht_api_peer1.conf

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 6bd5a892093c6516123e1d6e5e28711e44e3f639..230aa0fa487003e2881c494ba16fa5b1d912ca4c 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -1,58 +1,27 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[dht]
-DEBUG = NO
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 2100
-BINARY = gnunet-service-dht
-
-[block]
-plugins = dht test
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
-DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
-[core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
-PORT = 12092
-
-[arm]
-DEFAULTSERVICES = core
-PORT = 12366
-DEBUG = NO
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
+TIMEOUT = 300 s
 BINDTO = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
-DEFAULTCONFIG = test_dht_api_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
-
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dht-peer-1/
 
 [nat]
 DISABLEV6 = YES
@@ -63,12 +32,10 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-
+[dht]
+START_ON_DEMAND = YES
+IMMEDIATE_START = YES
 
 [nse]
-AUTOSTART = NO
-
-
+START_ON_DEMAND = YES
+WORKBITS = 1