[gnunet] branch master updated: -theses are also not namestore tests, but GNS tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 2e14282ec -theses are also not namestore tests, but GNS tests
2e14282ec is described below

commit 2e14282ec0db0984df33a92c630c831d9d0d120b
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Oct 4 21:25:47 2022 +0900

    -theses are also not namestore tests, but GNS tests
---
 src/namestore/Makefile.am                         |  44 ----
 src/namestore/test_namestore_api_lookup_private.c | 246 --------------------
 src/namestore/test_namestore_api_lookup_public.c  | 266 ----------------------
 3 files changed, 556 deletions(-)

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index d29d5b6d2..da563a9e8 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -25,8 +25,6 @@ SQLITE_TESTS = test_plugin_namestore_sqlite \
  test_namestore_api_remove_sqlite \
  test_namestore_api_lookup_nick_sqlite \
  test_namestore_api_monitoring_sqlite \
- test_namestore_api_lookup_public_sqlite \
- test_namestore_api_lookup_private_sqlite \
  test_namestore_api_remove_not_existing_record_sqlite \
  test_namestore_api_zone_iteration_nick_sqlite \
  test_namestore_api_zone_iteration_specific_zone_sqlite \
@@ -49,8 +47,6 @@ POSTGRES_TESTS = test_plugin_namestore_postgres \
  test_namestore_api_zone_iteration_postgres \
  test_namestore_api_lookup_nick_postgres \
  test_namestore_api_monitoring_postgres \
- test_namestore_api_lookup_public_postgres \
- test_namestore_api_lookup_private_postgres \
  test_namestore_api_remove_not_existing_record_postgres \
  test_namestore_api_zone_iteration_nick_postgres \
  test_namestore_api_zone_iteration_specific_zone_postgres \
@@ -249,26 +245,6 @@ test_namestore_api_store_update_postgres_LDADD = \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_public_sqlite_SOURCES = \
- test_namestore_api_lookup_public.c
-test_namestore_api_lookup_public_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
-
-test_namestore_api_lookup_public_postgres_SOURCES = \
- test_namestore_api_lookup_public.c
-test_namestore_api_lookup_public_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
-
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
  test_namestore_api_lookup_nick.c
 test_namestore_api_lookup_nick_sqlite_LDADD = \
@@ -289,26 +265,6 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_private_sqlite_SOURCES = \
- test_namestore_api_lookup_private.c
-test_namestore_api_lookup_private_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
-
-test_namestore_api_lookup_private_postgres_SOURCES = \
- test_namestore_api_lookup_private.c
-test_namestore_api_lookup_private_postgres_LDADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
-
 test_namestore_api_remove_sqlite_SOURCES = \
  test_namestore_api_remove.c
 test_namestore_api_remove_sqlite_LDADD = \
