diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-07-02 14:39:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-07-02 14:39:23 +0000 |
commit | 2438c97cbbe2411bc5dd7c2d33f1adda284c4e2d (patch) | |
tree | 7fc78d61ae1a201584dd2df6906986e1fdbbba04 | |
parent | 1a4f73873bfa7eabccb76ef3657d2225f755fd04 (diff) | |
download | gnunet-2438c97cbbe2411bc5dd7c2d33f1adda284c4e2d.tar.gz gnunet-2438c97cbbe2411bc5dd7c2d33f1adda284c4e2d.zip |
-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 | |||
30 | [dht] | 30 | [dht] |
31 | PORT = 12370 | 31 | PORT = 12370 |
32 | 32 | ||
33 | [block] | ||
34 | plugins = dht test | ||
35 | |||
36 | [transport] | 33 | [transport] |
37 | plugins = tcp | 34 | plugins = tcp |
38 | NEIGHBOUR_LIMIT = 50 | 35 | NEIGHBOUR_LIMIT = 50 |
@@ -55,16 +52,6 @@ PORT = 2087 | |||
55 | TIMEOUT = 300 s | 52 | TIMEOUT = 300 s |
56 | PORT = 2094 | 53 | PORT = 2094 |
57 | 54 | ||
58 | [TESTING] | ||
59 | WEAKRANDOM = NO | ||
60 | |||
61 | [testing_old] | ||
62 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | ||
63 | |||
64 | [gnunetd] | ||
65 | HOSTKEY = $SERVICEHOME/.hostkey | ||
66 | |||
67 | |||
68 | [nat] | 55 | [nat] |
69 | DISABLEV6 = YES | 56 | DISABLEV6 = YES |
70 | BINDTO = 127.0.0.1 | 57 | BINDTO = 127.0.0.1 |
@@ -83,8 +70,5 @@ AUTOSTART = NO | |||
83 | [nse] | 70 | [nse] |
84 | AUTOSTART = NO | 71 | AUTOSTART = NO |
85 | 72 | ||
86 | |||
87 | [vpn] | 73 | [vpn] |
88 | AUTOSTART=NO | 74 | AUTOSTART=NO |
89 | |||
90 | |||
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 | |||
12 | PORT = 12100 | 12 | PORT = 12100 |
13 | BINARY = gnunet-service-dht | 13 | BINARY = gnunet-service-dht |
14 | 14 | ||
15 | [block] | ||
16 | plugins = dht test | ||
17 | |||
18 | [dhtcache] | 15 | [dhtcache] |
19 | QUOTA = 1 MB | 16 | QUOTA = 1 MB |
20 | DATABASE = heap | 17 | DATABASE = heap |
@@ -42,16 +39,9 @@ TIMEOUT = 300 s | |||
42 | PORT = 12368 | 39 | PORT = 12368 |
43 | BINDTO = 127.0.0.1 | 40 | BINDTO = 127.0.0.1 |
44 | 41 | ||
45 | [TESTING] | ||
46 | WEAKRANDOM = YES | ||
47 | |||
48 | [gnunetd] | ||
49 | HOSTKEY = $SERVICEHOME/.hostkey | ||
50 | |||
51 | [PATHS] | 42 | [PATHS] |
52 | SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ | 43 | SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ |
53 | 44 | ||
54 | |||
55 | [nat] | 45 | [nat] |
56 | DISABLEV6 = YES | 46 | DISABLEV6 = YES |
57 | ENABLE_UPNP = NO | 47 | ENABLE_UPNP = NO |
@@ -64,12 +54,9 @@ USE_LOCALADDR = NO | |||
64 | [dns] | 54 | [dns] |
65 | AUTOSTART = NO | 55 | AUTOSTART = NO |
66 | 56 | ||
67 | |||
68 | |||
69 | [nse] | 57 | [nse] |
70 | AUTOSTART = NO | 58 | AUTOSTART = NO |
71 | 59 | ||
72 | |||
73 | [vpn] | 60 | [vpn] |
74 | AUTOSTART=NO | 61 | AUTOSTART=NO |
75 | 62 | ||
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 | |||
4 | [resolver] | 4 | [resolver] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
6 | 6 | ||
7 | [block] | ||
8 | plugins = test dht | ||
9 | |||
10 | [dhtcache] | 7 | [dhtcache] |
11 | QUOTA = 1 MB | 8 | QUOTA = 1 MB |
12 | DATABASE = heap | 9 | DATABASE = heap |
@@ -21,17 +18,11 @@ WAN_QUOTA_OUT = 1 GB | |||
21 | [arm] | 18 | [arm] |
22 | DEFAULTSERVICES = dht core | 19 | DEFAULTSERVICES = dht core |
23 | 20 | ||
24 | [TESTING] | ||
25 | WEAKRANDOM = YES | ||
26 | |||
27 | [testbed] | 21 | [testbed] |
28 | OVERLAY_TOPOLOGY = LINE | 22 | OVERLAY_TOPOLOGY = LINE |
29 | 23 | ||
30 | [gnunetd] | ||
31 | HOSTKEY = $SERVICEHOME/.hostkey | ||
32 | |||
33 | [PATHS] | 24 | [PATHS] |
34 | SERVICEHOME = /tmp/test-dht-multipeer/ | 25 | SERVICEHOME = /tmp/test-dht-monitor/ |
35 | 26 | ||
36 | [nat] | 27 | [nat] |
37 | DISABLEV6 = YES | 28 | 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 | |||
4 | [resolver] | 4 | [resolver] |
5 | AUTOSTART = NO | 5 | AUTOSTART = NO |
6 | 6 | ||
7 | [block] | ||
8 | plugins = test dht | ||
9 | |||
10 | [dhtcache] | 7 | [dhtcache] |
11 | QUOTA = 1 MB | 8 | QUOTA = 1 MB |
12 | DATABASE = heap | 9 | 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 | |||
20 | AUTOSTART = YES | 20 | AUTOSTART = YES |
21 | DISABLE_TRY_CONNECT = NO | 21 | DISABLE_TRY_CONNECT = NO |
22 | 22 | ||
23 | |||
24 | [block] | ||
25 | plugins = dht test | ||
26 | |||
27 | [dhtcache] | 23 | [dhtcache] |
28 | QUOTA = 1 MB | 24 | QUOTA = 1 MB |
29 | DATABASE = sqlite | 25 | DATABASE = heap |
30 | 26 | ||
31 | [transport] | 27 | [transport] |
32 | PLUGINS = udp | 28 | PLUGINS = udp |
@@ -57,11 +53,8 @@ PORT = 12366 | |||
57 | TIMEOUT = 300 s | 53 | TIMEOUT = 300 s |
58 | PORT = 12368 | 54 | PORT = 12368 |
59 | 55 | ||
60 | [gnunetd] | ||
61 | HOSTKEY = $SERVICEHOME/.hostkey | ||
62 | |||
63 | [PATHS] | 56 | [PATHS] |
64 | SERVICEHOME = /tmp/test-testbed/ | 57 | SERVICEHOME = /tmp/test-experimentation/ |
65 | 58 | ||
66 | [dns] | 59 | [dns] |
67 | AUTOSTART = NO | 60 | 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 | |||
27 | 27 | ||
28 | [testing] | 28 | [testing] |
29 | NUM_PEERS = 5 | 29 | NUM_PEERS = 5 |
30 | WEAKRANDOM = YES | ||
31 | F2F = YES | 30 | F2F = YES |
32 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | 31 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat |
33 | 32 | ||
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 | |||
14 | PORT = 2102 | 14 | PORT = 2102 |
15 | BINARY = gnunet-service-dht | 15 | BINARY = gnunet-service-dht |
16 | 16 | ||
17 | [block] | ||
18 | plugins = dht test gns | ||
19 | |||
20 | [dhtcache] | 17 | [dhtcache] |
21 | QUOTA = 1 MB | 18 | QUOTA = 1 MB |
22 | DATABASE = sqlite | 19 | DATABASE = heap |
23 | 20 | ||
24 | [arm] | 21 | [arm] |
25 | PORT = 22566 | 22 | 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 | |||
14 | PORT = 12100 | 14 | PORT = 12100 |
15 | BINARY = gnunet-service-dht | 15 | BINARY = gnunet-service-dht |
16 | 16 | ||
17 | [block] | ||
18 | plugins = dht test gns | ||
19 | |||
20 | [dhtcache] | 17 | [dhtcache] |
21 | QUOTA = 1 MB | 18 | QUOTA = 1 MB |
22 | DATABASE = sqlite | 19 | DATABASE = heap |
23 | 20 | ||
24 | [transport] | 21 | [transport] |
25 | PLUGINS = tcp | 22 | PLUGINS = tcp |
@@ -44,12 +41,6 @@ TIMEOUT = 300 s | |||
44 | PORT = 12368 | 41 | PORT = 12368 |
45 | BINDTO = 127.0.0.1 | 42 | BINDTO = 127.0.0.1 |
46 | 43 | ||
47 | [TESTING] | ||
48 | WEAKRANDOM = YES | ||
49 | |||
50 | [gnunetd] | ||
51 | HOSTKEY = zonefiles/test_zonekey | ||
52 | |||
53 | [PATHS] | 44 | [PATHS] |
54 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ | 45 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ |
55 | 46 | ||
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 | |||
18 | [dht] | 18 | [dht] |
19 | AUTOSTART = NO | 19 | AUTOSTART = NO |
20 | 20 | ||
21 | [block] | ||
22 | plugins = dht test | ||
23 | |||
24 | [dhtcache] | 21 | [dhtcache] |
25 | QUOTA = 1 MB | 22 | QUOTA = 1 MB |
26 | DATABASE = sqlite | 23 | DATABASE = heap |
27 | 24 | ||
28 | [transport] | 25 | [transport] |
29 | PLUGINS = tcp | 26 | PLUGINS = tcp |
@@ -49,15 +46,11 @@ PORT = 12368 | |||
49 | 46 | ||
50 | [TESTING] | 47 | [TESTING] |
51 | NUM_PEERS = 5 | 48 | NUM_PEERS = 5 |
52 | WEAKRANDOM = YES | ||
53 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 49 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
54 | MAX_CONCURRENT_SSH = 10 | 50 | MAX_CONCURRENT_SSH = 10 |
55 | USE_PROGRESSBARS = YES | 51 | USE_PROGRESSBARS = YES |
56 | PEERGROUP_TIMEOUT = 2400 s | 52 | PEERGROUP_TIMEOUT = 2400 s |
57 | 53 | ||
58 | [gnunetd] | ||
59 | HOSTKEY = $SERVICEHOME/.hostkey | ||
60 | |||
61 | [PATHS] | 54 | [PATHS] |
62 | SERVICEHOME = /tmp/test-lockmanager/ | 55 | SERVICEHOME = /tmp/test-lockmanager/ |
63 | 56 | ||
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 | |||
41 | DISABLE_TRY_CONNECT = YES | 41 | DISABLE_TRY_CONNECT = YES |
42 | FORCE_NSE = 3 | 42 | FORCE_NSE = 3 |
43 | 43 | ||
44 | [block] | ||
45 | plugins = dht test | ||
46 | |||
47 | [dhtcache] | 44 | [dhtcache] |
48 | QUOTA = 1 MB | 45 | QUOTA = 1 MB |
49 | DATABASE = sqlite | 46 | DATABASE = heap |
50 | 47 | ||
51 | [transport] | 48 | [transport] |
52 | PLUGINS = tcp | 49 | PLUGINS = tcp |
@@ -70,12 +67,6 @@ PORT = 12366 | |||
70 | TIMEOUT = 300 s | 67 | TIMEOUT = 300 s |
71 | PORT = 12368 | 68 | PORT = 12368 |
72 | 69 | ||
73 | [TESTING] | ||
74 | WEAKRANDOM = YES | ||
75 | |||
76 | [gnunetd] | ||
77 | HOSTKEY = $SERVICEHOME/.hostkey | ||
78 | |||
79 | [dns] | 70 | [dns] |
80 | AUTOSTART = NO | 71 | AUTOSTART = NO |
81 | 72 | ||
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 | |||
48 | 48 | ||
49 | if HAVE_TESTING | 49 | if HAVE_TESTING |
50 | check_PROGRAMS = \ | 50 | check_PROGRAMS = \ |
51 | test_peerinfo_shipped_hellos \ | ||
52 | test_peerinfo_api \ | 51 | test_peerinfo_api \ |
53 | test_peerinfo_api_friend_only \ | 52 | test_peerinfo_api_friend_only \ |
54 | test_peerinfo_api_notify_friend_only \ | 53 | test_peerinfo_api_notify_friend_only \ |
55 | $(PEERINFO_BENCHMARKS) | 54 | $(PEERINFO_BENCHMARKS) |
56 | endif | 55 | endif |
56 | # test_peerinfo_shipped_hellos | ||
57 | |||
57 | 58 | ||
58 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
59 | TESTS = $(check_PROGRAMS) | 60 | 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; | |||
30 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
31 | PORT = 12100 | 31 | PORT = 12100 |
32 | 32 | ||
33 | [block] | ||
34 | plugins = dht test | ||
35 | |||
36 | [dhtcache] | 33 | [dhtcache] |
37 | QUOTA = 1 MB | 34 | QUOTA = 1 MB |
38 | DATABASE = sqlite | 35 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = udp | 27 | 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 | |||
20 | [dht] | 20 | [dht] |
21 | AUTOSTART = NO | 21 | AUTOSTART = NO |
22 | 22 | ||
23 | [block] | ||
24 | plugins = dht test | ||
25 | |||
26 | [dhtcache] | 23 | [dhtcache] |
27 | QUOTA = 1 MB | 24 | QUOTA = 1 MB |
28 | DATABASE = sqlite | 25 | DATABASE = heap |
29 | 26 | ||
30 | [transport] | 27 | [transport] |
31 | PLUGINS = tcp | 28 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
20 | [dht] | 20 | [dht] |
21 | AUTOSTART = NO | 21 | AUTOSTART = NO |
22 | 22 | ||
23 | [block] | ||
24 | plugins = dht test | ||
25 | |||
26 | [dhtcache] | 23 | [dhtcache] |
27 | QUOTA = 1 MB | 24 | QUOTA = 1 MB |
28 | DATABASE = sqlite | 25 | DATABASE = heap |
29 | 26 | ||
30 | [transport] | 27 | [transport] |
31 | PLUGINS = udp | 28 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | 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 | |||
19 | [dht] | 19 | [dht] |
20 | AUTOSTART = NO | 20 | AUTOSTART = NO |
21 | 21 | ||
22 | [block] | ||
23 | plugins = dht test | ||
24 | |||
25 | [dhtcache] | 22 | [dhtcache] |
26 | QUOTA = 1 MB | 23 | QUOTA = 1 MB |
27 | DATABASE = sqlite | 24 | DATABASE = heap |
28 | 25 | ||
29 | [transport] | 26 | [transport] |
30 | PLUGINS = tcp | 27 | PLUGINS = tcp |