Refactoring reclaim attestations

1 files changed, 12 insertions, 18 deletions

diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c
index f7145a272..b91e123a3 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/reclaim/plugin_gnsrecord_reclaim.c
@@ -44,18 +44,15 @@ value_to_string (void *cls, uint32_t type, const void *data, size_t data_size)
 {
   switch (type)
   {
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR:
-    return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
-
   case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
     return GNUNET_strndup (data, data_size);
-
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTEST_ATTR:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_REFERENCE:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION_REF:
     return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
 
   default:
@@ -83,20 +80,17 @@ string_to_value (void *cls, uint32_t type, const char *s, void **data,
     return GNUNET_SYSERR;
   switch (type)
   {
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR:
-    return GNUNET_STRINGS_string_to_data (s, strlen (s), *data, *data_size);
-
   case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
     *data = GNUNET_strdup (s);
     *data_size = strlen (s);
     return GNUNET_OK;
-
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER:
   case GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTEST_ATTR:
-  case GNUNET_GNSRECORD_TYPE_RECLAIM_REFERENCE:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION:
+  case GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION_REF:
     return GNUNET_STRINGS_string_to_data (s, strlen (s), *data, *data_size);
 
   default:
@@ -114,14 +108,14 @@ static struct
   const char *name;
   uint32_t number;
 } name_map[] = {
-  { "RECLAIM_ATTR", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR },
-  { "RECLAIM_ATTR_REF", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF },
-  { "RECLAIM_ATTEST", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTEST_ATTR },
+  { "RECLAIM_ATTRIBUTE", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE },
+  { "RECLAIM_ATTRIBUTE_REF", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTRIBUTE_REF },
+  { "RECLAIM_ATTESTATION", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION },
+  { "RECLAIM_ATTESTATION_REF", GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION_REF },
   { "RECLAIM_MASTER", GNUNET_GNSRECORD_TYPE_RECLAIM_MASTER },
   { "RECLAIM_OIDC_CLIENT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT },
   { "RECLAIM_OIDC_REDIRECT", GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT },
   { "RECLAIM_TICKET", GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET },
-  { "RECLAIM_REFERENCE", GNUNET_GNSRECORD_TYPE_RECLAIM_REFERENCE },
   { NULL, UINT32_MAX }
 };