1 files changed, 10 insertions, 10 deletions

diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index 1f8ef2f8f..c4098e26d 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -51,7 +51,7 @@ hello_iter_cb (void *cb_cls,
                const struct GNUNET_PEERSTORE_Record *record,
                const char *emsg)
 {
-  struct StartPeerState *sps = cb_cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cb_cls;
   if (NULL == record)
   {
     sps->pic = NULL;
@@ -81,7 +81,7 @@ hello_iter_cb (void *cb_cls,
 static void
 retrieve_hello (void *cls)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
   sps->rh_task = NULL;
   sps->pic = GNUNET_PEERSTORE_iterate (sps->ph,
                                        "transport",
@@ -102,7 +102,7 @@ notify_disconnect (void *cls,
                    const struct GNUNET_PeerIdentity *peer,
                    void *handler_cls)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Peer %s disconnected from peer %u (`%s')\n",
@@ -122,7 +122,7 @@ notify_connect (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
                 struct GNUNET_MQ_Handle *mq)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
   struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
   struct GNUNET_HashCode hc;
   struct GNUNET_CRYPTO_EddsaPublicKey public_key = peer->public_key;
@@ -168,7 +168,7 @@ static void
 start_peer_run (void *cls,
                 struct GNUNET_TESTING_Interpreter *is)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
   char *emsg = NULL;
   struct GNUNET_PeerIdentity dummy;
   const struct GNUNET_TESTING_Command *system_cmd;
@@ -339,7 +339,7 @@ start_peer_run (void *cls,
   }
 
   sps->ph = GNUNET_PEERSTORE_connect (sps->cfg);
-  if (NULL == sps->th)
+  if (NULL == sps->ph)
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "Failed to connect to peerstore service for peer `%s': `%s'\n",
@@ -378,7 +378,7 @@ start_peer_run (void *cls,
 static void
 start_peer_cleanup (void *cls)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
 
   if (NULL != sps->handlers)
   {
@@ -410,7 +410,7 @@ start_peer_traits (void *cls,
                    const char *trait,
                    unsigned int index)
 {
-  struct StartPeerState *sps = cls;
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
   struct GNUNET_TRANSPORT_ApplicationHandle *ah = sps->ah;
   struct GNUNET_PeerIdentity *id = &sps->id;
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
@@ -450,12 +450,12 @@ GNUNET_TRANSPORT_cmd_start_peer (const char *label,
                                  notify_connect,
                                  unsigned int broadcast)
 {
-  struct StartPeerState *sps;
+  struct GNUNET_TESTING_StartPeerState *sps;
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
     GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
   unsigned int i;
 
-  sps = GNUNET_new (struct StartPeerState);
+  sps = GNUNET_new (struct GNUNET_TESTING_StartPeerState);
   sps->no = no;
   sps->system_label = GNUNET_strdup (system_label);
   sps->connected_peers_map = connected_peers_map;