9 files changed, 103 insertions, 265 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 423602fea..751bc40c1 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -159,6 +159,7 @@ libgnunettransporttesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
 
 libgnunettransporttesting2_la_SOURCES = \
+  transport_api_traits.c \
   transport_api_cmd_connecting_peers.c \
   transport_api_cmd_backchannel_check.c \
   transport_api_cmd_start_peer.c \
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 526f08e6a..9d6844be1 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -96,15 +96,15 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  struct GNUNET_TESTING_AsyncContext *ac;
+  const struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_receive,
                                           &ac);
   GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail (ac);
-  else
-    GNUNET_TESTING_async_finish (ac);
+  if ((GNUNET_NO == ac->finished) && (NULL == ac->cont))
+    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
+  else if (GNUNET_NO == ac->finished)
+    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
 }
 
 
@@ -115,7 +115,7 @@ handle_test (void *cls,
 static void
 all_peers_started ()
 {
-  struct GNUNET_TESTING_AsyncContext *ac;
+  const struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received message\n");
@@ -123,9 +123,9 @@ all_peers_started ()
                                           &ac);
   GNUNET_assert  (NULL != ac);
   if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail (ac);
+    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
   else
-    GNUNET_TESTING_async_finish (ac);
+    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
 }
 
 
@@ -168,7 +168,7 @@ static void *
 notify_connect (struct GNUNET_TESTING_Interpreter *is,
                 const struct GNUNET_PeerIdentity *peer)
 {
-  struct GNUNET_TESTING_AsyncContext *ac;
+  const struct GNUNET_TESTING_AsyncContext *ac;
   void *ret = NULL;
   const struct GNUNET_TESTING_Command *cmd;
   struct BlockState *bs;
@@ -186,9 +186,9 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
                 "notify_connect running\n");
     GNUNET_assert  (NULL != ac);
     if (NULL == ac->cont)
-      GNUNET_TESTING_async_fail (ac);
+      GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
     else
-      GNUNET_TESTING_async_finish (ac);
+      GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
   }
   else
   {
@@ -198,7 +198,9 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "block state %s\n",
          cmd->label);
-    GNUNET_TESTING_get_trait_block_state (cmd,&bs);
+    GNUNET_TESTING_get_trait_block_state (
+      cmd,
+      (const struct BlockState  **) &bs);
 
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "block state %u\n",
@@ -219,15 +221,16 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
 static void
 all_local_tests_prepared ()
 {
-  struct LocalPreparedState *lfs;
+  const struct LocalPreparedState *lfs;
 
   GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
                                                  &lfs);
   GNUNET_assert (NULL != &lfs->ac);
   if (NULL == lfs->ac.cont)
-    GNUNET_TESTING_async_fail (&lfs->ac);
+    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) &lfs->ac);
   else
-    GNUNET_TESTING_async_finish (&lfs->ac);
+    GNUNET_TESTING_async_finish ((struct
+                                  GNUNET_TESTING_AsyncContext *) &lfs->ac);
 }
 
 
diff --git a/src/transport/test_transport_start_with_config.c b/src/transport/test_transport_start_with_config.c
index 7eb92d629..c3411becc 100644
--- a/src/transport/test_transport_start_with_config.c
+++ b/src/transport/test_transport_start_with_config.c
@@ -26,6 +26,7 @@
 #include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
+#include "transport-testing-cmds.h"
 #include "gnunet_util_lib.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
index d64279aeb..af6f47962 100644
--- a/src/transport/transport-testing-cmds.h
+++ b/src/transport/transport-testing-cmds.h
@@ -49,7 +49,7 @@ struct ConnectPeersState
   /**
    * The testing system of this node.
    */
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
 
   // Label of the cmd which started the test system.
   const char *create_label;
@@ -180,7 +180,7 @@ struct StartPeerState
 
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
 
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
 
   GNUNET_TRANSPORT_notify_connect_cb notify_connect;
 
