-consistently use struct GNUNET_HashCode

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

diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c
index 47bc9b6723690770bc6b83cb5ac775e7642e7d64..818e7108dc80f318d0c29a327f4babe9cba9f3ff 100644 (file)
--- a/src/namestore/test_namestore_api_lookup.c
+++ b/src/namestore/test_namestore_api_lookup.c
@@ -44,7 +44,7 @@ static struct GNUNET_OS_Process *arm;
 static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
 static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
 struct GNUNET_CRYPTO_RsaSignature *s_signature;
-static GNUNET_HashCode s_zone;
+static struct GNUNET_CRYPTO_ShortHashCode s_zone;
 struct GNUNET_NAMESTORE_RecordData *s_rd;
 static char *s_name;
 
@@ -73,7 +73,7 @@ stop_arm ()
     if (0 != GNUNET_OS_process_kill (arm, SIGTERM))
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
     GNUNET_OS_process_wait (arm);
-    GNUNET_OS_process_close (arm);
+    GNUNET_OS_process_destroy (arm);
     arm = NULL;
   }
 }
@@ -137,7 +137,6 @@ void name_lookup_proc (void *cls,
                             const struct GNUNET_CRYPTO_RsaSignature *signature)
 {
   static int found = GNUNET_NO;
-  int failed = GNUNET_NO;
   int c;
 
   if (n != NULL)
@@ -146,25 +145,21 @@ void name_lookup_proc (void *cls,
     if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
     {
       GNUNET_break (0);
-      failed = GNUNET_YES;
     }
 
     if (0 != memcmp (signature, s_signature, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
     {
       GNUNET_break (0);
-      failed = GNUNET_YES;
     }
 
     if (0 != strcmp(n, s_name))
     {
       GNUNET_break (0);
-      failed = GNUNET_YES;
     }
 
     if (RECORDS != rd_count)
     {
       GNUNET_break (0);
-      failed = GNUNET_YES;
     }
 
     for (c = 0; c < RECORDS; c++)
@@ -172,7 +167,6 @@ void name_lookup_proc (void *cls,
       if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp (&rd[c], &s_rd[c]))
       {
         GNUNET_break (0);
-        failed = GNUNET_YES;
       }
     }
     found = GNUNET_YES;
@@ -255,7 +249,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   size_t rd_ser_len;
 
-  /* load privat key */
+  /* load privat key from file not included in zonekey dir */
   privkey = GNUNET_CRYPTO_rsa_key_create_from_file("test_hostkey");
   GNUNET_assert (privkey != NULL);
   /* get public key */
@@ -270,11 +264,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
 
   /* sign */
-  s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS);
+  s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration, s_name, s_rd, RECORDS);
 
   /* create random zone hash */
-  GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
-
+  GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
   start_arm (cfgfile);
   GNUNET_assert (arm != NULL);
 
@@ -285,13 +278,11 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_break (s_name != NULL);
 
   GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
-                              GNUNET_TIME_absolute_get_forever(),
-                              RECORDS, s_rd, s_signature, put_cont, s_name);
-
-
-
+                              GNUNET_TIME_UNIT_FOREVER_ABS,
+                              RECORDS, s_rd, s_signature, put_cont, s_name);
 }
 
+
 static int
 check ()
 {