simplifying configs

1 files changed, 10 insertions, 63 deletions

diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index f9a038e80..a39b69a61 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -1,88 +1,35 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
 DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf
 
-[resolver]
-PORT = 22484
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-resolver.sock
-#PREFIX = xterm -T resolver2 -e valgrind --tool=memcheck
-#PREFIX = xterm -e xterm -T resolver2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --log-file=resolver%p
-
-[transport]
-PORT = 22485
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock
-PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e gdb --args
-#PREFIX = xterm -e xterm -T transport2 -e gdb --args
-#PREFIX = xterm -T transport2 -e
-#PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#DEBUG = YES
+[transport-tcp]
+PORT = 22488
 
 [arm]
 PORT = 22486
 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
 PORT = 22487
 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-statistics.sock
-#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck
-
-[transport-tcp]
-PORT = 22488
-BINDTO = 127.0.0.1
-#DEBUG = YES
 
-[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
+[resolver]
+PORT = 22484
+UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22489
 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo2 -e 
-#DEBUG = YES
+
+[transport]
+PORT = 22485
+UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock
 
 [core]
 PORT = 22490
 TOTAL_QUOTA_IN = 10240
 TOTAL_QUOTA_OUT = 10240
 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock
-#PREFIX = xterm -T core2 -e
-#PREFIX = valgrind --tool=memcheck
 DEBUG = NO
-#BINARY=/home/grothoff/bin/gnunet-service-core
-
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-