[taler-anastasis] branch master updated: deleted hash from truth upload

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new d1fea84  deleted hash from truth upload
d1fea84 is described below

commit d1fea8446bf165e8889835bdecba1c286e869ade
Author: Dennis Neufeld <address@hidden>
AuthorDate: Wed Apr 15 15:29:39 2020 +0000

    deleted hash from truth upload
---
 src/include/anastasis_service.h       |  9 +++--
 src/lib/anastasis_api_truth_store.c   | 73 ++---------------------------------
 src/lib/testing_api_cmd_truth_store.c | 57 ++++-----------------------
 3 files changed, 18 insertions(+), 121 deletions(-)

diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index f7a67e0..d7254b5 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -137,7 +137,12 @@ enum ANASTASIS_UploadStatus
   /**
    * Server had an internal error.
    */
-  ANASTASIS_US_SERVER_ERROR = 5
+  ANASTASIS_US_SERVER_ERROR = 5,
+
+  /**
+   * Truth already exists
+   */
+  ANASTASIS_US_CONFLICTING_TRUTH
 };
 
 
@@ -482,8 +487,6 @@ struct ANASTASIS_TruthStoreOperation *
 ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                        const char *backend_url,
                        const uuid_t truth_uuid,
-                       const struct
-                       GNUNET_HashCode *prev_truth_data_hash,
                        json_t *truth_data,
                        int payment_requested,
                        const char *paid_order_id,
diff --git a/src/lib/anastasis_api_truth_store.c 
b/src/lib/anastasis_api_truth_store.c
index dc9abf6..3b8e19d 100644
--- a/src/lib/anastasis_api_truth_store.c
+++ b/src/lib/anastasis_api_truth_store.c
@@ -69,11 +69,6 @@ struct ANASTASIS_TruthStoreOperation
    * Payment URI we received from the service, or NULL.
    */
   char *pay_uri;
-
-  /**
-   * Hash of the data we are uploading.
-   */
-  struct GNUNET_HashCode new_truth_data_hash;
 };
 
 /**
@@ -125,13 +120,11 @@ handle_truth_store_finished (void *cls,
     break;
   case MHD_HTTP_NO_CONTENT:
     ud.us = ANASTASIS_US_SUCCESS;
-    ud.details.curr_backup_hash = &tso->new_truth_data_hash;
     udp = &ud;
     ec = TALER_EC_NONE;
     break;
   case MHD_HTTP_NOT_MODIFIED:
     ud.us = ANASTASIS_US_SUCCESS;
-    ud.details.curr_backup_hash = &tso->new_truth_data_hash;
     udp = &ud;
     ec = TALER_EC_NONE;
     break;
@@ -152,10 +145,7 @@ handle_truth_store_finished (void *cls,
                                      data_size);
     break;
   case MHD_HTTP_CONFLICT:
-    ud.us = ANASTASIS_US_CONFLICTING_POLICY;
-    GNUNET_CRYPTO_hash (data,
-                        data_size,
-                        &ud.details.recovered_backup.existing_backup_hash);
+    ud.us = ANASTASIS_US_CONFLICTING_TRUTH;
     ud.details.recovered_backup.existing_backup_size
       = data_size;
     ud.details.recovered_backup.existing_backup
@@ -178,6 +168,8 @@ handle_truth_store_finished (void *cls,
     ec = TALER_JSON_get_error_code2 (data,
                                      data_size);
     break;
+  default:
+    break;
   }
   if (NULL != tso->cb)
   {
@@ -272,8 +264,6 @@ struct ANASTASIS_TruthStoreOperation *
 ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                        const char *backend_url,
                        const uuid_t truth_uuid,
-                       const struct
-                       GNUNET_HashCode *prev_truth_data_hash,
                        json_t *truth_data,
                        int payment_requested,
                        const char *paid_order_id,
@@ -282,67 +272,13 @@ ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
 {
   struct ANASTASIS_TruthStoreOperation *tso;
   CURL *eh;
-  struct curl_slist *job_headers;
-  struct GNUNET_HashCode new_truth_data_hash;
   char *json_str;
 
   json_str = json_dumps (truth_data,
                          JSON_COMPACT);
 
-  /* setup our HTTP headers */
-  job_headers = NULL;
-  {
-    struct curl_slist *ext;
-    char *val;
-    char *hdr;
-
-    GNUNET_CRYPTO_hash (truth_data,
-                        sizeof(truth_data),
-                        &new_truth_data_hash);
-
-    /* set Etag header */
-    val = GNUNET_STRINGS_data_to_string_alloc (&new_truth_data_hash,
-                                               sizeof (struct 
GNUNET_HashCode));
-    GNUNET_asprintf (&hdr,
-                     "Etag: %s",
-                     val);
-    GNUNET_free (val);
-    ext = curl_slist_append (job_headers,
-                             hdr);
-    GNUNET_free (hdr);
-    if (NULL == ext)
-    {
-      GNUNET_break (0);
-      curl_slist_free_all (job_headers);
-      return NULL;
-    }
-    job_headers = ext;
-
-    /* Setup If-Match header */
-    if (NULL != prev_truth_data_hash)
-    {
-      val = GNUNET_STRINGS_data_to_string_alloc (prev_truth_data_hash,
-                                                 sizeof (struct
-                                                         GNUNET_HashCode));
-      GNUNET_asprintf (&hdr,
-                       "If-Match: %s",
-                       val);
-      GNUNET_free (val);
-      ext = curl_slist_append (job_headers,
-                               hdr);
-      GNUNET_free (hdr);
-      if (NULL == ext)
-      {
-        GNUNET_break (0);
-        curl_slist_free_all (job_headers);
-        return NULL;
-      }
-      job_headers = ext;
-    }
-  }
   /* Finished setting up headers */
   tso = GNUNET_new (struct ANASTASIS_TruthStoreOperation);
