fix

[oweals/gnunet.git] / src / fs / test_fs_namespace.c

diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index a7ccbeccf50955341c8e70f6f3f35cc330cc2e5e..b154ce7993368152fae5f02d976c00131a1c0d3c 100644 (file)
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -31,7 +31,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_fs_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 
@@ -77,7 +77,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
 }
 
 
@@ -106,7 +105,6 @@ abort_ksk_search_task (void *cls,
       ksk_search = NULL;
       if (sks_search == NULL)
        {
-         fprintf (stderr, "initiating shutdown\n");
          GNUNET_FS_stop (fs);
        }
     }
@@ -128,7 +126,6 @@ abort_sks_search_task (void *cls,
   GNUNET_assert (GNUNET_OK == GNUNET_FS_namespace_delete (ns, GNUNET_YES));
   if (ksk_search == NULL)
     {
-      fprintf (stderr, "initiating shutdown\n");
       GNUNET_FS_stop (fs);
     }    
 }
@@ -143,8 +140,6 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_SEARCH_RESULT:
       if (sks_search == event->value.search.sc)
        {
-         fprintf (stderr,
-                  "Search result for sks received\n");
          if (! GNUNET_FS_uri_test_equal (sks_expect_uri,
                                          event->value.search.specifics.result.uri))
            {
@@ -160,8 +155,6 @@ progress_cb (void *cls,
        }
       else if (ksk_search == event->value.search.sc)
        {
-         fprintf (stderr,
-                  "Search result for ksk received\n");
          if (! GNUNET_FS_uri_test_equal (ksk_expect_uri,
                                          event->value.search.specifics.result.uri))
            {
@@ -177,7 +170,7 @@ progress_cb (void *cls,
       else 
        {
          fprintf (stderr,
-                  "Search result received!?\n");
+                  "Unexpected search result received!\n");
          GNUNET_break (0);
        }
       break;
@@ -199,9 +192,6 @@ progress_cb (void *cls,
        GNUNET_break (0);
       break;
     case GNUNET_FS_STATUS_SEARCH_START:
-      fprintf (stderr,
-              "Search start event for `%s' received\n",
-              (const char*) event->value.search.cctx);
       GNUNET_assert ( (NULL == event->value.search.cctx) ||
                      (0 == strcmp ("sks_search", event->value.search.cctx)) ||
                      (0 == strcmp ("ksk_search", event->value.search.cctx)));
@@ -215,8 +205,6 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
       return NULL;
     case GNUNET_FS_STATUS_SEARCH_STOPPED:
-      fprintf (stderr,
-              "Search stop event received\n");
       return NULL;
     default:
       fprintf (stderr,
@@ -259,12 +247,11 @@ publish_cont (void *cls,
               msg);
       err = 1;
       GNUNET_FS_stop (fs);
+      GNUNET_free (msg);
       return;
     }
-  fprintf (stderr, "Starting keyword search...\n");
-  ksk_search = GNUNET_FS_search_start (fs, ksk_uri, 1, "ksk_search");
-  fprintf (stderr, "Starting namespace search...\n") ;
-  sks_search = GNUNET_FS_search_start (fs, sks_uri, 1, "sks_search");
+  ksk_search = GNUNET_FS_search_start (fs, ksk_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE, "ksk_search");
+  sks_search = GNUNET_FS_search_start (fs, sks_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE, "sks_search");
   GNUNET_FS_uri_destroy (sks_uri);
 }
 
@@ -284,7 +271,6 @@ sks_cont (void *cls,
   msg = NULL;
   ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg);
   GNUNET_assert (NULL == msg);
-  fprintf (stderr, "Advertising update 'this' namespace entry under keyword...\n");
   ksk_expect_uri = GNUNET_FS_uri_dup (uri);
   GNUNET_FS_publish_ksk (fs,
                         ksk_uri,
@@ -302,8 +288,8 @@ sks_cont (void *cls,
 
 static void
 adv_cont (void *cls,
-             const struct GNUNET_FS_Uri *uri,
-             const char *emsg)
+         const struct GNUNET_FS_Uri *uri,
+         const char *emsg)
 {
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_FS_Namespace *ns;
@@ -321,7 +307,6 @@ adv_cont (void *cls,
                                   "testNamespace");
   meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_assert (NULL == emsg);
-  fprintf (stderr, "Advertising update 'this->next' namespace update...\n");
   sks_expect_uri = GNUNET_FS_uri_dup (uri);
   GNUNET_FS_publish_sks (fs,
                         ns,
@@ -360,6 +345,7 @@ testNamespace ()
   struct GNUNET_FS_Namespace *ns;
   struct GNUNET_TIME_Absolute expiration;
   struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_Uri *ksk_uri;
   int ok;
 
   ns = GNUNET_FS_namespace_create (fs,
@@ -374,16 +360,18 @@ testNamespace ()
       err = 1;
       return;
     }
-  fprintf (stderr, "Advertising namespace root...\n");
   expiration = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
   meta = GNUNET_CONTAINER_meta_data_create ();
+  ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL);
   GNUNET_FS_namespace_advertise (fs,
+                                ksk_uri,
                                 ns,
                                 meta,
                                 1, 1,
                                 expiration,                                       
                                 "root",
                                 &adv_cont, NULL);
+  GNUNET_FS_uri_destroy (ksk_uri);
   GNUNET_FS_namespace_delete (ns, GNUNET_NO);
   GNUNET_CONTAINER_meta_data_destroy (meta);
 }