14 files changed, 2 insertions, 669 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08315ecce..9c7913e98 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -387,7 +387,6 @@ src/testing/testing_api_cmd_system_create.c
 src/testing/testing_api_cmd_system_destroy.c
 src/testing/testing_api_loop.c
 src/testing/testing_api_traits.c
-src/topology/friends.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-communicator-quic.c
 src/transport/gnunet-communicator-tcp.c
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index f4c7efb3d..62b093c5d 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -53,9 +53,6 @@ bin_PROGRAMS = \
  gnunet-dht-put \
  gnunet-dht-hello
 
-#noinst_PROGRAMS = \
-# gnunet-dht-profiler
-
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
  gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
@@ -108,27 +105,6 @@ gnunet_dht_monitor_LDADD = \
 gnunet_dht_monitor_LDFLAGS = \
   $(GN_LIBINTL)
 
-# TNG
-#gnunet_dht_profiler_SOURCES = \
-#  gnunet_dht_profiler.c
-#gnunet_dht_profiler_LDADD = \
-#  libgnunetdht.la \
-#  $(top_builddir)/src/core/libgnunetcore.la \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/testbed/libgnunettestbed.la
-#gnunet_dht_profiler_LDFLAGS = \
-#  $(GN_LIBINTL)
-
-#noinst_LIBRARIES = libgnunetdhttest.a
-#
-#libgnunetdhttest_a_SOURCES = \
-#  dht_test_lib.c dht_test_lib.h
-#libgnunetdhttest_a_LIBADD = \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testbed/libgnunettestbed.la \
-# libgnunetdht.la
-
 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;
 endif
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 83dd8e1bf..9a7ff0011 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -21,8 +21,6 @@ lib_LTLIBRARIES = libgnunetfs.la
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_fs.la
 
-# noinst_LIBRARIES = libgnunetfstest.a
-
 libgnunetfs_la_SOURCES = \
   fs_api.c fs_api.h fs.h \
   fs_directory.c \
@@ -59,13 +57,6 @@ libgnunetfs_la_LDFLAGS = \
   -version-info 3:1:1
 
 
-#libgnunetfstest_a_SOURCES = \
-#  fs_test_lib.c fs_test_lib.h
-#
-#libgnunetfstest_a_LIBADD = \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la
-
 libexec_PROGRAMS = \
   gnunet-helper-fs-publish \
   gnunet-service-fs
@@ -94,15 +85,6 @@ gnunet_directory_LDADD += \
   -lextractor
 endif
 
-# TNG
-#gnunet_fs_profiler_SOURCES = \
-# gnunet-fs-profiler.c
-#gnunet_fs_profiler_LDADD = \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-
 gnunet_fs_SOURCES = \
  gnunet-fs.c
 gnunet_fs_LDADD = \
@@ -219,14 +201,6 @@ libgnunet_plugin_block_fs_la_LIBADD = \
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-#if HAVE_BENCHMARKS
-# FS_BENCHMARKS = \
-# perf_gnunet_service_fs_p2p \
-# perf_gnunet_service_fs_p2p_dht \
-# perf_gnunet_service_fs_p2p_index \
-# perf_gnunet_service_fs_p2p_respect
-#endif
-
 check_PROGRAMS = \
  test_plugin_block_fs \
  test_fs_directory \
@@ -284,22 +258,7 @@ TESTS = test_fs_directory \
  test_fs_search_persistence \
  test_fs_start_stop \
  test_fs_uri \
- test_fs_meta_data 
- # test_fs_download \
- # test_fs_download_indexed \
- # test_fs_download_persistence \
- # test_fs_list_indexed \
- # test_fs_publish \
- # test_fs_publish_persistence \
- # test_fs_unindex \
- # test_fs_unindex_persistence \
- # test_fs_test_lib \
- # test_gnunet_service_fs_migration \
- # test_gnunet_service_fs_p2p \
- # test_gnunet_service_fs_p2p_cadet \
- # perf_gnunet_service_fs_p2p \
- # perf_gnunet_service_fs_p2p_index \
- # perf_gnunet_service_fs_p2p_respect \
+ test_fs_meta_data
  # $(check_SCRIPTS)
 endif
 
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index 4a63494bc..656017548 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -97,18 +97,7 @@ gnunet_service_messenger_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
 
