[taler-anastasis] 12/12: worked on fixing uuid issue... still something wrong

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 5234d692b185499f2c5b46dabcfe71bde1a28899
Author: Dennis Neufeld <address@hidden>
AuthorDate: Mon Apr 20 07:27:56 2020 +0000

    worked on fixing uuid issue... still something wrong
---
 src/include/anastasis_service.h           |  2 +-
 src/lib/anastasis.c                       |  2 +-
 src/lib/anastasis_api_keyshare_lookup.c   |  9 +++++++++
 src/lib/anastasis_api_truth_store.c       |  4 ++--
 src/lib/testing_api_cmd_keyshare_lookup.c | 29 ++++++++++++++++++++++-------
 src/lib/testing_api_cmd_truth_store.c     | 26 +++++++++++++++++++-------
 6 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index b10e145..d20ffb9 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -523,7 +523,7 @@ typedef void
 struct ANASTASIS_TruthStoreOperation *
 ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                        const char *backend_url,
-                       const uuid_t truth_uuid,
+                       const uuid_t *truth_uuid,
                        json_t *truth_data,
                        int payment_requested,
                        const char *paid_order_id,
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 5d126fb..1f74d5d 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -625,7 +625,7 @@ ANASTASIS_truth_upload (const json_t *id_data,
 
   tu->tso = ANASTASIS_truth_store (tu->ctx,
                                    t->url,
-                                   t->uuid,
+                                   &t->uuid,
                                    truth,
                                    tu->payment_requested,
                                    tu->paid_order_id,
diff --git a/src/lib/anastasis_api_keyshare_lookup.c 
b/src/lib/anastasis_api_keyshare_lookup.c
index 86ad620..a8e4fa3 100644
--- a/src/lib/anastasis_api_keyshare_lookup.c
+++ b/src/lib/anastasis_api_keyshare_lookup.c
@@ -259,8 +259,14 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context *ctx,
   kslo->cb = cb;
   kslo->cb_cls = cb_cls;
   kslo->truth_key = truth_key;
+
+  GNUNET_assert (NULL != truth_uuid);
   uuid_str = GNUNET_STRINGS_data_to_string_alloc (truth_uuid,
                                                   sizeof (*truth_uuid));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "UUID in keyshare lookup:  %s\n",
+              uuid_str);
+  GNUNET_assert (NULL != hashed_answer);
   hashed_answer_str = GNUNET_STRINGS_data_to_string_alloc (hashed_answer,
                                                            sizeof (struct
                                                                    
GNUNET_HashCode));
@@ -275,6 +281,9 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context *ctx,
   GNUNET_free (path);
   GNUNET_free (uuid_str);
   GNUNET_free (hashed_answer_str);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Url get request (keyshare lookup): %s\n",
+              kslo->url);
   eh = curl_easy_init ();
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
diff --git a/src/lib/anastasis_api_truth_store.c 
b/src/lib/anastasis_api_truth_store.c
index a54e7c8..7552364 100644
--- a/src/lib/anastasis_api_truth_store.c
+++ b/src/lib/anastasis_api_truth_store.c
@@ -259,7 +259,7 @@ handle_header (char *buffer,
 struct ANASTASIS_TruthStoreOperation *
 ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                        const char *backend_url,
-                       const uuid_t truth_uuid,
+                       const uuid_t *truth_uuid,
                        json_t *truth_data,
                        int payment_requested,
                        const char *paid_order_id,
@@ -284,7 +284,7 @@ ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
       char uuid_str[37];
       char *path;
 
-      uuid_unparse (truth_uuid, uuid_str);
+      uuid_unparse (*truth_uuid, uuid_str);
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "UUID:  %s\n",
                   uuid_str);
diff --git a/src/lib/testing_api_cmd_keyshare_lookup.c 
b/src/lib/testing_api_cmd_keyshare_lookup.c
index e39e280..c98f677 100644
--- a/src/lib/testing_api_cmd_keyshare_lookup.c
+++ b/src/lib/testing_api_cmd_keyshare_lookup.c
@@ -131,14 +131,29 @@ keyshare_lookup_run (void *cls,
       TALER_TESTING_interpreter_fail (ksls->is);
       return;
     }
-    if (GNUNET_OK !=
-        ANASTASIS_TESTING_get_trait_uuid (upload_cmd,
-                                          0,
-                                          &ksls->truth_uuid))
     {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (ksls->is);
-      return;
+      const uuid_t *uuid;
+
+      if (GNUNET_OK !=
+          ANASTASIS_TESTING_get_trait_uuid (upload_cmd,
+                                            0,
+                                            &uuid))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ksls->is);
+        return;
+      }
+      ksls->truth_uuid = uuid;
+      if (NULL == ksls->truth_uuid)
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ksls->is);
+        return;
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Uuid from trait: %s\n",
+                  TALER_B2S (ksls->truth_uuid));
+
     }
   }
   ksls->kslo = ANASTASIS_keyshare_lookup (is->ctx,
diff --git a/src/lib/testing_api_cmd_truth_store.c 
b/src/lib/testing_api_cmd_truth_store.c
index 66cd376..7b26375 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -30,7 +30,6 @@
  */
 struct TruthStoreState
 {
-
   /**
    * The policy data.
    */
@@ -41,7 +40,10 @@ struct TruthStoreState
    */
   unsigned int http_status;
 
-  const uuid_t truth_uuid;
+  /**
+   * Uuid of truth
+   */
+  const uuid_t *truth_uuid;
 
   /**
    * Hash of the current upload.
@@ -252,12 +254,22 @@ truth_store_run (void *cls,
       }
     }
   }
-  // Create an uuid
-  uuid_t truth_uuid;
-  uuid_generate (truth_uuid);
+  {
+    // Create an uuid
+    uuid_t truth_uuid;
+    uuid_generate (truth_uuid);
+    tss->truth_uuid = &truth_uuid;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Uuid created: %s\n",
+                TALER_B2S (&truth_uuid));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Uuid stored in tss: %s\n",
+                TALER_B2S (tss->truth_uuid));
+  }
+
   tss->tso = ANASTASIS_truth_store (is->ctx,
                                     tss->anastasis_url,
-                                    truth_uuid,
+                                    tss->truth_uuid,
                                     tss->truth_data,
                                     (0 !=
                                      (ANASTASIS_TESTING_TSO_REQUEST_PAYMENT
@@ -321,7 +333,7 @@ truth_store_traits (void *cls,
     ANASTASIS_TESTING_make_trait_hash (ANASTASIS_TESTING_TRAIT_HASH_CURRENT,
                                        &tss->curr_hash),
     ANASTASIS_TESTING_make_trait_uuid (0,
-                                       &tss->truth_uuid),
+                                       tss->truth_uuid),
     TALER_TESTING_make_trait_order_id (0,
                                        tss->payment_order_id),
     TALER_TESTING_trait_end ()

-- 
To stop receiving notification emails like this one, please contact
address@hidden.