1 files changed, 15 insertions, 112 deletions

diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index b79ed1f30..11457d0ac 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,129 +1,32 @@
+@INLINE@ test_transport_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
 
-[transport-udp]
-PORT = 3094
-
 [transport-tcp]
-TIMEOUT = 300000
 PORT = 3094
-USE_LOCALADDR = YES
-
-[nat]
-DISABLEV6 = YES
-BINDTO = 127.0.0.1
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[core]
-AUTOSTART = NO
-
-[transport]
-plugins = tcp
-#DEBUG = YES
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
 
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
+[transport-udp]
+PORT = 3094
 
 [arm]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 3087
 UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
+[statistics]
+PORT = 3088
+UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
 
+[resolver]
+PORT = 3089
+UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
 
+[peerinfo]
+PORT = 3090
+UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
 
-[nse]
-AUTOSTART = NO
+[transport]
+PORT = 3091
+UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock