More fixes for #3522

[oweals/gnunet.git] / src / namestore / test_plugin_namestore.c

diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index 44400f9571610e1f39b3e8a04d263a659e8c5f09..21aaa0f7d932327e3356db53ee57e9e0fbb2f1cf 100644 (file)
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -28,8 +28,6 @@
 #include "gnunet_testing_lib.h"
 
 
-#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
-
 static int ok;
 
 /**
@@ -73,6 +71,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void*) cfg)))
   {
     FPRINTF (stderr, "Failed to load plugin `%s'!\n", plugin_name);
+    GNUNET_free (libname);
     return NULL;
   }
   GNUNET_free (libname);
@@ -80,16 +79,16 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
 }
 
 
-static void 
+static void
 test_record (void *cls,
-                                                const struct GNUNET_CRYPTO_EccPrivateKey *private_key,
+                                                const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
                                                 const char *label,
                                                 unsigned int rd_count,
-                                                const struct GNUNET_NAMESTORE_RecordData *rd)
+                                                const struct GNUNET_GNSRECORD_Data *rd)
 {
   int *idp = cls;
   int id = *idp;
-  struct GNUNET_CRYPTO_EccPrivateKey tzone_private_key;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey tzone_private_key;
   char tname[64];
   unsigned int trd_count = 1 + (id % 1024);
   unsigned int i;
@@ -101,11 +100,11 @@ test_record (void *cls,
     GNUNET_assert (rd[i].data_size == id % 10);
     GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10));
     GNUNET_assert (rd[i].record_type == 1 + (id % 13));
-    GNUNET_assert (rd[i].flags == (id  % 7));
+    GNUNET_assert (rd[i].flags == 0);
   }
   memset (&tzone_private_key, (id % 241), sizeof (tzone_private_key));
   GNUNET_assert (0 == strcmp (label, tname));
-  GNUNET_assert (0 == memcmp (&tzone_private_key, private_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)));
+  GNUNET_assert (0 == memcmp (&tzone_private_key, private_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)));
 }
 
 
@@ -120,11 +119,11 @@ get_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 static void
 put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
 {
-  struct GNUNET_CRYPTO_EccPrivateKey zone_private_key;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone_private_key;
   char label[64];
   unsigned int rd_count = 1 + (id % 1024);
-  struct GNUNET_NAMESTORE_RecordData rd[rd_count];
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_GNSRECORD_Data rd[rd_count];
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
   unsigned int i;
 
   GNUNET_snprintf (label, sizeof (label),
@@ -135,7 +134,7 @@ put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
     rd[i].data_size = id % 10;
     rd[i].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES).abs_value_us;
     rd[i].record_type = 1 + (id % 13);
-    rd[i].flags = (id  % 7);    
+    rd[i].flags = 0;
   }
   memset (&zone_private_key, (id % 241), sizeof (zone_private_key));
   memset (&signature, (id % 243), sizeof (signature));
@@ -151,14 +150,14 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  struct GNUNET_NAMESTORE_PluginFunctions *nsp;  
-  
+  struct GNUNET_NAMESTORE_PluginFunctions *nsp;
+
   ok = 0;
   nsp = load_plugin (cfg);
   if (NULL == nsp)
   {
     FPRINTF (stderr,
-             "%s", 
+             "%s",
             "Failed to initialize namestore.  Database likely not setup, skipping test.\n");
     return;
   }