-removing dead options

24 files changed, 21 insertions, 136 deletions

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 2d6b6b2d6..8529dce1e 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -30,9 +30,6 @@ PORT = 2092
 [dht]
 PORT = 12370
 
-[block]
-plugins = dht test
-
 [transport]
 plugins = tcp
 NEIGHBOUR_LIMIT = 50
@@ -55,16 +52,6 @@ PORT = 2087
 TIMEOUT = 300 s
 PORT = 2094
 
-[TESTING]
-WEAKRANDOM = NO
-
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1
@@ -83,8 +70,5 @@ AUTOSTART = NO
 [nse]
 AUTOSTART = NO
 
-
 [vpn]
 AUTOSTART=NO
-
-
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 53c7ba434..7439e8051 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -12,9 +12,6 @@ HOSTNAME = localhost
 PORT = 12100
 BINARY = gnunet-service-dht
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -42,16 +39,9 @@ TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
 SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
 
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -64,12 +54,9 @@ USE_LOCALADDR = NO
 [dns]
 AUTOSTART = NO
 
-
-
 [nse]
 AUTOSTART = NO
 
-
 [vpn]
 AUTOSTART=NO
 
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index c96a08507..2b8ef5bde 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -4,9 +4,6 @@ AUTOSTART = NO
 [resolver]
 AUTOSTART = NO
 
-[block]
-plugins = test dht
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -21,17 +18,11 @@ WAN_QUOTA_OUT = 1 GB
 [arm]
 DEFAULTSERVICES = dht core
 
-[TESTING]
-WEAKRANDOM = YES
-
 [testbed]
 OVERLAY_TOPOLOGY = LINE
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
-SERVICEHOME = /tmp/test-dht-multipeer/
+SERVICEHOME = /tmp/test-dht-monitor/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index bc9f245e3..1d8389a9e 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -4,9 +4,6 @@ AUTOSTART = NO
 [resolver]
 AUTOSTART = NO
 
-[block]
-plugins = test dht
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf
index fb3d3b99e..bc6a34dcc 100644
--- a/src/experimentation/test_experimentation_clique.conf
+++ b/src/experimentation/test_experimentation_clique.conf
@@ -20,13 +20,9 @@ AUTOSTART = NO
 AUTOSTART = YES
 DISABLE_TRY_CONNECT = NO
 
-
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = udp
@@ -57,11 +53,8 @@ PORT = 12366
 TIMEOUT = 300 s
 PORT = 12368
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = /tmp/test-experimentation/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 0fba7ca20..f24f1faa9 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -27,7 +27,6 @@ PORT = 2570
 
 [testing]
 NUM_PEERS = 5
-WEAKRANDOM = YES
 F2F = YES
 HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
diff --git a/src/gns/test_gns_dht_default.conf b/src/gns/test_gns_dht_default.conf
index fa4876024..897109e90 100644
--- a/src/gns/test_gns_dht_default.conf
+++ b/src/gns/test_gns_dht_default.conf
@@ -14,12 +14,9 @@ HOSTNAME = localhost
 PORT = 2102
 BINARY = gnunet-service-dht
 
-[block]
-plugins = dht test gns
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [arm]
 PORT = 22566
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index f759ba448..687dff71e 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -14,12 +14,9 @@ HOSTNAME = localhost
 PORT = 12100
 BINARY = gnunet-service-dht
 
-[block]
-plugins = dht test gns
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
@@ -44,12 +41,6 @@ TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = zonefiles/test_zonekey
-
 [PATHS]
 SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
 
diff --git a/src/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf
index 4ac6b5647..e6b903f6b 100644
--- a/src/lockmanager/test_lockmanager_api.conf
+++ b/src/lockmanager/test_lockmanager_api.conf
@@ -18,12 +18,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
@@ -49,15 +46,11 @@ PORT = 12368
 
 [TESTING]
 NUM_PEERS = 5
-WEAKRANDOM = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
 SERVICEHOME = /tmp/test-lockmanager/
 
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 3520a0c02..a898e6f2c 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -41,12 +41,9 @@ PORT = 12100
 DISABLE_TRY_CONNECT = YES
 FORCE_NSE = 3
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
@@ -70,12 +67,6 @@ PORT = 12366
 TIMEOUT = 300 s
 PORT = 12368
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [dns]
 AUTOSTART = NO
 
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 59a0bddc5..06e570a43 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -48,12 +48,13 @@ endif
 
 if HAVE_TESTING
 check_PROGRAMS = \
- test_peerinfo_shipped_hellos \
  test_peerinfo_api \
  test_peerinfo_api_friend_only \
  test_peerinfo_api_notify_friend_only \
  $(PEERINFO_BENCHMARKS) 
 endif
+# test_peerinfo_shipped_hellos 
+
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
index 35da4b474..dc4929a62 100644
--- a/src/stream/test_stream_local.conf
+++ b/src/stream/test_stream_local.conf
@@ -30,9 +30,6 @@ ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 12100
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = sqlite
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 076484670..547a103fb 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = udp
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index c0836727a..6ab91d260 100644
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -20,12 +20,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_test_timeout.conf b/src/testbed/test_testbed_api_test_timeout.conf
index 074de3d83..6a59353c8 100644
--- a/src/testbed/test_testbed_api_test_timeout.conf
+++ b/src/testbed/test_testbed_api_test_timeout.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
index 5c7cd2271..3dcc66ae3 100644
--- a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index a2d44ea21..0dbf1dcc9 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
index 1d7037fda..82b0f5de4 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
@@ -20,12 +20,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = udp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 5524b4fb9..5ecca7de7 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
index dc36b4e9e..15e9e0fb4 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
index d8c41d58b..b6a1e285a 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
index d8c41d58b..b6a1e285a 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
index 08537cb8d..a0a715129 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
index 637ad25a0..029f62157 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
@@ -19,12 +19,9 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp