migrate peerstore to new service MQ API

1 files changed, 40 insertions, 13 deletions

diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c
index 91902ba9e..1c9995c31 100644
--- a/src/peerstore/test_peerstore_api_watch.c
+++ b/src/peerstore/test_peerstore_api_watch.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C)
+     Copyright (C) 2013-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
@@ -26,47 +26,74 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
 
+
 static int ok = 1;
 
 static struct GNUNET_PEERSTORE_Handle *h;
 
 static char *ss = "test_peerstore_api_watch";
-static struct GNUNET_PeerIdentity p;
+
 static char *k = "test_peerstore_api_watch_key";
+
 static char *val = "test_peerstore_api_watch_val";
 
+
 static void
-watch_cb (void *cls, const struct GNUNET_PEERSTORE_Record *record,
+watch_cb (void *cls,
+          const struct GNUNET_PEERSTORE_Record *record,
           const char *emsg)
 {
   GNUNET_assert (NULL == emsg);
-  GNUNET_assert (0 == strcmp (val, (char *) record->value));
+  GNUNET_assert (0 == strcmp (val,
+                              (char *) record->value));
   ok = 0;
-  GNUNET_PEERSTORE_disconnect (h, GNUNET_NO);
+  GNUNET_PEERSTORE_disconnect (h,
+                               GNUNET_NO);
   GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
+  struct GNUNET_PeerIdentity p;
+
   h = GNUNET_PEERSTORE_connect (cfg);
   GNUNET_assert (NULL != h);
-  memset (&p, 4, sizeof (p));
-  GNUNET_PEERSTORE_watch (h, ss, &p, k, &watch_cb, NULL);
-  GNUNET_PEERSTORE_store (h, ss, &p, k, val, strlen (val) + 1,
+  memset (&p,
+          4,
+          sizeof (p));
+  GNUNET_PEERSTORE_watch (h,
+                          ss,
+                          &p,
+                          k,
+                          &watch_cb,
+                          NULL);
+  GNUNET_PEERSTORE_store (h,
+                          ss,
+                          &p,
+                          k,
+                          val,
+                          strlen (val) + 1,
                           GNUNET_TIME_UNIT_FOREVER_ABS,
-                          GNUNET_PEERSTORE_STOREOPTION_REPLACE, NULL, NULL);
+                          GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+                          NULL,
+                          NULL);
 }
 
 
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   if (0 !=
-      GNUNET_TESTING_service_run ("test-gnunet-peerstore", "peerstore",
-                                  "test_peerstore_api_data.conf", &run, NULL))
+      GNUNET_TESTING_service_run ("test-gnunet-peerstore",
+                                  "peerstore",
+                                  "test_peerstore_api_data.conf",
+                                  &run,
+                                  NULL))
     return 1;
   return ok;
 }