From 5abbc294229cca582d0b104b86be534de2be66ea Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <schanzen@gnunet.org>
Date: Mon, 5 Dec 2022 17:46:59 +0900
Subject: -fix test ftbfs

---
 src/util/test_bio.c         | 31 -------------------------------
 src/util/test_crypto_hkdf.c |  2 +-
 src/util/test_crypto_kdf.c  |  2 +-
 src/util/test_hexcoder.c    |  1 -
 4 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'src/util')

diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index f655f8924..0b76bbb43 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -46,19 +46,14 @@ test_normal_rw (void)
   int64_t wNum = TESTNUMBER64;
   int64_t rNum = 0;
 
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
-
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_string ("test-normal-rw-string", TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-normal-rw-metadata", mdW),
     GNUNET_BIO_write_spec_int64 ("test-normal-rw-int64", &wNum),
     GNUNET_BIO_write_spec_end (),
   };
 
   struct GNUNET_BIO_ReadSpec rs[] = {
     GNUNET_BIO_read_spec_string ("test-normal-rw-string", &rString, 200),
-    GNUNET_BIO_read_spec_meta_data ("test-normal-rw-metadata", &mdR),
     GNUNET_BIO_read_spec_int64 ("test-normal-rw-int64", &rNum),
     GNUNET_BIO_read_spec_end (),
   };
@@ -74,11 +69,8 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
   GNUNET_free (filename);
 
@@ -98,14 +90,10 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
   GNUNET_free (buffer);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdW);
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   return 0;
 }
 
@@ -225,10 +213,6 @@ test_bigmeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-bigmeta-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
@@ -294,17 +278,12 @@ test_fullfile_rw (void)
   struct GNUNET_CONTAINER_MetaData *mdW;
   struct GNUNET_CONTAINER_MetaData *mdR = NULL;
 
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
-
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_object ("test-fullfile-rw-bytes",
                                   TESTSTRING,
                                   strlen (TESTSTRING)),
     GNUNET_BIO_write_spec_string ("test-fullfile-rw-string",
                                   TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-fullfile-rw-metadata",
-                                     mdW),
     GNUNET_BIO_write_spec_end (),
   };
 
@@ -315,8 +294,6 @@ test_fullfile_rw (void)
     GNUNET_BIO_read_spec_string ("test-fullfile-rw-string",
                                  &rString,
                                  200),
-    GNUNET_BIO_read_spec_meta_data ("test-fullfile-rw-metadata",
-                                    &mdR),
     GNUNET_BIO_read_spec_end (),
   };
 
@@ -385,10 +362,6 @@ test_fakemeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakestring-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
@@ -417,10 +390,6 @@ test_fakebigmeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakebigmeta-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
diff --git a/src/util/test_crypto_hkdf.c b/src/util/test_crypto_hkdf.c
index b9742468d..a9a4db7a0 100644
--- a/src/util/test_crypto_hkdf.c
+++ b/src/util/test_crypto_hkdf.c
@@ -31,7 +31,7 @@
 #include <gcrypt.h>
 
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 void
 tc1 ()
diff --git a/src/util/test_crypto_kdf.c b/src/util/test_crypto_kdf.c
index 583b1bf30..81e4b4451 100644
--- a/src/util/test_crypto_kdf.c
+++ b/src/util/test_crypto_kdf.c
@@ -30,7 +30,7 @@
 #include <gcrypt.h>
 
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 
 int
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
index 7861d3aa0..e04631188 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -27,7 +27,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TESTSTRING "Hello World!"
 
-- 
cgit v1.2.3