@@ -192,26 +192,6 @@ struct StartPeerState
 
 
 /**
- * Function to get the trait with the struct ConnectPeersState.
- *
- * @param[out] sps struct ConnectPeersState.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-int
-GNUNET_TRANSPORT_get_trait_connect_peer_state (
-  const struct GNUNET_TESTING_Command *cmd,
-  struct ConnectPeersState **cps);
-
-
-int
-GNUNET_TRANSPORT_get_trait_state (const struct
-                                  GNUNET_TESTING_Command
-                                  *cmd,
-                                  struct StartPeerState **sps);
-
-
-/**
  * Create command.
  *
  * @param label name for command.
@@ -305,43 +285,62 @@ GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
                                         topology);
 
 
+/**
+ * Create headers for a trait with name @a name for
+ * statically allocated data of type @a type.
+ */
+#define GNUNET_TRANSPORT_MAKE_DECL_SIMPLE_TRAIT(name,type)   \
+  enum GNUNET_GenericReturnValue                          \
+    GNUNET_TRANSPORT_get_trait_ ## name (                    \
+    const struct GNUNET_TESTING_Command *cmd,              \
+    type **ret);                                          \
+  struct GNUNET_TESTING_Trait                              \
+    GNUNET_TRANSPORT_make_trait_ ## name (                   \
+    type * value);
 
 
+/**
+ * Create C implementation for a trait with name @a name for statically
+ * allocated data of type @a type.
+ */
+#define GNUNET_TRANSPORT_MAKE_IMPL_SIMPLE_TRAIT(name,type)  \
+  enum GNUNET_GenericReturnValue                         \
+    GNUNET_TRANSPORT_get_trait_ ## name (                   \
+    const struct GNUNET_TESTING_Command *cmd,             \
+    type **ret)                                          \
+  {                                                      \
+    if (NULL == cmd->traits) return GNUNET_SYSERR;       \
+    return cmd->traits (cmd->cls,                        \
+                        (const void **) ret,             \
+                        GNUNET_S (name),                  \
+                        0);                              \
+  }                                                      \
+  struct GNUNET_TESTING_Trait                             \
+    GNUNET_TRANSPORT_make_trait_ ## name (                  \
+    type * value)                                        \
+  {                                                      \
+    struct GNUNET_TESTING_Trait ret = {                   \
+      .trait_name = GNUNET_S (name),                      \
+      .ptr = (const void *) value                        \
+    };                                                   \
+    return ret;                                          \
+  }
 
-int
-GNUNET_TRANSPORT_get_trait_peer_id (const struct
-                                    GNUNET_TESTING_Command *cmd,
-                                    struct GNUNET_PeerIdentity **id);
-
-
-int
-GNUNET_TRANSPORT_get_trait_connected_peers_map (const struct
-                                                GNUNET_TESTING_Command
-                                                *cmd,
-                                                struct
-                                                GNUNET_CONTAINER_MultiShortmap
-                                                *
-                                                *
-                                                connected_peers_map);
-int
-GNUNET_TRANSPORT_get_trait_hello_size (const struct
-                                       GNUNET_TESTING_Command
-                                       *cmd,
-                                       size_t **hello_size);
 
-int
-GNUNET_TRANSPORT_get_trait_hello (const struct
-                                  GNUNET_TESTING_Command
-                                  *cmd,
-                                  char **hello);
+/**
+ * Call #op on all simple traits.
+ */
+#define GNUNET_TRANSPORT_SIMPLE_TRAITS(op) \
+  op (peer_id, const struct GNUNET_PeerIdentity) \
+  op (connected_peers_map, const struct GNUNET_CONTAINER_MultiShortmap) \
+  op (hello_size, const size_t) \
+  op (hello, const char) \
+  op (application_handle, const struct GNUNET_TRANSPORT_ApplicationHandle) \
+  op (connect_peer_state, const struct ConnectPeersState) \
+  op (state, const struct StartPeerState)
 
+GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TRANSPORT_MAKE_DECL_SIMPLE_TRAIT)
 
-int
-GNUNET_TRANSPORT_get_trait_application_handle (const struct
-                                               GNUNET_TESTING_Command *cmd,
-                                               struct
-                                               GNUNET_TRANSPORT_ApplicationHandle
-                                               **ah);
 
 #endif
 /* end of transport_testing.h */
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index 529b4690b..1bec3abd3 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -69,7 +69,7 @@ struct CheckState
   /**
    * The testing system of this node.
    */
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
 
   // Label of the cmd which started the test system.
   const char *create_label;
@@ -404,9 +404,9 @@ backchannel_check_run (void *cls,
   // char *part_one = "Delivering backchannel message from ";
   // char *part_two = " of type 1460 to udp";
   const struct GNUNET_TESTING_Command *system_cmd;
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
   const struct GNUNET_TESTING_Command *peer1_cmd;
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah;
+  const struct GNUNET_TRANSPORT_ApplicationHandle *ah;
   // struct GNUNET_PeerIdentity *peer;
   // uint32_t num;
   // struct GNUNET_TESTING_NodeConnection *pos_connection;
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index f65b6f666..fc925675d 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -47,11 +47,11 @@ connect_peers_run (void *cls,
 {
   struct ConnectPeersState *cps = cls;
   const struct GNUNET_TESTING_Command *system_cmd;
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
 
 
   const struct GNUNET_TESTING_Command *peer1_cmd;
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah;
+  const struct GNUNET_TRANSPORT_ApplicationHandle *ah;
   struct GNUNET_PeerIdentity *peer;
   char *addr;
   enum GNUNET_NetworkType nt = 0;
@@ -98,7 +98,9 @@ connect_peers_run (void *cls,
                     "validating peer number %u with identity %s\n",
                     num,
                     GNUNET_i2s (peer));
-        GNUNET_TRANSPORT_application_validate (ah,
+        GNUNET_TRANSPORT_application_validate ((struct
+                                                GNUNET_TRANSPORT_ApplicationHandle
+                                                *) ah,
                                                peer,
                                                nt,
                                                addr);
@@ -176,13 +178,9 @@ connect_peers_traits (void *cls,
                       const char *trait,
                       unsigned int index)
 {
-  struct StartPeerState *cps = cls;
+  struct ConnectPeersState *cps = cls;
   struct GNUNET_TESTING_Trait traits[] = {
-    {
-      .index = 0,
-      .trait_name = "state",
-      .ptr = (const void *) cps,
-    },
+    GNUNET_TRANSPORT_make_trait_connect_peer_state ((const void *) cps),
     GNUNET_TESTING_trait_end ()
   };
   return GNUNET_TESTING_get_trait (traits,
@@ -193,25 +191,6 @@ connect_peers_traits (void *cls,
 
 
 /**
- * Function to get the trait with the struct ConnectPeersState.
- *
- * @param[out] sps struct ConnectPeersState.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-enum GNUNET_GenericReturnValue
-GNUNET_TRANSPORT_get_trait_connect_peer_state (
-  const struct GNUNET_TESTING_Command *cmd,
-  struct ConnectPeersState **cps)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) cps,
-                      "state",
-                      (unsigned int) 0);
-}
-
-
-/**
  * Create command
  *
  * @param label name for command
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
index 8b37dbf90..ade0cc914 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -114,7 +114,7 @@ send_simple_run (void *cls,
                  struct GNUNET_TESTING_Interpreter *is)
 {
   struct SendSimpleState *sss = cls;
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
+  const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
   const struct GNUNET_TESTING_Command *peer1_cmd;
   // struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
   struct GNUNET_HashCode hc;
@@ -124,7 +124,7 @@ send_simple_run (void *cls,
   uint32_t num;
   struct GNUNET_TESTING_NodeConnection *pos_connection;
   const struct GNUNET_TESTING_Command *system_cmd;
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
 
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                          sss->start_peer_label);
@@ -139,8 +139,10 @@ send_simple_run (void *cls,
   node_connections_head = GNUNET_TESTING_get_connections (sss->num,
                                                           sss->topology);
 
-  GNUNET_CONTAINER_multishortmap_iterate (connected_peers_map, send_simple_cb,
-                                          sss);
+  GNUNET_CONTAINER_multishortmap_iterate (
+    (struct GNUNET_CONTAINER_MultiShortmap *)
+    connected_peers_map, send_simple_cb,
+    sss);
   /*for (int i = 0; i < 1; i++)
   {
     for (pos_connection = node_connections_head; NULL != pos_connection;
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index 52eacabb2..be2ea25b4 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -167,7 +167,7 @@ start_peer_run (void *cls,
   char *emsg = NULL;
   struct GNUNET_PeerIdentity dummy;
   const struct GNUNET_TESTING_Command *system_cmd;
-  struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTING_System *tl_system;
   char *home;
   char *transport_unix_path;
   char *tcp_communicator_unix_path;
@@ -251,7 +251,8 @@ start_peer_run (void *cls,
        sps->no);
 
   if (GNUNET_SYSERR ==
-      GNUNET_TESTING_configuration_create (tl_system,
+      GNUNET_TESTING_configuration_create ((struct
+                                            GNUNET_TESTING_System *) tl_system,
                                            sps->cfg))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -262,7 +263,9 @@ start_peer_run (void *cls,
     return;
   }
 
-  sps->peer = GNUNET_TESTING_peer_configure (sps->tl_system,
+  sps->peer = GNUNET_TESTING_peer_configure ((struct
+                                              GNUNET_TESTING_System *) sps->
+                                             tl_system,
                                              sps->cfg,
                                              sps->no,
                                              NULL,
@@ -407,36 +410,14 @@ start_peer_traits (void *cls,
 
 
   struct GNUNET_TESTING_Trait traits[] = {
-    {
-      .index = 0,
-      .trait_name = "application_handle",
-      .ptr = (const void *) ah,
-    },
-    {
-      .index = 1,
-      .trait_name = "peer_id",
-      .ptr = (const void *) id,
-    },
-    {
-      .index = 2,
-      .trait_name = "connected_peers_map",
-      .ptr = (const void *) connected_peers_map,
-    },
-    {
-      .index = 3,
-      .trait_name = "hello",
-      .ptr = (const void *) hello,
-    },
-    {
-      .index = 4,
-      .trait_name = "hello_size",
-      .ptr = (const void *) hello_size,
-    },
-    {
-      .index = 5,
-      .trait_name = "state",
-      .ptr = (const void *) sps,
-    },
+    GNUNET_TRANSPORT_make_trait_application_handle ((const void *) ah),
+    GNUNET_TRANSPORT_make_trait_peer_id ((const void *) id),
+    GNUNET_TRANSPORT_make_trait_connected_peers_map ((const
+                                                      void *)
+                                                     connected_peers_map),
+    GNUNET_TRANSPORT_make_trait_hello ((const void *) hello),
+    GNUNET_TRANSPORT_make_trait_hello_size ((const void *) hello_size),
+    GNUNET_TRANSPORT_make_trait_state ((const void *) sps),
     GNUNET_TESTING_trait_end ()
   };
 
@@ -448,127 +429,6 @@ start_peer_traits (void *cls,
 
 
 /**
- * Function to get the trait with the struct StartPeerState.
- *
- * @param[out] sps struct StartPeerState.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-int
-GNUNET_TRANSPORT_get_trait_state (
-  const struct GNUNET_TESTING_Command *cmd,
-  struct StartPeerState **sps)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) sps,
-                      "state",
-                      (unsigned int) 5);
-}
-
-
-/**
- * Function to get the trait with the size of the hello.
- *
- * @param[out] hello_size size of hello.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-int
-GNUNET_TRANSPORT_get_trait_hello_size (const struct
-                                       GNUNET_TESTING_Command
-                                       *cmd,
-                                       size_t **hello_size)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) hello_size,
-                      "hello_size",
-                      (unsigned int) 4);
-}
-
-
-/**
- * Function to get the trait with the hello.
- *
- * @param[out] hello The hello for the peer.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-int
-GNUNET_TRANSPORT_get_trait_hello (const struct
-                                  GNUNET_TESTING_Command
-                                  *cmd,
-                                  char **hello)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) hello,
-                      "hello",
-                      (unsigned int) 3);
-}
-
-
-/**
- * Function to get the trait with the map of connected peers.
- *
- * @param[out] connected_peers_map The map with connected peers.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- *
- */
-int
-GNUNET_TRANSPORT_get_trait_connected_peers_map (const struct
-                                                GNUNET_TESTING_Command
-                                                *cmd,
-                                                struct
-                                                GNUNET_CONTAINER_MultiShortmap
-                                                *
-                                                *
-                                                connected_peers_map)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) connected_peers_map,
-                      "connected_peers_map",
-                      (unsigned int) 2);
-}
-
-
-/**
- * Function to get the trait with the transport application handle.
- *
- * @param[out] ah The application handle.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- */
-int
-GNUNET_TRANSPORT_get_trait_application_handle (const struct
-                                               GNUNET_TESTING_Command *cmd,
-                                               struct
-                                               GNUNET_TRANSPORT_ApplicationHandle
-                                               **ah)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) ah,
-                      "application_handle",
-                      (unsigned int) 0);
-}
-
-
-/**
- * Function to get the trait with the peer id.
- *
- * @param[out] id The peer id.
- * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
- */
-int
-GNUNET_TRANSPORT_get_trait_peer_id (const struct
-                                    GNUNET_TESTING_Command *cmd,
-                                    struct GNUNET_PeerIdentity **id)
-{
-  return cmd->traits (cmd->cls,
-                      (const void **) id,
-                      "peer_id",
-                      (unsigned int) 1);
-}
-
-
-/**
  * Create command.
  *
  * @param label name for command.
diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/transport/transport_api_cmd_stop_peer.c
index 97408b083..4ca730add 100644
--- a/src/transport/transport_api_cmd_stop_peer.c
+++ b/src/transport/transport_api_cmd_stop_peer.c
@@ -58,7 +58,7 @@ stop_peer_run (void *cls,
                struct GNUNET_TESTING_Interpreter *is)
 {
   struct StopPeerState *stop_ps = cls;
-  struct StartPeerState *sps;
+  const struct StartPeerState *sps;
   const struct GNUNET_TESTING_Command *start_cmd;
 
   start_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
@@ -69,24 +69,20 @@ stop_peer_run (void *cls,
   if (NULL != sps->pic)
   {
     GNUNET_PEERSTORE_iterate_cancel (sps->pic);
-    sps->pic = NULL;
   }
   if (NULL != sps->th)
   {
     GNUNET_TRANSPORT_core_disconnect (sps->th);
-    sps->th = NULL;
   }
   if (NULL != sps->ah)
   {
     GNUNET_TRANSPORT_application_done (sps->ah);
-    sps->ah = NULL;
   }
   if (NULL != sps->ph)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Disconnecting from PEERSTORE service\n");
     GNUNET_PEERSTORE_disconnect (sps->ph, GNUNET_NO);
-    sps->ph = NULL;
   }
   if (NULL != sps->peer)
   {
@@ -99,12 +95,9 @@ stop_peer_run (void *cls,
            GNUNET_i2s (&sps->id));
     }
     GNUNET_TESTING_peer_destroy (sps->peer);
-    sps->peer = NULL;
   }
   if (NULL != sps->rh_task)
     GNUNET_SCHEDULER_cancel (sps->rh_task);
-  sps->rh_task = NULL;
-
 }