towards simplified configs

1 files changed, 12 insertions, 56 deletions

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 7d202add5..7c5cb549d 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -1,78 +1,34 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
 DEFAULTCONFIG = test_testing_connect_peer1.conf
 
-[resolver]
-PORT = 12564
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-HOSTNAME = localhost
-
-[transport]
-PORT = 12565
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-HOSTNAME = localhost
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+[transport-tcp]
+PORT = 12568
+BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12566
+DEFAULTSERVICES = core
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-HOSTNAME = localhost
-DEFAULTSERVICES = core 
-# core in DEFAULTSERVICES required or test case will fail!
-#DEBUG = YES
 
 [statistics]
 PORT = 12567
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-HOSTNAME = localhost
 
-[transport-tcp]
-PORT = 12568
-BINDTO = 127.0.0.1
+[resolver]
+PORT = 12564
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12569
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-HOSTNAME = localhost
+
+[transport]
+PORT = 12565
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 [core]
 PORT = 12570
 UNIXPATH = /tmp/gnunet-p1-service-core.sock
-HOSTNAME = localhost
-#DEBUG = YES
-
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-