From 2c704e2175d94238e0006192eadf767c9754bb98 Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Wed, 24 Feb 2021 12:32:11 +0100
Subject: -remove legacy transport

---
 src/transport/Makefile.am          |  2 --
 src/transport/transport-testing2.c | 14 +-------------
 src/transport/transport-testing2.h |  5 -----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a1ffbdb5c..bc3004a70 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -174,7 +174,6 @@ libgnunettransporttesting2_la_SOURCES = \
   transport-testing-send2.c \
   transport-testing-communicator.c transport-testing-communicator.h
 libgnunettransporttesting2_la_LIBADD = \
-  libgnunettransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
@@ -956,7 +955,6 @@ test_transport_api_tcp_LDADD = \
 test_transport_api2_tcp_SOURCES = \
  test_transport_api2.c
 test_transport_api2_tcp_LDADD = \
- libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  libgnunettransporttesting2.la
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index 513b030b8..ee0c4494e 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -504,15 +504,13 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct
        "Peer %u configured with identity `%s'\n",
        p->no,
        GNUNET_i2s_full (&p->id));
-  p->tmh = GNUNET_TRANSPORT_manipulation_connect (p->cfg);
   p->th = GNUNET_TRANSPORT_core_connect (p->cfg,
                                          NULL,
                                          handlers,
                                          p,
                                          &notify_connect,
                                          &notify_disconnect);
-  if ((NULL == p->th) ||
-      (NULL == p->tmh))
+  if (NULL == p->th)
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "Failed to connect to transport service for peer `%s': `%s'\n",
@@ -577,11 +575,6 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct
     GNUNET_TRANSPORT_core_disconnect (p->th);
     p->th = NULL;
   }
-  if (NULL != p->tmh)
-  {
-    GNUNET_TRANSPORT_manipulation_disconnect (p->tmh);
-    p->tmh = NULL;
-  }
   for (cc = p->tth->cc_head; NULL != cc; cc = ccn)
   {
     ccn = cc->next;
@@ -668,11 +661,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
     GNUNET_PEERSTORE_iterate_cancel (p->pic);
     p->pic = NULL;
   }
-  if (NULL != p->tmh)
-  {
-    GNUNET_TRANSPORT_manipulation_disconnect (p->tmh);
-    p->tmh = NULL;
-  }
   if (NULL != p->th)
   {
     GNUNET_TRANSPORT_core_disconnect (p->th);
diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h
index 3554436d8..8c0f03556 100644
--- a/src/transport/transport-testing2.h
+++ b/src/transport/transport-testing2.h
@@ -84,11 +84,6 @@ struct GNUNET_TRANSPORT_TESTING_PeerContext
    */
   struct GNUNET_TRANSPORT_CoreHandle *th;
 
-  /**
-   * Peer's transport service manipulation handle
-   */
-  struct GNUNET_TRANSPORT_ManipulationHandle *tmh;
-
   /**
    * Peer's ATS handle.
    */
-- 
cgit v1.2.3