From d354d119db7ca0195cb93140bf3160b11449fa92 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 25 Aug 2020 20:32:36 +0200
Subject: fix #6432

---
 .../taler-merchant-httpd_private-post-transfers.c       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/backend/taler-merchant-httpd_private-post-transfers.c')

diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 45b67426..34c32d16 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -308,7 +308,8 @@ check_transfer (void *cls,
           "code",
           (json_int_t) TALER_EC_POST_TRANSFERS_CONFLICTING_REPORTS,
           "hint",
-          "disagreement about deposit valuation",
+          TALER_ErrorCode_get_hint (
+            TALER_EC_POST_TRANSFERS_CONFLICTING_REPORTS),
           "exchange_url",
           exchange_url,
           "deposit_timestamp",
@@ -404,7 +405,8 @@ check_wire_fee (struct PostTransfersContext *ptc,
     TALER_MHD_make_json_pack (
       "{s:I, s:s, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
       "code", (json_int_t) TALER_EC_POST_TRANSFERS_JSON_BAD_WIRE_FEE,
-      "hint", "exchange provided conflicting wire fee information",
+      "hint",
+      TALER_ErrorCode_get_hint (TALER_EC_POST_TRANSFERS_JSON_BAD_WIRE_FEE),
       "wire_fee", TALER_JSON_from_amount (wire_fee),
       "execution_time", GNUNET_JSON_from_time_abs (execution_time),
       "expected_wire_fee", TALER_JSON_from_amount (&expected_fee),
@@ -547,7 +549,8 @@ process_transfer_with_exchange (void *cls,
         (NULL != hr->reply)
         ? "{s:s, s:I, s:I, s:I, s:O}"
         : "{s:s, s:I, s:I, s:I}",
-        "hint", "failed to obtain meta-data from exchange",
+        "hint", TALER_ErrorCode_get_hint (
+          TALER_EC_POST_TRANSFERS_EXCHANGE_KEYS_FAILURE),
         "code", (json_int_t) TALER_EC_POST_TRANSFERS_EXCHANGE_KEYS_FAILURE,
         "exchange_http_status", (json_int_t) hr->http_status,
         "exchange_code", (json_int_t) hr->ec,
@@ -923,7 +926,7 @@ queue:
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
                                          TALER_EC_POST_TRANSFERS_DB_LOOKUP_ERROR,
-                                         "Failed to query database about transfer details");
+                                         NULL);
     }
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
       goto fetch;
@@ -978,7 +981,7 @@ queue:
         return TALER_MHD_reply_with_error (connection,
                                            MHD_HTTP_INTERNAL_SERVER_ERROR,
                                            TALER_EC_POST_TRANSFERS_DB_LOOKUP_ERROR,
-                                           "Failed to query database about transfer details");
+                                           NULL);
       }
 
       deposit_sums = json_array ();
@@ -1017,7 +1020,7 @@ fetch:
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
                                        TALER_EC_POST_TRANSFERS_DB_STORE_ERROR,
-                                       "Fail to update database with transfer record");
+                                       NULL);
   }
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
   {
@@ -1034,7 +1037,7 @@ fetch:
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_NOT_FOUND,
                                          TALER_EC_POST_TRANSFERS_ACCOUNT_NOT_FOUND,
-                                         "Instance does not have this bank account");
+                                         ptc->payto_uri);
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-- 
cgit v1.2.3