-options to play with

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

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index f1f2084f9f07665ff3a471c4da427aa7e9a1e748..5165934f07661615e7b9e634623452839a9dedbc 100644 (file)
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -52,6 +52,8 @@ static int ok;
 
 static struct GNUNET_TIME_Absolute start_time;
 
+static struct GNUNET_TESTBED_Operation *op;
+
 
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -88,6 +90,8 @@ do_download (void *cls,
 {
   struct GNUNET_FS_Uri *uri = cls;
 
+  GNUNET_TESTBED_operation_done (op);
+  op = NULL;
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -112,7 +116,8 @@ stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_FS_Uri *uri = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
-  GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+  op = GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+  GNUNET_assert (NULL != op);
 }
 
 
@@ -137,27 +142,6 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
 
 static void
 do_publish (void *cls, 
-           struct GNUNET_TESTBED_Operation *op,
-           const char *emsg)
-{
-  if (NULL != emsg)
-  {
-    GNUNET_SCHEDULER_shutdown ();
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error connecting peers: %s\n",
-               emsg);
-    ok = 1;
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
-              (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
-                          VERBOSE, &do_wait, NULL);
-}
-
-
-static void
-do_connect (void *cls, 
            unsigned int num_peers,
            struct GNUNET_TESTBED_Peer **peers)
 {
@@ -166,11 +150,10 @@ do_connect (void *cls,
   GNUNET_assert (2 == num_peers);
   for (i=0;i<num_peers;i++)
     daemons[i] = peers[i];
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Daemons started, will now try to connect them\n");
-  GNUNET_TESTBED_overlay_connect (NULL,
-                                 &do_publish, NULL,
-                                 daemons[0], daemons[1]);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
+                          VERBOSE, &do_wait, NULL);
 }
 
 
@@ -181,7 +164,7 @@ main (int argc, char *argv[])
                           "fs_test_lib_data.conf",
                           2,
                           0, NULL, NULL,
-                          &do_connect,
+                          &do_publish,
                           NULL);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
   return ok;