[GNUnet-SVN] r29743 - gnunet/src/peerinfo

[gnunet]

Author: grothoff
Date: 2013-10-01 08:52:03 +0200 (Tue, 01 Oct 2013)
New Revision: 29743

Modified:
   gnunet/src/peerinfo/perf_peerinfo_api.c
   gnunet/src/peerinfo/test_peerinfo_api.c
   gnunet/src/peerinfo/test_peerinfo_api_friend_only.c
   gnunet/src/peerinfo/test_peerinfo_api_notify_friend_only.c
Log:
-fix test FTBFS

Modified: gnunet/src/peerinfo/perf_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/perf_peerinfo_api.c     2013-10-01 06:47:47 UTC (rev 
29742)
+++ gnunet/src/peerinfo/perf_peerinfo_api.c     2013-10-01 06:52:03 UTC (rev 
29743)
@@ -82,12 +82,10 @@
 static void
 add_peer (size_t i)
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_HELLO_Message *h2;
 
-  memset (&pkey, i, sizeof (pkey));
-  GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
-  h2 = GNUNET_HELLO_create (&pkey, &address_generator, &i, GNUNET_NO);
+  memset (&pid, i, sizeof (pid));
+  h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &i, 
GNUNET_NO);
   GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
   GNUNET_free (h2);
 }

Modified: gnunet/src/peerinfo/test_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api.c     2013-10-01 06:47:47 UTC (rev 
29742)
+++ gnunet/src/peerinfo/test_peerinfo_api.c     2013-10-01 06:52:03 UTC (rev 
29743)
@@ -86,14 +86,12 @@
 static void
 add_peer ()
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_HELLO_Message *h2;
   size_t agc;
 
   agc = 2;
-  memset (&pkey, 32, sizeof (pkey));
-  GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
-  h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc, GNUNET_NO);
+  memset (&pid, 32, sizeof (pid));
+  h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc, 
GNUNET_NO);
   GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
   GNUNET_free (h2);
 

Modified: gnunet/src/peerinfo/test_peerinfo_api_friend_only.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api_friend_only.c 2013-10-01 06:47:47 UTC 
(rev 29742)
+++ gnunet/src/peerinfo/test_peerinfo_api_friend_only.c 2013-10-01 06:52:03 UTC 
(rev 29743)
@@ -68,14 +68,12 @@
 static void
 add_peer ()
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_HELLO_Message *h2;
   size_t agc;
 
   agc = 2;
-  memset (&pkey, 32, sizeof (pkey));
-  GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
-  h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc, GNUNET_YES);
+  memset (&pid, 32, sizeof (pid));
+  h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc, 
GNUNET_YES);
   GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
   GNUNET_free (h2);
 

Modified: gnunet/src/peerinfo/test_peerinfo_api_notify_friend_only.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api_notify_friend_only.c  2013-10-01 
06:47:47 UTC (rev 29742)
+++ gnunet/src/peerinfo/test_peerinfo_api_notify_friend_only.c  2013-10-01 
06:52:03 UTC (rev 29743)
@@ -227,14 +227,12 @@
 static void
 add_peer ()
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   struct GNUNET_HELLO_Message *h2;
   size_t agc;
 
   agc = 2;
-  memset (&pkey, 32, sizeof (pkey));
-  GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
-  h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc, GNUNET_YES);
+  memset (&pid, 32, sizeof (pid));
+  h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc, 
GNUNET_YES);
   GNUNET_PEERINFO_add_peer (h, h2, &add_peer_done, NULL);
   GNUNET_free (h2);