RECLAIM/OIDC: code cleanup

[oweals/gnunet.git] / src / hostlist / test_gnunet_daemon_hostlist_learning.c

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 041898abd91d1554d36f360e91b9de72f428959c..f9221567978db63d8a7e5f1ccf68e2551f9501b4 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -2,20 +2,20 @@
      This file is part of GNUnet
      Copyright (C) 2009, 2010, 2011, 2012, 2016 GNUnet e.V.
 
-     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 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
-     General Public License for more details.
+     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/>.
 
-     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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -125,12 +125,12 @@ shutdown_testcase ()
   }
   if (NULL != adv_peer.core)
   {
-    GNUNET_CORE_disconnecT (adv_peer.core);
+    GNUNET_CORE_disconnect (adv_peer.core);
     adv_peer.core = NULL;
   }
   if (NULL != learn_peer.core)
   {
-    GNUNET_CORE_disconnecT (learn_peer.core);
+    GNUNET_CORE_disconnect (learn_peer.core);
     learn_peer.core = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -394,11 +394,11 @@ static void
 setup_learn_peer (struct PeerContext *p,
                  const char *cfgname)
 {
-  GNUNET_MQ_hd_var_size (ad_arrive,
-                        GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
-                        struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler learn_handlers[] = {
-    make_ad_arrive_handler (NULL),
+    GNUNET_MQ_hd_var_size (ad_arrive,
+                           GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
+                           struct GNUNET_MessageHeader,
+                           NULL),
     GNUNET_MQ_handler_end ()
   };
   char *filename;
@@ -432,7 +432,7 @@ setup_learn_peer (struct PeerContext *p,
     }
     GNUNET_free (filename);
   }
-  p->core = GNUNET_CORE_connecT (p->cfg,
+  p->core = GNUNET_CORE_connect (p->cfg,
                                 NULL,
                                 NULL,
                                 NULL,
@@ -562,21 +562,18 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_purge_cfg_dir ("test_learning_learn_peer.conf",
+                             "GNUNET_TEST_HOME");
+  GNUNET_DISK_purge_cfg_dir ("test_learning_adv_peer.conf",
+                             "GNUNET_TEST_HOME");
   GNUNET_log_setup ("test-gnunet-daemon-hostlist",
                     "WARNING",
                     NULL);
-#if !WINDOWS
-  system ("gnunet-peerinfo -s -c test_learning_adv_peer.conf > /dev/null");
-  system ("gnunet-peerinfo -s -c test_learning_learn_peer.conf > /dev/null");
-#else
-  system ("gnunet-peerinfo -s -c test_learning_adv_peer.conf > NUL");
-  system ("gnunet-peerinfo -s -c test_learning_learn_peer.conf > NUL");
-#endif
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_purge_cfg_dir ("test_learning_learn_peer.conf",
+                             "GNUNET_TEST_HOME");
+  GNUNET_DISK_purge_cfg_dir ("test_learning_adv_peer.conf",
+                             "GNUNET_TEST_HOME");
   if (GNUNET_YES ==
       GNUNET_DISK_file_test ("hostlists_learn_peer.file"))
   {