4 files changed, 12 insertions, 20 deletions

diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am
index 990822821..220da838f 100644
--- a/src/service/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@ -93,8 +93,8 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 # Only test TNG if we run experimental
-check_SCRIPTS= \
-  test_core_start_testcase.sh
+#check_SCRIPTS= \
+#  test_core_start_testcase.sh
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/service/core/test_core_api_peer1.conf b/src/service/core/test_core_api_peer1.conf
index 28463effe..c3e8fb86c 100644
--- a/src/service/core/test_core_api_peer1.conf
+++ b/src/service/core/test_core_api_peer1.conf
@@ -13,9 +13,9 @@ PORT = 12461
 PORT = 12462
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
-[peerinfo]
+[peerstore]
 PORT = 12463
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerstore.sock
 
 [transport]
 PORT = 12464
@@ -25,14 +25,10 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PORT = 12475
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
-[ats]
-PORT = 12476
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
-
-[transport-tcp]
+[communicator-tcp]
 PORT = 12467
 
-[transport-udp]
+[communicator-udp]
 PORT = 12468
 
 [transport-unix]
diff --git a/src/service/core/test_core_api_peer2.conf b/src/service/core/test_core_api_peer2.conf
index 819d58d17..7cea78ae4 100644
--- a/src/service/core/test_core_api_peer2.conf
+++ b/src/service/core/test_core_api_peer2.conf
@@ -14,9 +14,9 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 PORT = 22462
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
-[peerinfo]
+[peerstore]
 PORT = 22463
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerstore.sock
 
 [transport]
 PORT = 22464
@@ -26,14 +26,10 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 PORT = 22475
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
 
-[ats]
-PORT = 22476
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
-
-[transport-tcp]
+[communicator-tcp]
 PORT = 22467
 
-[transport-udp]
+[communicator-udp]
 PORT = 22468
 
 [transport-unix]
diff --git a/src/service/core/test_core_defaults.conf b/src/service/core/test_core_defaults.conf
index 0112971d5..b098b7d63 100644
--- a/src/service/core/test_core_defaults.conf
+++ b/src/service/core/test_core_defaults.conf
@@ -11,10 +11,10 @@ ENABLE_UPNP = NO
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[transport-tcp]
+[communicator-tcp]
 BINDTO = 127.0.0.1
 
-[transport-udp]
+[communicator-udp]
 BROADCAST = NO
 
 [peerinfo]