projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a4f738
)
-removing dead options
author
Christian Grothoff
<christian@grothoff.org>
Tue, 2 Jul 2013 14:39:23 +0000
(14:39 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Tue, 2 Jul 2013 14:39:23 +0000
(14:39 +0000)
24 files changed:
src/dht/test_dht_api_data.conf
patch
|
blob
|
history
src/dht/test_dht_api_peer1.conf
patch
|
blob
|
history
src/dht/test_dht_monitor.conf
patch
|
blob
|
history
src/dht/test_dht_multipeer.conf
patch
|
blob
|
history
src/experimentation/test_experimentation_clique.conf
patch
|
blob
|
history
src/gns/test_gns_defaults.conf
patch
|
blob
|
history
src/gns/test_gns_dht_default.conf
patch
|
blob
|
history
src/gns/test_gns_simple_lookup.conf
patch
|
blob
|
history
src/lockmanager/test_lockmanager_api.conf
patch
|
blob
|
history
src/mesh/test_mesh.conf
patch
|
blob
|
history
src/peerinfo/Makefile.am
patch
|
blob
|
history
src/stream/test_stream_local.conf
patch
|
blob
|
history
src/testbed/test_testbed_api.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_statistics.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_test_timeout.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyclique.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyline.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyring.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
patch
|
blob
|
history
src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
patch
|
blob
|
history
diff --git
a/src/dht/test_dht_api_data.conf
b/src/dht/test_dht_api_data.conf
index 2d6b6b2d63716892ad0af0fa450c1d958ac57473..8529dce1e6c74812141d16eef022bce074f7ba0d 100644
(file)
--- 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
[dht]
PORT = 12370
-[block]
-plugins = dht test
-
[transport]
plugins = tcp
NEIGHBOUR_LIMIT = 50
[transport]
plugins = tcp
NEIGHBOUR_LIMIT = 50
@@
-55,16
+52,6
@@
PORT = 2087
TIMEOUT = 300 s
PORT = 2094
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
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@
-83,8
+70,5
@@
AUTOSTART = NO
[nse]
AUTOSTART = NO
[nse]
AUTOSTART = NO
-
[vpn]
AUTOSTART=NO
[vpn]
AUTOSTART=NO
-
-
diff --git
a/src/dht/test_dht_api_peer1.conf
b/src/dht/test_dht_api_peer1.conf
index 53c7ba434f55ecc0a9404ee35832a23a2a620efe..7439e8051a7da80c570f92b1eb8b698a4fb9bfa3 100644
(file)
--- 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
PORT = 12100
BINARY = gnunet-service-dht
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@
-42,16
+39,9
@@
TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
PORT = 12368
BINDTO = 127.0.0.1
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
-
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
@@
-64,12
+54,9
@@
USE_LOCALADDR = NO
[dns]
AUTOSTART = NO
[dns]
AUTOSTART = NO
-
-
[nse]
AUTOSTART = NO
[nse]
AUTOSTART = NO
-
[vpn]
AUTOSTART=NO
[vpn]
AUTOSTART=NO
diff --git
a/src/dht/test_dht_monitor.conf
b/src/dht/test_dht_monitor.conf
index c96a085075b12a8a80f702736121f94b50f51297..2b8ef5bde0fb9e525fef34fecadd14f4953bf3b7 100644
(file)
--- a/
src/dht/test_dht_monitor.conf
+++ b/
src/dht/test_dht_monitor.conf
@@
-4,9
+4,6
@@
AUTOSTART = NO
[resolver]
AUTOSTART = NO
[resolver]
AUTOSTART = NO
-[block]
-plugins = test dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@
-21,17
+18,11
@@
WAN_QUOTA_OUT = 1 GB
[arm]
DEFAULTSERVICES = dht core
[arm]
DEFAULTSERVICES = dht core
-[TESTING]
-WEAKRANDOM = YES
-
[testbed]
OVERLAY_TOPOLOGY = LINE
[testbed]
OVERLAY_TOPOLOGY = LINE
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
[PATHS]
-SERVICEHOME = /tmp/test-dht-m
ultipee
r/
+SERVICEHOME = /tmp/test-dht-m
onito
r/
[nat]
DISABLEV6 = YES
[nat]
DISABLEV6 = YES
diff --git
a/src/dht/test_dht_multipeer.conf
b/src/dht/test_dht_multipeer.conf
index bc9f245e353b3254aa673d53f319f1dcceb17228..1d8389a9e72292d57943fe68d85924d335f63a1a 100644
(file)
--- a/
src/dht/test_dht_multipeer.conf
+++ b/
src/dht/test_dht_multipeer.conf
@@
-4,9
+4,6
@@
AUTOSTART = NO
[resolver]
AUTOSTART = NO
[resolver]
AUTOSTART = NO
-[block]
-plugins = test dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
diff --git
a/src/experimentation/test_experimentation_clique.conf
b/src/experimentation/test_experimentation_clique.conf
index fb3d3b99ec046d5e378022dbc8cfdb645461e85b..bc6a34dcc4237d3bb9cbad749f69215993b73d31 100644
(file)
--- 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
AUTOSTART = YES
DISABLE_TRY_CONNECT = NO
-
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = udp
[transport]
PLUGINS = udp
@@
-57,11
+53,8
@@
PORT = 12366
TIMEOUT = 300 s
PORT = 12368
TIMEOUT = 300 s
PORT = 12368
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
[PATHS]
-SERVICEHOME = /tmp/test-
testbed
/
+SERVICEHOME = /tmp/test-
experimentation
/
[dns]
AUTOSTART = NO
[dns]
AUTOSTART = NO
diff --git
a/src/gns/test_gns_defaults.conf
b/src/gns/test_gns_defaults.conf
index 0fba7ca20bb8c5bc2e061ed7ac44a96e8ac14b36..f24f1faa9442fbcbf1b9c765e26aaec29477b9d6 100644
(file)
--- a/
src/gns/test_gns_defaults.conf
+++ b/
src/gns/test_gns_defaults.conf
@@
-27,7
+27,6
@@
PORT = 2570
[testing]
NUM_PEERS = 5
[testing]
NUM_PEERS = 5
-WEAKRANDOM = YES
F2F = YES
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
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 fa4876024810e301ddbec8fd0325314ee4a6345f..897109e908cce31730e997cc26c66d8339d9e01c 100644
(file)
--- 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
PORT = 2102
BINARY = gnunet-service-dht
-[block]
-plugins = dht test gns
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[arm]
PORT = 22566
[arm]
PORT = 22566
diff --git
a/src/gns/test_gns_simple_lookup.conf
b/src/gns/test_gns_simple_lookup.conf
index f759ba448c97af47aef603e0a9ca05609977caf4..687dff71e2fccc31ba45072c9c51b020b4b42a14 100644
(file)
--- 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
PORT = 12100
BINARY = gnunet-service-dht
-[block]
-plugins = dht test gns
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[transport]
PLUGINS = tcp
@@
-44,12
+41,6
@@
TIMEOUT = 300 s
PORT = 12368
BINDTO = 127.0.0.1
PORT = 12368
BINDTO = 127.0.0.1
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = zonefiles/test_zonekey
-
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
[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 4ac6b56472ada80c5ece9eb2c73033080fd1b757..e6b903f6bfb31ed71765cc1748b0f57a48fa3c59 100644
(file)
--- a/
src/lockmanager/test_lockmanager_api.conf
+++ b/
src/lockmanager/test_lockmanager_api.conf
@@
-18,12
+18,9
@@
AUTOSTART = NO
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[transport]
PLUGINS = tcp
@@
-49,15
+46,11
@@
PORT = 12368
[TESTING]
NUM_PEERS = 5
[TESTING]
NUM_PEERS = 5
-WEAKRANDOM = YES
HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
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/
[PATHS]
SERVICEHOME = /tmp/test-lockmanager/
diff --git
a/src/mesh/test_mesh.conf
b/src/mesh/test_mesh.conf
index 3520a0c026ecf627a6d4469288b0a13427a04e81..a898e6f2c99e7bfb6a0fbf466cda6fdbd155c5cd 100644
(file)
--- 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
DISABLE_TRY_CONNECT = YES
FORCE_NSE = 3
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[transport]
PLUGINS = tcp
@@
-70,12
+67,6
@@
PORT = 12366
TIMEOUT = 300 s
PORT = 12368
TIMEOUT = 300 s
PORT = 12368
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[dns]
AUTOSTART = NO
[dns]
AUTOSTART = NO
diff --git
a/src/peerinfo/Makefile.am
b/src/peerinfo/Makefile.am
index 59a0bddc51430416a01964357fae488d04074e2d..06e570a4327015783c1ce1eee8a767671116d92a 100644
(file)
--- a/
src/peerinfo/Makefile.am
+++ b/
src/peerinfo/Makefile.am
@@
-48,12
+48,13
@@
endif
if HAVE_TESTING
check_PROGRAMS = \
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_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)
if ENABLE_TEST_RUN
TESTS = $(check_PROGRAMS)
diff --git
a/src/stream/test_stream_local.conf
b/src/stream/test_stream_local.conf
index 35da4b4744d06f0f1df00c34346ce7874b1b86ec..dc4929a62e28c352a614b33652b764ddd40a07eb 100644
(file)
--- 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
HOSTNAME = localhost
PORT = 12100
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
DATABASE = sqlite
[dhtcache]
QUOTA = 1 MB
DATABASE = sqlite
diff --git
a/src/testbed/test_testbed_api.conf
b/src/testbed/test_testbed_api.conf
index 076484670bb0bfdcfa6002740dfee118a6827403..547a103fb5ecf0a89c6c1597df7185d4a25fb0b5 100644
(file)
--- a/
src/testbed/test_testbed_api.conf
+++ b/
src/testbed/test_testbed_api.conf
@@
-19,12
+19,9
@@
AUTOSTART = NO
[dht]
AUTOSTART = NO
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = udp
[transport]
PLUGINS = udp
diff --git
a/src/testbed/test_testbed_api_statistics.conf
b/src/testbed/test_testbed_api_statistics.conf
index c0836727aa0dbf6ee753fb30fc034cbd6eaf6ae1..6ab91d26030af45434dac3ff8605411fa06849a6 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[transport]
PLUGINS = tcp
diff --git
a/src/testbed/test_testbed_api_test_timeout.conf
b/src/testbed/test_testbed_api_test_timeout.conf
index 074de3d83a017ff91c8f96bce5fb1c682ed160d4..6a59353c8729f93182d81f163d92d8ac903ec904 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 5c7cd2271e60e14ef880f40bd3ee59d015512237..3dcc66ae39727d1bdceb6727b7583dc38c0108b2 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 a2d44ea21dae69eb4459e68ae6567233508ddec0..0dbf1dcc9ceebda99aeb77910b633bce02eb62d5 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 1d7037fda1863d49b1f979ca26967aede3c75eac..82b0f5de4577ede45fc569406771d1847a69a528 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = udp
[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 5524b4fb9ecdd43492c21547ddfe583dd4341bce..5ecca7de72956b1ad9493a35c9b8e42468c9bc28 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 dc36b4e9ec5a22bd29101dba1f41792c448f78bc..15e9e0fb449c1f15dcd957f644457bedcb6e4303 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 d8c41d58bef459b5eed1bfc6a24b7c97dd841297..b6a1e285a35d54217e59008da4533e6dbbaa28e3 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 d8c41d58bef459b5eed1bfc6a24b7c97dd841297..b6a1e285a35d54217e59008da4533e6dbbaa28e3 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 08537cb8d07de14aae4548e328e2d5216c016dd1..a0a71512988ae397bbceb68eb30041a5715464b9 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[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 637ad25a01898cb70e4b04c95a8afc508afe243e..029f621576b08bb70010de3baf00b319983cfd9c 100644
(file)
--- 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
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
[dhtcache]
QUOTA = 1 MB
-DATABASE =
sqlite
+DATABASE =
heap
[transport]
PLUGINS = tcp
[transport]
PLUGINS = tcp