-check_PROGRAMS = test_messenger_anonymous \
-  # test_messenger_api \
-  # test_messenger_sync_client \
-  # test_messenger_async_client \
-  # test_messenger_worst_client \
-  # test_messenger_sync_p2p \
-  # test_messenger_async_p2p \
-  # test_messenger_worst_p2p \
-  # test_messenger_server \
-  # test_messenger_growth \
-  # test_messenger_ring \
-  # test_messenger_adapt
+check_PROGRAMS = test_messenger_anonymous
 
 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;
@@ -130,105 +119,5 @@ test_messenger_anonymous_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_messenger_sync_client_SOURCES = \
-  test_messenger_sync_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_sync_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_async_client_SOURCES = \
-  test_messenger_async_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_async_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_worst_client_SOURCES = \
-  test_messenger_worst_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_worst_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_sync_p2p_SOURCES = \
-  test_messenger_sync_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_sync_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_async_p2p_SOURCES = \
-  test_messenger_async_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_async_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_worst_p2p_SOURCES = \
-  test_messenger_worst_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_worst_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_server_SOURCES = \
-  test_messenger_server.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_server_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_growth_SOURCES = \
-  test_messenger_growth.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_growth_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_ring_SOURCES = \
-  test_messenger_ring.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_ring_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_adapt_SOURCES = \
-  test_messenger_adapt.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_adapt_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
 EXTRA_DIST = \
   test_messenger_api.conf
diff --git a/src/messenger/test_messenger_adapt.c b/src/messenger/test_messenger_adapt.c
deleted file mode 100644
index b19634152..000000000
--- a/src/messenger/test_messenger_adapt.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_adapt.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    5,    1,    2,    3,    6,    7,    8,    4 };
-  unsigned int stages [] = { 0x21, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_adapt", &cfg);
-}
diff --git a/src/messenger/test_messenger_async_client.c b/src/messenger/test_messenger_async_client.c
deleted file mode 100644
index 580fc1ecb..000000000
--- a/src/messenger/test_messenger_async_client.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_async_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x10, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_async_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_async_p2p.c b/src/messenger/test_messenger_async_p2p.c
deleted file mode 100644
index 762be9d49..000000000
--- a/src/messenger/test_messenger_async_p2p.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_async_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x30, 0x30 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_async_p2p", &cfg);
-}
diff --git a/src/messenger/test_messenger_growth.c b/src/messenger/test_messenger_growth.c
deleted file mode 100644
index 4a73e559d..000000000
--- a/src/messenger/test_messenger_growth.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_growth.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    0,    1,    1,    1,    1,    1,    1,    1 };
-  unsigned int stages [] = { 0x01, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_growth", &cfg);
-}
diff --git a/src/messenger/test_messenger_ring.c b/src/messenger/test_messenger_ring.c
deleted file mode 100644
index c6b17861e..000000000
--- a/src/messenger/test_messenger_ring.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_ring.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    8,    1,    2,    3,    4,    5,    6,    7 };
-  unsigned int stages [] = { 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_ring", &cfg);
-}
diff --git a/src/messenger/test_messenger_server.c b/src/messenger/test_messenger_server.c
deleted file mode 100644
index fdd9a3684..000000000
--- a/src/messenger/test_messenger_server.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_server.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    0,    1,    1,    1,    1,    1,    1,    1 };
-  unsigned int stages [] = { 0x01, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_server", &cfg);
-}
diff --git a/src/messenger/test_messenger_sync_client.c b/src/messenger/test_messenger_sync_client.c
deleted file mode 100644
index 74c9548bc..000000000
--- a/src/messenger/test_messenger_sync_client.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_sync_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x01, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_sync_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_sync_p2p.c b/src/messenger/test_messenger_sync_p2p.c
deleted file mode 100644
index 299d5ff68..000000000
--- a/src/messenger/test_messenger_sync_p2p.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_sync_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_sync_p2p", &cfg);
-}
diff --git a/src/messenger/test_messenger_worst_client.c b/src/messenger/test_messenger_worst_client.c
deleted file mode 100644
index ab535b876..000000000
--- a/src/messenger/test_messenger_worst_client.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_worst_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x10, 0x02 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_worst_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_worst_p2p.c b/src/messenger/test_messenger_worst_p2p.c
deleted file mode 100644
index 0af9489a4..000000000
--- a/src/messenger/test_messenger_worst_p2p.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_worst_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "platform.h"
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x12, 0x12 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_worst_p2p", &cfg);
-}