-remove old tests

git-svn-id: https://gnunet.org/svn/gnunet@30356 140774ce-b5e7-0310-ab8b-a85725594a96

5 files changed, 0 insertions, 1900 deletions

diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
deleted file mode 100644
index 5214db8f81..0000000000
--- a/src/gns/test_gns_pseu_shorten.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2012,2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file gns/test_gns_pseu_shorten.c
- * @brief base testcase for testing on the fly pseu import and shorten
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-#include "block_gns.h"
-#include "gnunet_signatures.h"
-#include "gnunet_namestore_service.h"
-#include "../namestore/namestore.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_dht_service.h"
-#include "gnunet_gns_service.h"
-
-/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
-
-/* test records to resolve */
-#define TEST_DOMAIN "www.alicewonderland.bobbuilder.gnu"
-#define TEST_IP "127.0.0.1"
-#define TEST_RECORD_NAME "www"
-
-#define TEST_PRIVATE_ZONE "private"
-#define TEST_SHORTEN_ZONE "short"
-#define TEST_AUTHORITY_BOB "bobbuilder"
-#define TEST_AUTHORITY_ALICE "alicewonderland"
-#define TEST_PSEU_ALICE "carol"
-#define TEST_EXPECTED_RESULT "www.carol.short.private.gnu"
-
-#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-#define KEYFILE_SHORTEN = "zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey"
-#define KEYFILE_PRIVATE = "zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey"
-
-/* Globals */
-
-/* Task handle to use to schedule test failure */
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-/* Global return value (0 for success, anything else for failure) */
-static int ok;
-
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-static struct GNUNET_GNS_Handle *gns_handle;
-
-static struct GNUNET_DHT_Handle *dht_handle;
-
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-static struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey;
-static struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey;
-static struct GNUNET_CRYPTO_EcdsaPublicKey our_pkey;
-static struct GNUNET_CRYPTO_EcdsaPublicKey priv_pkey;
-static struct GNUNET_CRYPTO_EcdsaPublicKey short_pkey;
-static struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key;
-static struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key;
-static struct GNUNET_CRYPTO_EcdsaPrivateKey *our_key;
-static struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key;
-static struct GNUNET_CRYPTO_EcdsaPrivateKey *short_key;
-static struct GNUNET_CRYPTO_ShortHashCode alice_hash;
-static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-static struct GNUNET_CRYPTO_ShortHashCode our_zone;
-static struct GNUNET_CRYPTO_ShortHashCode priv_zone;
-static struct GNUNET_CRYPTO_ShortHashCode short_zone;
-
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != gns_handle)
-  {
-    GNUNET_GNS_disconnect(gns_handle);
-    gns_handle = NULL;
-  }
-
-  if (NULL != namestore_handle)
-  {
-    GNUNET_NAMESTORE_disconnect (namestore_handle);
-    namestore_handle = NULL;
-  }
-
-  if (NULL != dht_handle)
-  {
-    GNUNET_DHT_disconnect (dht_handle);
-    dht_handle = NULL;
-  }
-
-  GNUNET_break (0);
-  GNUNET_SCHEDULER_shutdown ();
-  ok = 1;
-}
-
-
-static void
-end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
-static void
-shutdown_task (void *cls,
-	       const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-/**
- * Called when gns shorten finishes
- */
-static void
-process_shorten_result (void* cls, const char* sname)
-{
-
-  if (GNUNET_SCHEDULER_NO_TASK != die_task)
-  {
-      GNUNET_SCHEDULER_cancel (die_task);
-      die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  if (NULL != dht_handle)
-  {
-    GNUNET_DHT_disconnect (dht_handle);
-    dht_handle = NULL;
-  }
-
-  if (sname == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "shorten test failed!\n");
-    ok = 1;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s shortened to %s\n", (char*)cls, sname);
-    if (0 != strcmp(sname, TEST_EXPECTED_RESULT))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "shorten test failed! (wanted: %s got: %s)\n",
-                  TEST_EXPECTED_RESULT, sname);
-      ok = 1;
-    }
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shorten test succeeded!\n");
-  }
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-}
-
-
-static void
-on_lookup_result (void *cls, uint32_t rd_count,
-		  const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct in_addr a;
-  int i;
-  char* addr;
-
-  if (rd_count == 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Lookup failed, rp_filtering?\n");
-    ok = 2;
-  }
-  else
-  {
-    ok = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
-      {
-        memcpy(&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
-        if (0 == strcmp(addr, TEST_IP))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
-          ok = 0;
-        }
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
-      }
-    }
-  }
-  GNUNET_GNS_shorten_zone (gns_handle, TEST_DOMAIN,
-                           &priv_zone,
-                           &short_zone,
-                           &our_zone,
-                           &process_shorten_result,
-                           TEST_DOMAIN);
-}
-
-
-/**
- * Function scheduled to be run on the successful start of services
- * tries to look up the dns record for TEST_DOMAIN
- */
-static void
-commence_testing (void *cls, int success)
-{
-  GNUNET_free(our_key);
-  GNUNET_free(bob_key);
-  GNUNET_free(alice_key);
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-  namestore_handle = NULL;
-  gns_handle = GNUNET_GNS_connect(cfg);
-  if (NULL == gns_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to connect to GNS!\n");
-  }
-  GNUNET_GNS_lookup_zone (gns_handle, TEST_DOMAIN,
-                          &our_zone,
-                          GNUNET_DNSPARSER_TYPE_A,
-                          GNUNET_NO,
-                          short_key,
-                          &on_lookup_result, TEST_DOMAIN);
-}
-
-
-static void
-put_pseu_dht (void *cls, int success)
-{
-  struct GNSNameRecordBlock *nrb;
-  struct GNUNET_CRYPTO_ShortHashCode name_hash;
-  struct GNUNET_CRYPTO_ShortHashCode zone_hash;
-  struct GNUNET_HashCode xor_hash;
-  struct GNUNET_HashCode name_hash_double;
-  struct GNUNET_HashCode zone_hash_double;
-  uint32_t rd_payload_length;
-  char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_GNSRECORD_Data rd;
-
-  memset (&rd, 0, sizeof (struct GNUNET_GNSRECORD_Data));
-  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-  rd.data_size = strlen(TEST_PSEU_ALICE)+1;
-  rd.data = TEST_PSEU_ALICE;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PSEU;
-  rd.flags = 0;
-
-  sig = GNUNET_NAMESTORE_create_signature(alice_key,
-                                           GNUNET_TIME_UNIT_FOREVER_ABS,
-                                           GNUNET_GNS_MASTERZONE_STR,
-                                           &rd, 1);
-
-  GNUNET_assert (NULL != sig);
-
-  GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey,
-                                                                 GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                                 GNUNET_GNS_MASTERZONE_STR,
-                                                                 1,
-                                                                 &rd,
-                                                                 sig));
-  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
-  nrb = GNUNET_malloc(rd_payload_length + strlen(GNUNET_GNS_MASTERZONE_STR) + 1
-                      + sizeof(struct GNSNameRecordBlock));
-  nrb->signature = *sig;
-  nrb->public_key = alice_pkey;
-  nrb->rd_count = htonl(1);
-  memset(&nrb[1], 0, strlen(GNUNET_GNS_MASTERZONE_STR) + 1);
-  strcpy((char*)&nrb[1], GNUNET_GNS_MASTERZONE_STR);
-  nrb_data = (char*)&nrb[1];
-  nrb_data += strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
-
-  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
-                                                &rd,
-                                                rd_payload_length,
-                                                nrb_data))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
-    ok = 3;
-    GNUNET_free(our_key);
-    GNUNET_free(bob_key);
-    GNUNET_free(alice_key);
-    GNUNET_free(sig);
-    GNUNET_free (nrb);
-    end_badly_now ();
-    return;
-  }
-  GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash);
-  GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey),
-                     &zone_hash);
-
-  GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
-  GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
-  GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
-
-  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
-    strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
-
-  GNUNET_DHT_put (dht_handle, &xor_hash,
-                  0,
-                  GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
-                  GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
-                  rd_payload_length,
-                  (char*)nrb,
-                  GNUNET_TIME_UNIT_FOREVER_ABS,
-                  DHT_OPERATION_TIMEOUT,
-                  &commence_testing,
-                  NULL);
-
-  GNUNET_free(sig);
-  GNUNET_free (nrb);
-}
-
-
-static void
-put_www_dht (void *cls, int success)
-{
-  struct GNSNameRecordBlock *nrb;
-  struct GNUNET_CRYPTO_ShortHashCode name_hash;
-  struct GNUNET_CRYPTO_ShortHashCode zone_hash;
-  struct GNUNET_HashCode xor_hash;
-  struct GNUNET_HashCode name_hash_double;
-  struct GNUNET_HashCode zone_hash_double;
-  uint32_t rd_payload_length;
-  char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_GNSRECORD_Data rd;
-  char* ip = TEST_IP;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-
-  rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
-  rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  sig = GNUNET_NAMESTORE_create_signature(alice_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME,
-                                          &rd, 1);
-
-  GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey,
-                                                                 GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                                 TEST_RECORD_NAME,
-                                                                 1,
-                                                                 &rd,
-                                                                 sig));
-  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
-  nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1
-                      + sizeof(struct GNSNameRecordBlock));
-  nrb->signature = *sig;
-  nrb->public_key = alice_pkey;
-  nrb->rd_count = htonl(1);
-  memset(&nrb[1], 0, strlen(TEST_RECORD_NAME) + 1);
-  strcpy((char*)&nrb[1], TEST_RECORD_NAME);
-  nrb_data = (char*)&nrb[1];
-  nrb_data += strlen(TEST_RECORD_NAME) + 1;
-
-  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
-                                                &rd,
-                                                rd_payload_length,
-                                                nrb_data))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
-    ok = 3;
-    GNUNET_free(our_key);
-    GNUNET_free(bob_key);
-    GNUNET_free(alice_key);
-    GNUNET_free (sig);
-    GNUNET_free(web);
-    GNUNET_free (nrb);
-    end_badly_now();
-    return;
-  }
-  GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
-  GNUNET_CRYPTO_short_hash(&alice_pkey,
-                     sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey),
-                     &zone_hash);
-  GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
-  GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
-  GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
-
-  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
-    strlen(TEST_RECORD_NAME) + 1;
-
-  GNUNET_DHT_put (dht_handle, &xor_hash,
-                  0,
-                  GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
-                  GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
-                  rd_payload_length,
-                  (char*)nrb,
-		  GNUNET_TIME_UNIT_FOREVER_ABS,
-                  DHT_OPERATION_TIMEOUT,
-                  &put_pseu_dht,
-                  NULL);
-  GNUNET_free (sig);
-  GNUNET_free (web);
-  GNUNET_free (nrb);
-}
-
-
-static void
-put_pkey_dht (void *cls, int32_t success, const char *emsg)
-{
-  struct GNSNameRecordBlock *nrb;
-  struct GNUNET_CRYPTO_ShortHashCode name_hash;
-  struct GNUNET_CRYPTO_ShortHashCode zone_hash;
-  struct GNUNET_HashCode xor_hash;
-  struct GNUNET_HashCode name_hash_double;
-  struct GNUNET_HashCode zone_hash_double;
-  uint32_t rd_payload_length;
-  char* nrb_data = NULL;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  struct GNUNET_GNSRECORD_Data rd;
-
-  rd.expiration_time = UINT64_MAX;
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &alice_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  sig = GNUNET_NAMESTORE_create_signature (bob_key,
-					   GNUNET_TIME_UNIT_FOREVER_ABS,
-					   TEST_AUTHORITY_ALICE,
-					   &rd,
-					   1);
-
-  rd_payload_length = GNUNET_GNSRECORD_records_get_size (1, &rd);
-  nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_AUTHORITY_ALICE) + 1
-                      + sizeof(struct GNSNameRecordBlock));
-  nrb->signature = *sig;
-  nrb->public_key = bob_pkey;
-  nrb->rd_count = htonl(1);
-  memset(&nrb[1], 0, strlen(TEST_AUTHORITY_ALICE) + 1);
-  strcpy((char*)&nrb[1], TEST_AUTHORITY_ALICE);
-  nrb_data = (char*)&nrb[1];
-  nrb_data += strlen(TEST_AUTHORITY_ALICE) + 1;
-
-  if (-1 == GNUNET_GNSRECORD_records_serialize (1,
-                                                &rd,
-                                                rd_payload_length,
-                                                nrb_data))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
-    ok = 3;
-
-    GNUNET_free (our_key);
-    GNUNET_free (bob_key);
-    GNUNET_free (alice_key);
-    GNUNET_free (sig);
-    GNUNET_free (nrb);
-    end_badly_now ();
-    return;
-  }
-
-
-  GNUNET_CRYPTO_short_hash (TEST_AUTHORITY_ALICE,
-			    strlen (TEST_AUTHORITY_ALICE), &name_hash);
-  GNUNET_CRYPTO_short_hash (&bob_pkey,
-			    sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey),
-			    &zone_hash);
-  GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double);
-  GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
-  GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
-
-  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
-    strlen(TEST_AUTHORITY_ALICE) + 1;
-  GNUNET_DHT_put (dht_handle, &xor_hash,
-                  0,
-                  GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
-                  GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
-                  rd_payload_length,
-                  (char*)nrb,
-                  GNUNET_TIME_UNIT_FOREVER_ABS,
-                  DHT_OPERATION_TIMEOUT,
-                  &put_www_dht,
-                  NULL);
-  GNUNET_free (sig);
-  GNUNET_free (nrb);
-}
-
-
-static void
-fin_init_zone (void *cls, int32_t success, const char *emsg)
-{
-  struct GNUNET_GNSRECORD_Data rd;
-  rd.expiration_time = UINT64_MAX;
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    our_key,
-					    TEST_AUTHORITY_BOB,
-					    1, &rd,
-					    &put_pkey_dht,
-					    NULL);
-}
-
-
-static void
-cont_init_zone (void *cls, int32_t success, const char *emsg)
-{
-
-  struct GNUNET_GNSRECORD_Data rd;
-
-  rd.expiration_time = UINT64_MAX;
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &short_zone;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    priv_key,
-					    TEST_SHORTEN_ZONE,
-					    1, &rd,
-					    &fin_init_zone,
-					    NULL);
-}
-
-
-static void
-do_check (void *cls,
-          const struct GNUNET_CONFIGURATION_Handle *ccfg,
-          struct GNUNET_TESTING_Peer *peer)
-{
-  char *private_keyfile;
-  char *shorten_keyfile;
-  char *our_keyfile;
-  struct GNUNET_GNSRECORD_Data rd;
-
-  cfg = ccfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
-  /* put records into namestore */
-  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
-  if (NULL == namestore_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    end_badly_now();
-    return;
-  }
-
-  /* dht */
-  dht_handle = GNUNET_DHT_connect(cfg, 1);
-  if (NULL == dht_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dht\n");
-    end_badly_now();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-							    "ZONEKEY",
-							    &our_keyfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    end_badly_now();
-    GNUNET_free (our_keyfile);
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-							    "SHORTEN_ZONEKEY",
-							    &shorten_keyfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               "Failed to get shorten zone key from cfg\n");
-    end_badly_now();
-    GNUNET_free (our_keyfile);
-    GNUNET_free (shorten_keyfile);
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-							    "PRIVATE_ZONEKEY",
-							    &private_keyfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               "Failed to get private zone key from cfg\n");
-    end_badly_now();
-    GNUNET_free (our_keyfile);
-    GNUNET_free (shorten_keyfile);
-    GNUNET_free (private_keyfile);
-    return;
-  }
-  our_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (our_keyfile);
-  priv_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (private_keyfile);
-  short_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (shorten_keyfile);
-  bob_key = GNUNET_CRYPTO_ecdsa_key_create ();
-  alice_key = GNUNET_CRYPTO_ecdsa_key_create ();
-
-  GNUNET_free (our_keyfile);
-  GNUNET_free (shorten_keyfile);
-  GNUNET_free (private_keyfile);
-
-  GNUNET_CRYPTO_ecdsa_key_get_public (our_key, &our_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &priv_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (short_key, &short_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash);
-  GNUNET_CRYPTO_short_hash (&alice_pkey, sizeof(alice_pkey), &alice_hash);
-  GNUNET_CRYPTO_short_hash (&our_pkey, sizeof(our_pkey), &our_zone);
-  GNUNET_CRYPTO_short_hash (&priv_pkey, sizeof(priv_pkey), &priv_zone);
-  GNUNET_CRYPTO_short_hash (&short_pkey, sizeof(short_pkey), &short_zone);
-
-  rd.expiration_time = UINT64_MAX;
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &priv_zone;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    our_key,
-					    TEST_PRIVATE_ZONE,
-					    1, &rd,
-					    &cont_init_zone,
-					    NULL);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-  GNUNET_log_setup ("test-gns-pseu-shorten",
-                    "WARNING",
-                    NULL);
-  GNUNET_TESTING_peer_run ("test-gns-pseu-shorten", "test_gns_simple_lookup.conf", &do_check, NULL);
-  return ok;
-}
-
-/* end of test_gns_pseu_shorten.c */
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
deleted file mode 100644
index 738bda3183..0000000000
--- a/src/gns/test_gns_revocation.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file gns/test_gns_revovation.c
- * @brief base testcase for testing zone revocation
- *
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-#include "block_dns.h"
-#include "gnunet_signatures.h"
-#include "gnunet_namestore_service.h"
-#include "../namestore/namestore.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_gns_service.h"
-
-/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
-
-/* test records to resolve */
-#define TEST_DOMAIN "www.bob.gnu"
-#define TEST_IP "127.0.0.1"
-#define TEST_RECORD_NAME "www"
-
-#define TEST_AUTHORITY_NAME "bob"
-
-#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
-
-/* Task handle to use to schedule test failure */
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-/* Global return value (0 for success, anything else for failure) */
-static int ok;
-
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-static struct GNUNET_GNS_Handle *gns_handle;
-
-/**/
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != gns_handle)
-  {
-    GNUNET_GNS_disconnect(gns_handle);
-    gns_handle = NULL;
-  }
-
-  if (NULL != namestore_handle)
-  {
-    GNUNET_NAMESTORE_disconnect (namestore_handle);
-    namestore_handle = NULL;
-  }
-  GNUNET_break (0);
-  GNUNET_SCHEDULER_shutdown ();
-  ok = 1;
-}
-
-
-static void
-end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
-static void
-shutdown_task (void *cls,
-	       const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-static void
-on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct in_addr a;
-  int i;
-  char* addr;
-
-  if (GNUNET_SCHEDULER_NO_TASK != die_task)
-  {
-      GNUNET_SCHEDULER_cancel (die_task);
-      die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-  namestore_handle = NULL;
-  if (rd_count == 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Lookup failed, this is good!\n");
-    ok = 0;
-  }
-  else
-  {
-    ok = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
-      {
-        memcpy(&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "address: %s\n", addr);
-        if (0 == strcmp(addr, TEST_IP))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "%s incorrectly resolved to %s!\n", TEST_DOMAIN, addr);
-          ok = 2;
-        }
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
-      }
-    }
-  }
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-}
-
-
-/**
- * Function scheduled to be run on the successful start of services
- * tries to look up the dns record for TEST_DOMAIN
- */
-static void
-commence_testing (void *cls, int32_t success, const char *emsg)
-{
-  gns_handle = GNUNET_GNS_connect(cfg);
-  if (NULL == gns_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to connect to GNS!\n");
-    end_badly_now ();
-    return;
-  }
-
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
-                    GNUNET_NO,
-                    NULL,
-                    &on_lookup_result, TEST_DOMAIN);
-}
-
-
-static void
-do_check (void *cls,
-          const struct GNUNET_CONFIGURATION_Handle *ccfg,
-          struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey;
-  struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key;
-  struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  char* alice_keyfile;
-
-  cfg = ccfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
-  /* put records into namestore */
-  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
-  if (NULL == namestore_handle)
-  {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-      end_badly_now ();
-      return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                          "ZONEKEY",
-                                                          &alice_keyfile))
-  {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-      end_badly_now ();
-      return;
-  }
-
-  alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB);
-
-  GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
-
-  struct GNUNET_GNSRECORD_Data rd;
-  char* ip = TEST_IP;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
-
-  GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
-
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    alice_key,
-					    TEST_AUTHORITY_NAME,
-					    1, &rd,
-					    NULL,
-					    NULL);
-
-  rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME,
-                                          &rd, 1);
-
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &bob_pkey,
-                               TEST_RECORD_NAME,
-			       GNUNET_TIME_UNIT_FOREVER_ABS,
-                               1,
-                               &rd,
-                               sig,
-                               NULL,
-                               NULL);
-  rd.data_size = 0;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_REV;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    bob_key,
-					    GNUNET_GNS_MASTERZONE_STR,
-					    1, &rd,
-					    &commence_testing,
-					    NULL);
-  GNUNET_free (alice_keyfile);
-  GNUNET_free (web);
-  GNUNET_free (sig);
-  GNUNET_free (bob_key);
-  GNUNET_free (alice_key);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-
-  GNUNET_log_setup ("test-gns-revocation",
-                    "WARNING",
-                    NULL);
-  GNUNET_TESTING_peer_run ("test-gns-revocation", "test_gns_simple_lookup.conf", &do_check, NULL);
-  return ok;
-}
-
-
-/* end of test_gns_revocation.c */
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
deleted file mode 100644
index 74fe774468..0000000000
--- a/src/gns/test_gns_simple_shorten.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file gns/test_gns_simple_shorten.c
- * @brief basic shorten test for gns api
- *
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-#include "block_dns.h"
-#include "gnunet_signatures.h"
-#include "gnunet_namestore_service.h"
-#include "../namestore/namestore.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_gns_service.h"
-
-/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
-
-/* test records to resolve */
-#define TEST_DOMAIN "www.alice.bob.gnu"
-#define TEST_IP "127.0.0.1"
-#define TEST_RECORD_NAME "www"
-
-#define TEST_AUTHORITY_BOB "bob"
-#define TEST_AUTHORITY_ALICE "alice"
-#define TEST_ALICE_PSEU "carol"
-#define TEST_EXPECTED_RESULT "www.carol.gnu"
-
-#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
-#define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"
-
-
-/* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-/* Global return value (0 for success, anything else for failure) */
-static int ok;
-
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-static struct GNUNET_GNS_Handle *gns_handle;
-
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-struct GNUNET_CRYPTO_EcdsaPublicKey priv_pkey;
-struct GNUNET_CRYPTO_EcdsaPublicKey short_pkey;
-struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key;
-struct GNUNET_CRYPTO_EcdsaPrivateKey *short_key;
-
-struct GNUNET_CRYPTO_ShortHashCode priv_zone;
-struct GNUNET_CRYPTO_ShortHashCode short_zone;
-
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_SCHEDULER_shutdown ();
-  ok = 1;
-}
-
-void end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-static void shutdown_task (void *cls,
-                           const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-/**
- * Called when gns shorten finishes
- */
-static void
-process_shorten_result(void* cls, const char* sname)
-{
-
-  if (GNUNET_SCHEDULER_NO_TASK != die_task)
-  {
-      GNUNET_SCHEDULER_cancel (die_task);
-      die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting from namestore\n");
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-
-  if (sname == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Shorten test failed!\n");
-    ok = 1;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s shortened to %s\n", (char*)cls, sname);
-    if (0 != strcmp(sname, TEST_EXPECTED_RESULT))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Shorten test failed! (wanted: %s got: %s\n",
-                  (char*)cls, sname);
-      ok = 1;
-    }
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shorten test succeeded!\n");
-    ok = 0;
-  }
-
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-}
-
-/**
- * Function scheduled to be run on the successful start of services
- * tries to shorten the name TEST_DOMAIN using gns
- */
-static void
-commence_testing (void *cls, int32_t success, const char *emsg)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Connecting to gns\n");
-  gns_handle = GNUNET_GNS_connect(cfg);
-  if (NULL == gns_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to connect to gns\n");
-    end_badly_now ();
-    return;
-  }
-
-  GNUNET_assert (NULL != GNUNET_GNS_shorten (gns_handle, TEST_DOMAIN,
-                      &priv_zone,
-                      &short_zone,
-                      &process_shorten_result,
-                      TEST_DOMAIN));
-}
-
-
-
-void do_check (void *cls,
-              const struct GNUNET_CONFIGURATION_Handle *ccfg,
-              struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_CRYPTO_EcdsaPublicKey our_pkey;
-  struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey;
-  struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *our_key;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key;
-  struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-  struct GNUNET_CRYPTO_ShortHashCode alice_hash;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  char* our_keyfile;
-  char* private_keyfile;
-  char* shorten_keyfile;
-
-  cfg = ccfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running test\n");
-
-
-  /* put records into namestore */
-  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
-  if (NULL == namestore_handle)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                          "ZONEKEY",
-                                                          &our_keyfile))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                            "SHORTEN_ZONEKEY",
-                                                            &shorten_keyfile))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Failed to get shorten zone key from cfg\n");
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                            "PRIVATE_ZONEKEY",
-                                                            &private_keyfile))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Failed to get private zone key from cfg\n");
-    end_badly_now ();
-    return;
-  }
-
-  our_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (our_keyfile);
-  GNUNET_free(our_keyfile);
-
-  bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB);
-  alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_ALICE);
-  priv_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (private_keyfile);
-  short_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (shorten_keyfile);
-
-  GNUNET_free(shorten_keyfile);
-  GNUNET_free(private_keyfile);
-
-  GNUNET_CRYPTO_ecdsa_key_get_public (our_key, &our_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &priv_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (short_key, &short_pkey);
-
-  GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone);
-  GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone);
-
-  struct GNUNET_GNSRECORD_Data rd;
-  char* ip = TEST_IP;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
-
-  GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
-
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  /* put bob into our zone */
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    our_key,
-					    TEST_AUTHORITY_BOB,
-					    1,
-					    &rd,
-					    NULL,
-					    NULL);
-
-  /* put alice into bobs zone */
-  GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(alice_pkey), &alice_hash);
-  rd.data = &alice_hash;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_AUTHORITY_ALICE,
-                                          &rd, 1);
-
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &bob_pkey,
-                               TEST_AUTHORITY_ALICE,
-                               GNUNET_TIME_UNIT_FOREVER_ABS,
-                               1,
-                               &rd,
-                               sig,
-                               NULL,
-                               NULL);
-  GNUNET_free(sig);
-  /* put www A record and PSEU into alice's zone */
-
-  rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  sig = GNUNET_NAMESTORE_create_signature(alice_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME,
-                                          &rd, 1);
-
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &alice_pkey,
-                               TEST_RECORD_NAME,
-                               GNUNET_TIME_UNIT_FOREVER_ABS,
-                               1,
-                               &rd,
-                               sig,
-                               NULL,
-                               NULL);
-
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &alice_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  GNUNET_free(sig);
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    our_key,
-					    TEST_ALICE_PSEU,
-					    1, &rd,
-					    &commence_testing,
-					    NULL);
-
-  GNUNET_free(web);
-  GNUNET_free(our_key);
-  GNUNET_free(bob_key);
-  GNUNET_free(alice_key);
-  GNUNET_free(priv_key);
-  GNUNET_free(short_key);
-
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-  GNUNET_log_setup ("test-gns-simple-shorten",
-                    "WARNING",
-                    NULL);
-  GNUNET_TESTING_peer_run ("test-gns-simple-shorten",
-			   "test_gns_simple_lookup.conf",
-			   &do_check, NULL);
-  return ok;
-}
-
-/* end of test_gns_simple_shorten.c */
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c
deleted file mode 100644
index ce8478d7d3..0000000000
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file gns/test_gns_simple_srv_lookup.c
- * @brief base testcase for testing GNS SRV lookups
- *
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-#include "block_dns.h"
-#include "gnunet_signatures.h"
-#include "gnunet_namestore_service.h"
-#include "../namestore/namestore.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gns_protocol.h"
-#include "gnunet_gns_service.h"
-
-/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
-
-/* test records to resolve */
-#define TEST_DOMAIN "_sip._tcp.bob.gnu"
-#define TEST_IP "127.0.0.1"
-#define TEST_RECORD_NAME "sipserver"
-#define TEST_RECORD_NAME_SRV "_sip._tcp"
-#define TEST_SRV_NAME "sipserver.+"
-#define TEST_EXPECTED_SRV "sipserver.bob.gnu"
-
-#define TEST_AUTHORITY_NAME "bob"
-
-#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
-
-/* Globals */
-
-/* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-/* Global return value (0 for success, anything else for failure) */
-static int ok;
-
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-static struct GNUNET_GNS_Handle *gns_handle;
-
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != gns_handle)
-  {
-    GNUNET_GNS_disconnect(gns_handle);
-    gns_handle = NULL;
-  }
-
-  if (NULL != namestore_handle)
-  {
-    GNUNET_NAMESTORE_disconnect (namestore_handle);
-    namestore_handle = NULL;
-  }
-  GNUNET_break (0);
-  GNUNET_SCHEDULER_shutdown ();
-  ok = 1;
-}
-
-static void
-end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-static void shutdown_task (void *cls,
-                           const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-static void
-on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_GNSRECORD_Data *rd)
-{
-  int i;
-  uint16_t *srv_data;
-  char* srv;
-
-  if (GNUNET_SCHEDULER_NO_TASK != die_task)
-  {
-      GNUNET_SCHEDULER_cancel (die_task);
-      die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-  if (rd_count == 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Lookup failed, rp_filtering?\n");
-    ok = 2;
-  }
-  else
-  {
-    ok = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_SRV)
-      {
-        srv_data = (uint16_t*)rd[i].data;
-        srv = (char*)&srv_data[3];
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Got SRV %s with p=%d,w=%d,port=%d\n",
-                    srv, srv_data, &srv_data[1], &srv_data[2]);
-        if (0 == strcmp(srv, TEST_EXPECTED_SRV))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                      "%s correctly resolved to %s!\n", TEST_DOMAIN,
-                      TEST_EXPECTED_SRV);
-          ok = 0;
-        }
-      }
-    }
-  }
-
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-
-}
-
-
-/**
- * Function scheduled to be run on the successful start of services
- * tries to look up the dns record for TEST_DOMAIN
- */
-static void
-commence_testing (void *cls, int32_t success, const char *emsg)
-{
-
-  gns_handle = GNUNET_GNS_connect(cfg);
-  if (NULL == gns_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to connect to GNS!\n");
-    end_badly_now();
-    return;
-  }
-
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_SRV,
-                    GNUNET_NO,
-                    NULL,
-                    &on_lookup_result, TEST_DOMAIN);
-}
-
-
-static void
-do_check (void *cls,
-          const struct GNUNET_CONFIGURATION_Handle *ccfg,
-          struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey;
-  struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key;
-  struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  char* alice_keyfile;
-  struct GNUNET_TUN_DnsSrvRecord *srv_data;
-  struct GNUNET_TIME_Absolute et;
-
-  cfg = ccfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
-  /* put records into namestore */
-  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
-  if (NULL == namestore_handle)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    end_badly_now();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                          "ZONEKEY",
-                                                          &alice_keyfile))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    end_badly_now();
-    return;
-  }
-
-  alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB);
-
-  GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
-
-  struct GNUNET_GNSRECORD_Data rd;
-  char* ip = TEST_IP;
-  struct in_addr *sipserver = GNUNET_malloc (sizeof (struct in_addr));
-  srv_data = GNUNET_malloc (sizeof (struct GNUNET_TUN_DnsSrvRecord) + strlen (TEST_SRV_NAME) + 1);
-  uint16_t srv_weight = 60;
-  uint16_t srv_prio = 50;
-  uint16_t srv_port = 5060;
-
-  rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, sipserver));
-
-  GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
-
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    alice_key,
-					    TEST_AUTHORITY_NAME,
-					    1, &rd,
-					    NULL,
-					    NULL);
-
-  rd.data_size = sizeof (struct in_addr);
-  rd.data = sipserver;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME,
-                                          &rd, 1);
-  et.abs_value_us = rd.expiration_time;
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &bob_pkey,
-                               TEST_RECORD_NAME,
-                               et,
-                               1,
-                               &rd,
-                               sig,
-                               NULL,
-                               NULL);
-  GNUNET_free (sig);
-
-  rd.data_size = sizeof (struct GNUNET_TUN_DnsSrvRecord)+strlen(TEST_SRV_NAME)+1;
-  srv_data->port = srv_port;
-  srv_data->prio = srv_prio;
-  srv_data->weight = srv_weight;
-  strcpy((char*)&srv_data[1], TEST_SRV_NAME);
-  rd.data = srv_data;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_SRV;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME_SRV,
-                                          &rd, 1);
-  et.abs_value_us = rd.expiration_time;
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &bob_pkey,
-                               TEST_RECORD_NAME_SRV,
-                               et,
-                               1,
-                               &rd,
-                               sig,
-                               &commence_testing,
-                               NULL);
-  GNUNET_free (alice_keyfile);
-  GNUNET_free (srv_data);
-  GNUNET_free (sipserver);
-  GNUNET_free (sig);
-  GNUNET_free (bob_key);
-  GNUNET_free (alice_key);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-  GNUNET_log_setup ("test-gns-simple-srv-lookup",
-                    "WARNING",
-                    NULL);
-  GNUNET_TESTING_peer_run ("test-gns-simple-srv-lookup", "test_gns_simple_lookup.conf", &do_check, NULL);
-  GNUNET_DISK_directory_remove ("test-gns-simple-srv-lookup");
-  return ok;
-}
-
-/* end of test_gns_simple_srv_lookup.c */
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c
deleted file mode 100644
index 6907362b89..0000000000
--- a/src/gns/test_gns_simple_zkey_lookup.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file gns/test_gns_simple_zkey_lookup.c
- * @brief base testcase for testing zkey lookup
- *
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-#include "block_dns.h"
-#include "gnunet_signatures.h"
-#include "gnunet_namestore_service.h"
-#include "../namestore/namestore.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_gns_service.h"
-#include "gns.h"
-
-/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40)
-
-/* test records to resolve */
-#define TEST_IP "127.0.0.1"
-#define TEST_RECORD_NAME "www"
-
-#define TEST_AUTHORITY_NAME "bob"
-
-#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
-
-/* Task handle to use to schedule test failure */
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-/* Global return value (0 for success, anything else for failure) */
-static int ok;
-
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-static struct GNUNET_GNS_Handle *gns_handle;
-
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != gns_handle)
-  {
-    GNUNET_GNS_disconnect(gns_handle);
-    gns_handle = NULL;
-  }
-
-  if (NULL != namestore_handle)
-  {
-    GNUNET_NAMESTORE_disconnect (namestore_handle);
-    namestore_handle = NULL;
-  }
-  GNUNET_break (0);
-  GNUNET_SCHEDULER_shutdown ();
-  ok = 1;
-}
-
-
-static void
-end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
-static void
-shutdown_task (void *cls,
-	       const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-static void
-on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_GNSRECORD_Data *rd)
-{
-  struct in_addr a;
-  int i;
-  char* addr;
-
-  if (GNUNET_SCHEDULER_NO_TASK != die_task)
-  {
-      GNUNET_SCHEDULER_cancel (die_task);
-      die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-  namestore_handle = NULL;
-  if (rd_count == 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Lookup failed\n");
-    ok = 2;
-  }
-  else
-  {
-    ok = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
-      {
-        memcpy(&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
-        if (0 == strcmp(addr, TEST_IP))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "ZKEY correctly resolved to %s!\n", addr);
-          ok = 0;
-        }
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
-      }
-    }
-  }
-
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-}
-
-
-/**
- * Function scheduled to be run on the successful start of services
- * tries to look up the dns record for TEST_DOMAIN
- */
-static void
-commence_testing (void *cls, int32_t success, const char *emsg)
-{
-  char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
-  char* pos;
-  struct GNUNET_CRYPTO_ShortHashAsciiEncoded hash_str;
-
-  gns_handle = GNUNET_GNS_connect(cfg);
-  if (NULL == gns_handle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to connect to GNS!\n");
-    end_badly_now ();
-    return;
-  }
-
-  pos = name;
-  strcpy(pos, TEST_RECORD_NAME);
-  pos += strlen(TEST_RECORD_NAME);
-  strcpy(pos, ".");
-  pos++;
-  GNUNET_CRYPTO_short_hash_to_enc(&bob_hash, &hash_str);
-  strcpy(pos, (char*)&hash_str);
-  pos += strlen((char*)&hash_str);
-  strcpy(pos, ".");
-  pos++;
-  strcpy(pos, GNUNET_GNS_TLD_ZKEY);
-
-  GNUNET_GNS_lookup(gns_handle, name, GNUNET_DNSPARSER_TYPE_A,
-                    GNUNET_NO,
-                    NULL,
-                    &on_lookup_result, NULL);
-}
-
-
-static void
-do_check (void *cls,
-          const struct GNUNET_CONFIGURATION_Handle *ccfg,
-          struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey;
-  struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key;
-  struct GNUNET_CRYPTO_EcdsaSignature *sig;
-  char* alice_keyfile;
-
-  cfg = ccfg;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
-  /* put records into namestore */
-  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
-  if (NULL == namestore_handle)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                          "ZONEKEY",
-                                                          &alice_keyfile))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    end_badly_now ();
-    return;
-  }
-
-  alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB);
-
-  GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey);
-
-  struct GNUNET_GNSRECORD_Data rd;
-  char* ip = TEST_IP;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
-
-  GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
-
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
-  rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
-  rd.flags = GNUNET_GNSRECORD_RF_NONE;
-
-  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
-					    alice_key,
-					    TEST_AUTHORITY_NAME,
-					    1, &rd,
-					    NULL,
-					    NULL);
-
-  rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
-  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key,
-                                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          TEST_RECORD_NAME,
-                                          &rd, 1);
-
-  GNUNET_NAMESTORE_record_put (namestore_handle,
-                               &bob_pkey,
-                               TEST_RECORD_NAME,
-                               GNUNET_TIME_UNIT_FOREVER_ABS,
-                               1,
-                               &rd,
-                               sig,
-                               &commence_testing,
-                               NULL);
-  GNUNET_free (alice_keyfile);
-  GNUNET_free (web);
-  GNUNET_free (sig);
-  GNUNET_free (bob_key);
-  GNUNET_free (alice_key);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-
-  GNUNET_log_setup ("test-gns-simple-zkey-lookup",
-                    "WARNING",
-                    NULL);
-  GNUNET_TESTING_peer_run ("test-gns-simple-zkey-lookup",
-			   "test_gns_simple_lookup.conf",
-			   &do_check, NULL);
-  return ok;
-}
-
-
-/* end of test_gns_simple_zkey_lookup.c */