1 files changed, 6 insertions, 61 deletions

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 12c682d2d..e2bb54f1b 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,34 +1,15 @@
 [PATHS]
-SERVICEHOME = /tmp/test_dht_topo/
+SERVICEHOME = /tmp/test_dht_line/
 
 [arm]
-PORT = 10010
 DEFAULTSERVICES = core dht
-#DEBUG = YES
-
-[statistics]
-AUTOSTART = YES
-PORT = 10000
-
-[dht]
-DEBUG = NO
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 10001
 
 [dns]
 AUTOSTART = NO
-PORT = 10011
-
-[transport]
-PORT = 10002
-AUTOSTART = YES
 
 [nat]
 DISABLEV6 = YES 
-BINDTO = 127.0.0.1
+RETURN_LOCAL_ADDRESSES = YES
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
@@ -39,48 +20,11 @@ EXTERNAL_ADDRESS = 127.0.0.1
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-AUTOSTART = YES
-PORT = 10003
-
-[peerinfo]
-AUTOSTART = YES
-PORT = 10004
-
 [testing]
 WEAKRANDOM = YES
 
-[testing_old]
-NUM_PEERS = 5
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = LINE
-BLACKLIST_TOPOLOGY = LINE
-BLACKLIST_TRANSPORTS = tcp udp http unix
-#TOPOLOGY_FILE = small.dat
-#CONNECT_TOPOLOGY = ERDOS_RENYI
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-DEBUG = YES
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-TOPOLOGY_OUTPUT_FILE = line_topo_initial
-MAX_OUTSTANDING_CONNECTIONS = 75
-#SINGLE_PEERINFO_PER_HOST = YES
-#NUM_PEERINFO_PER_HOST = 10
-#SINGLE_STATISTICS_PER_HOST = YES
-#NUM_STATISTICS_PER_HOST = 10
-DELETE_FILES = YES
-
-[test_dht_topo]
-CONNECTION_LIMIT = 5
-#DATA_OUTPUT_FILE=data_output
+[testbed]
+OVERLAY_TOPOLOGY = LINE
 
 [namestore]
 AUTOSTART = NO
@@ -89,7 +33,8 @@ AUTOSTART = NO
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
+
 [vpn]
-AUTOSTART=NO
+AUTOSTART = NO