-fixes

[oweals/gnunet.git] / src / testing / test_testing_data_topology_none.conf

diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 6ef4c3697b9095cc70291a4ba98c6bce5e368404..dbee5d0b93076d5627c39207d57652fb70cbfc57 100644 (file)
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -1,59 +1,37 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-AUTOSTART = NO
-PORT = 0
-
-[transport]
-PORT = 0
-PLUGINS = tcp
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=massif
-
-[topology]
-PORT = 0
+[TESTING]
+NUM_PEERS = 1000
+TOPOLOGY = NONE
+F2F = NO
+BLACKLIST_TOPOLOGY = NONE
+CONNECT_TOPOLOGY = RING
 
 [arm]
 PORT = 0
-DEFAULTSERVICES = 
 
 [statistics]
 AUTOSTART = NO
 PORT = 0
 
-[transport-tcp]
-PORT = 2568
-BINDTO = 127.0.0.1
+[resolver]
+AUTOSTART = NO
+PORT = 0
 
 [peerinfo]
 PORT = 0
 
-[core]
+[transport]
 PORT = 0
 
-[hostlist]
+[core]
 PORT = 0
 
-[fs]
+[topology]
 PORT = 0
 
-[testing]
-NUM_PEERS = 1000
-WEAKRANDOM = YES
-TOPOLOGY = NONE
-F2F = NO
-BLACKLIST_TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-#CONNECT_TOPOLOGY = 2D_TORUS
-#CONNECT_TOPOLOGY = CLIQUE
-#CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dht]
-AUTOSTART = NO
-
+[hostlist]
+PORT = 0