1 files changed, 4 insertions, 147 deletions

diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/messenger/gnunet-service-messenger_message_kind.c
index 828e84d4f..688dd2fd9 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.c
+++ b/src/messenger/gnunet-service-messenger_message_kind.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
+   Copyright (C) 2020--2023 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
@@ -29,9 +29,9 @@
 #include "messenger_api_util.h"
 
 struct GNUNET_MESSENGER_Message*
-create_message_info (const struct GNUNET_MESSENGER_Ego *ego)
+create_message_info (struct GNUNET_MESSENGER_Service *service)
 {
-  if (!ego)
+  if (!service)
     return NULL;
 
   struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_INFO);
@@ -39,67 +39,13 @@ create_message_info (const struct GNUNET_MESSENGER_Ego *ego)
   if (!message)
     return NULL;
 
-  GNUNET_memcpy(&(message->body.info.host_key), &(ego->pub), sizeof(ego->pub));
-
   message->body.info.messenger_version = GNUNET_MESSENGER_VERSION;
 
   return message;
 }
 
 struct GNUNET_MESSENGER_Message*
-create_message_join (const struct GNUNET_MESSENGER_Ego *ego)
-{
-  if (!ego)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_JOIN);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.join.key), &(ego->pub), sizeof(ego->pub));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_leave ()
-{
-  return create_message (GNUNET_MESSENGER_KIND_LEAVE);
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_name (const char *name)
-{
-  if (!name)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_NAME);
-
-  if (!message)
-    return NULL;
-
-  message->body.name.name = GNUNET_strdup(name);
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_key (const struct GNUNET_IDENTITY_PrivateKey *key)
-{
-  if (!key)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_KEY);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_IDENTITY_key_get_public (key, &(message->body.key.key));
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_peer (const struct GNUNET_MESSENGER_Service *service)
+create_message_peer (struct GNUNET_MESSENGER_Service *service)
 {
   if (!service)
     return NULL;
@@ -119,22 +65,6 @@ create_message_peer (const struct GNUNET_MESSENGER_Service *service)
 }
 
 struct GNUNET_MESSENGER_Message*
-create_message_id (const struct GNUNET_ShortHashCode *unique_id)
-{
-  if (!unique_id)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_ID);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.id.id), unique_id, sizeof(struct GNUNET_ShortHashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
 create_message_miss (const struct GNUNET_PeerIdentity *peer)
 {
   if (!peer)
@@ -167,76 +97,3 @@ create_message_merge (const struct GNUNET_HashCode *previous)
 
   return message;
 }
-
-struct GNUNET_MESSENGER_Message*
-create_message_request (const struct GNUNET_HashCode *hash)
-{
-  if (!hash)
-    return NULL;
-
-  struct GNUNET_HashCode zero;
-  memset (&zero, 0, sizeof(zero));
-
-  if (0 == GNUNET_CRYPTO_hash_cmp (hash, &zero))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_REQUEST);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.request.hash), hash, sizeof(struct GNUNET_HashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_invite (const struct GNUNET_PeerIdentity *door,
-                       const struct GNUNET_HashCode *key)
-{
-  if ((!door) || (!key))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_INVITE);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.invite.door), door, sizeof(struct GNUNET_PeerIdentity));
-  GNUNET_memcpy(&(message->body.invite.key), key, sizeof(struct GNUNET_HashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_text (const char *text)
-{
-  if (!text)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_TEXT);
-
-  if (!message)
-    return NULL;
-
-  message->body.text.text = GNUNET_strdup(text);
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_delete (const struct GNUNET_HashCode *hash,
-                       const struct GNUNET_TIME_Relative delay)
-{
-  if (!hash)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_DELETE);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.deletion.hash), hash, sizeof(struct GNUNET_HashCode));
-  message->body.deletion.delay = GNUNET_TIME_relative_hton (delay);
-
-  return message;
-}