1 files changed, 15 insertions, 25 deletions

diff --git a/src/messenger/test_messenger.c b/src/messenger/test_messenger.c
index b42dfe6d9..fb3e3e1bc 100644
--- a/src/messenger/test_messenger.c
+++ b/src/messenger/test_messenger.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020 GNUnet e.V.
+   Copyright (C) 2020--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
@@ -61,14 +61,13 @@ end (void *cls)
 
   if (messenger)
   {
-    GNUNET_MESSENGER_disconnect(messenger);
+    GNUNET_MESSENGER_disconnect (messenger);
     messenger = NULL;
   }
 
   status = 0;
 }
 
-
 static void
 end_badly (void *cls)
 {
@@ -83,7 +82,7 @@ end_operation (void *cls)
 {
   op_task = NULL;
 
-  fprintf (stderr, "Testcase failed (operation: '%s').\n", cls? (const char*) cls : "unknown");
+  fprintf (stderr, "Testcase failed (operation: '%s').\n", cls ? (const char*) cls : "unknown");
 
   if (die_task)
     GNUNET_SCHEDULER_cancel (die_task);
@@ -109,30 +108,25 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
     op_task = NULL;
   }
 
-  const char* name = GNUNET_MESSENGER_get_name(handle);
+  const char *name = GNUNET_MESSENGER_get_name (handle);
 
-  if (0 != strcmp(name, TESTER_NAME))
+  if (0 != strcmp (name, TESTER_NAME))
   {
     op_task = GNUNET_SCHEDULER_add_now (&end_operation, "name");
     return;
   }
 
-  struct GNUNET_IDENTITY_Ego* ego = GNUNET_IDENTITY_ego_get_anonymous();
-  struct GNUNET_IDENTITY_PublicKey anonymous_key;
-
-  GNUNET_IDENTITY_ego_get_public_key(ego, &anonymous_key);
+  const struct GNUNET_IDENTITY_PublicKey *key = GNUNET_MESSENGER_get_key (handle);
 
-  const struct GNUNET_IDENTITY_PublicKey* key = GNUNET_MESSENGER_get_key(handle);
-
-  if (((!identity_counter) && (0 != GNUNET_memcmp(key, (&anonymous_key)))) ||
-      ((identity_counter) && (0 == GNUNET_memcmp(key, (&anonymous_key)))))
+  if (((!identity_counter) && (key)) || ((identity_counter) && (!key)))
   {
     op_task = GNUNET_SCHEDULER_add_now (&end_operation, "key");
     return;
   }
 
-  if (identity_counter) {
-    GNUNET_MESSENGER_disconnect(handle);
+  if (identity_counter)
+  {
+    GNUNET_MESSENGER_disconnect (handle);
 
     op_task = NULL;
     messenger = NULL;
@@ -144,7 +138,7 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
     return;
   }
 
-  GNUNET_MESSENGER_update(messenger);
+  GNUNET_MESSENGER_update (messenger);
   identity_counter++;
 }
 
@@ -156,16 +150,14 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
  * @param peer Peer for testing
  */
 static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
+run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer)
 {
   die_task = GNUNET_SCHEDULER_add_delayed (TOTAL_TIMEOUT, &end_badly, NULL);
 
   identity_counter = 0;
 
   op_task = GNUNET_SCHEDULER_add_delayed (BASE_TIMEOUT, &end_operation, "connect");
-  messenger = GNUNET_MESSENGER_connect(cfg, TESTER_NAME, &on_identity, NULL, NULL, NULL);
+  messenger = GNUNET_MESSENGER_connect (cfg, TESTER_NAME, &on_identity, NULL, NULL, NULL);
 }
 
 /**
@@ -176,11 +168,9 @@ run (void *cls,
  * @return 0 ok, 1 on error
  */
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
-  if (0 != GNUNET_TESTING_peer_run("test-messenger",
-                                   "test_messenger_api.conf",
-                                   &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run ("test-messenger", "test_messenger_api.conf", &run, NULL))
     return 1;
 
   return status;