diff --git a/src/namestore/test_namestore_api_lookup_private.c 
b/src/namestore/test_namestore_api_lookup_private.c
deleted file mode 100644
index 67cf54582..000000000
--- a/src/namestore/test_namestore_api_lookup_private.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2012 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
-     by the Free Software Foundation, either version 3 of the License,
-     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
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file namestore/test_namestore_api_store.c
- * @brief testcase for namestore_api.c: store a record
- */
-#include "platform.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
-
-#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
-
-#define TEST_RECORD_DATALEN 123
-
-#define TEST_RECORD_DATA 'a'
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-static struct GNUNET_NAMESTORE_Handle *nsh;
-
-static struct GNUNET_SCHEDULER_Task *endbadly_task;
-
-static struct GNUNET_IDENTITY_PrivateKey privkey;
-
-static struct GNUNET_IDENTITY_PublicKey pubkey;
-
-static int res;
-
-static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
-
-// static const char * name = "dummy.dummy.gnunet";
-static const char *name = "d";
-
-
-static void
-cleanup ()
-{
-  if (NULL != nsh)
-  {
-    GNUNET_NAMESTORE_disconnect (nsh);
-    nsh = NULL;
-  }
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Re-establish the connection to the service.
- *
- * @param cls handle to use to re-connect.
- */
-static void
-endbadly (void *cls)
-{
-  endbadly_task = NULL;
-  if (NULL != nsqe)
-  {
-    GNUNET_NAMESTORE_cancel (nsqe);
-    nsqe = NULL;
-  }
-  cleanup ();
-  res = 1;
-}
-
-
-static void
-end (void *cls)
-{
-  cleanup ();
-  res = 0;
-}
-
-
-static void
-lookup_it (void *cls,
-           const struct GNUNET_IDENTITY_PrivateKey *zone,
-           const char *label,
-           unsigned int rd_count,
-           const struct GNUNET_GNSRECORD_Data *rd)
-{
-  nsqe = NULL;
-
-  if (0 != GNUNET_memcmp (&privkey,
-                          zone))
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-
-
-  if (NULL == label)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-
-  if (0 != strcmp (label, name))
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-
-  if (1 != rd_count)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-
-  /* Done */
-  GNUNET_SCHEDULER_cancel (endbadly_task);
-  endbadly_task = NULL;
-  GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static void
-fail_cb (void *cls)
-{
-  GNUNET_assert (0);
-}
-
-
-static void
-put_cont (void *cls,
-          int32_t success,
-          const char *emsg)
-{
-  const char *name = cls;
-
-  nsqe = NULL;
-  GNUNET_assert (NULL != cls);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Name store added record for `%s': %s\n",
-              name,
-              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
-  if (GNUNET_OK != success)
-  {
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-  /* Lookup */
-  nsqe = GNUNET_NAMESTORE_records_lookup (nsh,
-                                          &privkey,
-                                          name,
-                                          &fail_cb,
-                                          NULL,
-                                          &lookup_it,
-                                          NULL);
-}
-
-
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_GNSRECORD_Data rd;
-
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                &endbadly,
-                                                NULL);
-  privkey.type = htonl (GNUNET_GNSRECORD_TYPE_PKEY);
-  GNUNET_CRYPTO_ecdsa_key_create (&privkey.ecdsa_key);
-  GNUNET_IDENTITY_key_get_public (&privkey, &pubkey);
-
-  rd.expiration_time = GNUNET_TIME_absolute_get ().abs_value_us;
-  rd.record_type = TEST_RECORD_TYPE;
-  rd.data_size = TEST_RECORD_DATALEN;
-  rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
-  rd.flags = 0;
-  memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
-
-  nsh = GNUNET_NAMESTORE_connect (cfg);
-  GNUNET_break (NULL != nsh);
-  nsqe = GNUNET_NAMESTORE_records_store (nsh,
-                                         &privkey,
-                                         name,
-                                         1,
-                                         &rd,
-                                         &put_cont,
-                                         (void *) name);
-  if (NULL == nsqe)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Namestore cannot store no block\n"));
-  }
-
-  GNUNET_free_nz ((void *) rd.data);
-}
-
-
-#include "test_common.c"
-
-
-int
-main (int argc, char *argv[])
-{
-  const char *plugin_name;
-  char *cfg_name;
-
-  SETUP_CFG (plugin_name, cfg_name);
-  res = 1;
-  if (0 !=
-      GNUNET_TESTING_peer_run ("test-namestore-api-lookup-private",
-                               cfg_name,
-                               &run,
-                               NULL))
-  {
-    res = 1;
-  }
-  GNUNET_DISK_purge_cfg_dir (cfg_name,
-                             "GNUNET_TEST_HOME");
-  GNUNET_free (cfg_name);
-  return res;
-}
-
-
-/* end of test_namestore_api_lookup_private.c */
diff --git a/src/namestore/test_namestore_api_lookup_public.c 
b/src/namestore/test_namestore_api_lookup_public.c
deleted file mode 100644
index 796c8901f..000000000
--- a/src/namestore/test_namestore_api_lookup_public.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2012 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
-     by the Free Software Foundation, either version 3 of the License,
-     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
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file namestore/test_namestore_api.c
- * @brief testcase for namestore_api.c: store a record and perform a lookup
- */
-#include "platform.h"
-#include "gnunet_namecache_service.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
-
-#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
-
-#define TEST_RECORD_DATALEN 123
-
-#define TEST_RECORD_DATA 'a'
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-
-
-static struct GNUNET_NAMESTORE_Handle *nsh;
-
-static struct GNUNET_NAMECACHE_Handle *nch;
-
-static struct GNUNET_SCHEDULER_Task *endbadly_task;
-
-static struct GNUNET_IDENTITY_PrivateKey privkey;
-
-static struct GNUNET_IDENTITY_PublicKey pubkey;
-
-static int res;
-
-static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
-
-static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
-
-
-static void
-cleanup ()
-{
-  if (NULL != nsh)
-  {
-    GNUNET_NAMESTORE_disconnect (nsh);
-    nsh = NULL;
-  }
-  if (NULL != nch)
-  {
-    GNUNET_NAMECACHE_disconnect (nch);
-    nch = NULL;
-  }
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Re-establish the connection to the service.
- *
- * @param cls handle to use to re-connect.
- */
-static void
-endbadly (void *cls)
-{
-  if (NULL != nsqe)
-  {
-    GNUNET_NAMESTORE_cancel (nsqe);
-    nsqe = NULL;
-  }
-  if (NULL != ncqe)
-  {
-    GNUNET_NAMECACHE_cancel (ncqe);
-    ncqe = NULL;
-  }
-  cleanup ();
-  res = 1;
-}
-
-
-static void
-end (void *cls)
-{
-  cleanup ();
-  res = 0;
-}
-
-
-static void
-rd_decrypt_cb (void *cls,
-               unsigned int rd_count,
-               const struct GNUNET_GNSRECORD_Data *rd)
-{
-  char rd_cmp_data[TEST_RECORD_DATALEN];
-
-  GNUNET_assert (1 == rd_count);
-  GNUNET_assert (NULL != rd);
-
-  memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN);
-
-  GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
-  GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
-  GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Block was decrypted successfully \n");
-
-  GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static void
-name_lookup_proc (void *cls,
-                  const struct GNUNET_GNSRECORD_Block *block)
-{
-  const char *name = cls;
-
-  ncqe = NULL;
-  GNUNET_assert (NULL != cls);
-
-  if (endbadly_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = NULL;
-  }
-
-  if (NULL == block)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Namestore returned no block\n"));
-    if (endbadly_task != NULL)
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Namecache returned block, decrypting \n");
-  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt (block,
-                                                              &pubkey, name,
-                                                              &rd_decrypt_cb,
-                                                              (void *) name));
-}
-
-static void
-lookup_block (void *cls)
-{
-  const char *name = cls;
-  struct GNUNET_HashCode derived_hash;
-  struct GNUNET_IDENTITY_PublicKey pubkey;
-
-  /* Create derived hash */
-  GNUNET_IDENTITY_key_get_public (&privkey,
-                                  &pubkey);
-  GNUNET_GNSRECORD_query_from_public_key (&pubkey, name, &derived_hash);
-
-  ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
-                                        &name_lookup_proc, cls);
-}
-
-
-
-static void
-put_cont (void *cls, int32_t success, const char *emsg)
-{
-  const char *name = cls;
-
-  nsqe = NULL;
-  GNUNET_assert (NULL != cls);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Name store added record for `%s': %s\n",
-              name,
-              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
-
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &lookup_block, (void *) name);
-}
-
-
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_GNSRECORD_Data rd;
-  const char *name = "dummy";
-
-  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                &endbadly,
-                                                NULL);
-  privkey.type = htonl (GNUNET_GNSRECORD_TYPE_PKEY);
-  GNUNET_CRYPTO_ecdsa_key_create (&privkey.ecdsa_key);
-  GNUNET_IDENTITY_key_get_public (&privkey,
-                                  &pubkey);
-
-  rd.expiration_time = GNUNET_TIME_absolute_get ().abs_value_us + 1000000000;
-  rd.record_type = TEST_RECORD_TYPE;
-  rd.data_size = TEST_RECORD_DATALEN;
-  rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
-  rd.flags = 0;
-  memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
-
-  nsh = GNUNET_NAMESTORE_connect (cfg);
-  nch = GNUNET_NAMECACHE_connect (cfg);
-  GNUNET_break (NULL != nsh);
-  GNUNET_break (NULL != nch);
-  nsqe = GNUNET_NAMESTORE_records_store (nsh,
-                                         &privkey,
-                                         name,
-                                         1,
-                                         &rd,
-                                         &put_cont,
-                                         (void *) name);
-  if (NULL == nsqe)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Namestore cannot store no block\n"));
-  }
-
-  GNUNET_free_nz ((void *) rd.data);
-}
-
-
-#include "test_common.c"
-
-
-int
-main (int argc, char *argv[])
-{
-  const char *plugin_name;
-  char *cfg_name;
-
-  SETUP_CFG (plugin_name, cfg_name);
-  res = 1;
-  if (0 !=
-      GNUNET_TESTING_peer_run ("test-namestore-api",
-                               cfg_name,
-                               &run,
-                               NULL))
-  {
-    res = 1;
-  }
-  GNUNET_DISK_purge_cfg_dir (cfg_name,
-                             "GNUNET_TEST_HOME");
-  GNUNET_free (cfg_name);
-  return res;
-}
-
-
-/* end of test_namestore_api_lookup_public.c */

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.