-eliminate dead code

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 859d950fae0f837991663dbfc1f12c2bc5c14a1b..c290dc9097ae4d2eb579ebe2cab24731aeb8badc 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -16,13 +16,13 @@ dist_pkgcfg_DATA = \
   testing.conf
 
 lib_LTLIBRARIES = \
-  libgnunettesting.la 
+  libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
-  testing.c  
+  testing.c
 libgnunettesting_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
@@ -35,7 +35,7 @@ noinst_PROGRAMS = \
  list-keys
 
 gnunet_testing_SOURCES = \
- gnunet-testing.c         
+ gnunet-testing.c
 gnunet_testing_LDADD = \
  libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -55,7 +55,7 @@ check_PROGRAMS = \
  test_testing_peerstartup2 \
  test_testing_sharedservices
 
-if ENABLE_TEST_RUN 
+if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
  test_testing_portreservation \
@@ -96,4 +96,3 @@ test_testing_sharedservices_LDADD = \
 
 EXTRA_DIST = \
   test_testing_defaults.conf
-

diff --git a/src/testing/testing.c b/src/testing/testing.c
index 98ac76fb70bba41e3e66d60f1a592cc5231497d2..043bdd7d207113f039bad71133ec2781668fb81f 100644 (file)
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -204,11 +204,6 @@ struct GNUNET_TESTING_Peer
    */
   struct GNUNET_ARM_Handle *ah;
 
-  /**
-   * Handle to ARM monitoring
-   */
-  struct GNUNET_ARM_MonitorHandle *mh;
-
   /**
    * The config of the peer
    */
@@ -1518,8 +1513,6 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
     GNUNET_TESTING_peer_stop (peer);
   if (NULL != peer->ah)
     GNUNET_ARM_disconnect (peer->ah);
-  if (NULL != peer->mh)
-    GNUNET_ARM_monitor_stop (peer->mh);
   GNUNET_free (peer->cfgfile);
   if (NULL != peer->cfg)
     GNUNET_CONFIGURATION_destroy (peer->cfg);