fixes

3 files changed, 17 insertions, 26 deletions

diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index a8f092121..3e179e5d9 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -48,7 +48,6 @@ struct PeerContext
   struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
-  struct GNUNET_ARM_Handle *arm;
 #if START_ARM
   pid_t arm_pid;
 #endif
@@ -145,7 +144,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);
   p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, p, NULL, 
                                     &notify_connect, NULL);
   GNUNET_assert (p->th != NULL);
@@ -174,35 +172,16 @@ waitpid_task (void *cls,
 
 
 static void
-stop_cb (void *cls, 
-         int success)
+stop_arm (struct PeerContext *p)
 {
-  struct PeerContext *p = cls;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              success 
-              ? "ARM stopped core service\n" 
-              : "ARM failed to stop core service\n");
-  GNUNET_ARM_disconnect (p->arm);
-  p->arm = NULL;
-  /* make sure this runs after all other tasks are done */
+              "Asking ARM to stop core service\n");
   GNUNET_SCHEDULER_add_delayed (sched,
                                 GNUNET_TIME_UNIT_SECONDS,
                                 &waitpid_task, p);
 }
 
 
-static void
-stop_arm (struct PeerContext *p)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking ARM to stop core service\n");
-  p->arm = GNUNET_ARM_connect (p->cfg, sched, NULL);
-  GNUNET_ARM_stop_service (p->arm, "core", GNUNET_TIME_UNIT_SECONDS,
-                           &stop_cb, p);
-}
-
-
 /**
  * Try again to connect to transport service.
  */
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 31aac4bdf..2a46763bf 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -13,7 +13,7 @@ DEBUG = NO
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = resolver transport core statistics topology
+DEFAULTSERVICES = hostlist topology
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 
 [statistics]
@@ -47,4 +47,10 @@ DEBUG = NO
 [topology]
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
-DEBUG = NO
\ No newline at end of file
+DEBUG = NO
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO[fs]
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index f23488dfd..c256c2829 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -13,7 +13,7 @@ DEBUG = NO
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = resolver transport core statistics topology
+DEFAULTSERVICES = hostlist topology
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 DEBUG = NO
 
@@ -47,3 +47,9 @@ HOSTLISTFILE = hostlists_peer2.file
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
 DEBUG = NO
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
\ No newline at end of file