-  tso->new_truth_data_hash = new_truth_data_hash;
   {
     if (NULL != truth_uuid)
     {
@@ -406,9 +342,8 @@ ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                                    tso));
   tso->job = GNUNET_CURL_job_add_raw (ctx,
                                       eh,
-                                      job_headers,
+                                      GNUNET_NO,
                                       &handle_truth_store_finished,
                                       tso);
-  curl_slist_free_all (job_headers);
   return tso;
 }
diff --git a/src/lib/testing_api_cmd_truth_store.c 
b/src/lib/testing_api_cmd_truth_store.c
index 108a3b9..11c44ac 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -45,13 +45,6 @@ struct TruthStoreState
    */
   unsigned int http_status;
 
-  /**
-   * Hash of the previous upload (maybe bogus if
-   * #ANASTASIS_TESTING_UO_PREV_HASH_WRONG is set in @e uo).
-   * Maybe all zeros if there was no previous upload.
-   */
-  struct GNUNET_HashCode prev_hash;
-
   const uuid_t truth_uuid;
 
   /**
@@ -183,27 +176,11 @@ truth_store_cb (void *cls,
                 sizeof (struct GNUNET_HashCode));
       }
       break;
-    case ANASTASIS_US_CONFLICTING_POLICY:
+    case ANASTASIS_US_CONFLICTING_TRUTH:
       {
-        const struct TALER_TESTING_Command *ref;
-        const struct GNUNET_HashCode *h;
-
-        ref = TALER_TESTING_interpreter_lookup_command
-                (tss->is,
-                tss->last_upload);
-        GNUNET_assert (NULL != ref);
-        GNUNET_assert (GNUNET_OK ==
-                       ANASTASIS_TESTING_get_trait_hash (ref,
-                                                         
ANASTASIS_TESTING_TRAIT_HASH_CURRENT,
-                                                         &h));
-        if (0 != GNUNET_memcmp (h,
-                                &ud->details.recovered_backup.
-                                existing_backup_hash))
-        {
-          GNUNET_break (0);
-          TALER_TESTING_interpreter_fail (tss->is);
-          return;
-        }
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (tss->is);
+        return;
       }
     case ANASTASIS_US_HTTP_ERROR:
       break;
@@ -215,6 +192,10 @@ truth_store_cb (void *cls,
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (tss->is);
       return;
+    default:
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (tss->is);
+      return;
     }
   }
   TALER_TESTING_interpreter_next (tss->is);
@@ -248,20 +229,6 @@ truth_store_run (void *cls,
       TALER_TESTING_interpreter_fail (tss->is);
       return;
     }
-    {
-      const struct GNUNET_HashCode *h;
-
-      if (GNUNET_OK !=
-          ANASTASIS_TESTING_get_trait_hash (ref,
-                                            
ANASTASIS_TESTING_TRAIT_HASH_CURRENT,
-                                            &h))
-      {
-        GNUNET_break (0);
-        TALER_TESTING_interpreter_fail (tss->is);
-        return;
-      }
-      tss->prev_hash = *h;
-    }
     if (0 != (ANASTASIS_TESTING_TSO_REFERENCE_ORDER_ID & tss->tsopt))
     {
       {
@@ -292,14 +259,6 @@ truth_store_run (void *cls,
   tss->tso = ANASTASIS_truth_store (is->ctx,
                                     tss->anastasis_url,
                                     truth_uuid,
-                                    ( ( (NULL != tss->prev_upload) &&
-                                        (0 != GNUNET_is_zero (
-                                           &tss->prev_hash)) ) ||
-                                      (0 !=
-                                       (ANASTASIS_TESTING_TSO_PREV_HASH_WRONG
-                                        & tss->tsopt)) )
-                                    ? &tss->prev_hash
-                                    : NULL,
                                     tss->truth_data,
                                     (0 !=
                                      (ANASTASIS_TESTING_TSO_REQUEST_PAYMENT

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