[taler-merchant] branch master updated: fix fTBFSD

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 3c7f7d5  fix fTBFSD
3c7f7d5 is described below

commit 3c7f7d595f99fbe919f0540679939ffde620b398
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Mar 26 13:01:29 2020 +0100

    fix fTBFSD
---
 src/backend/taler-merchant-httpd_auditors.c | 2 +-
 src/backend/taler-merchant-httpd_pay.c      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_auditors.c 
b/src/backend/taler-merchant-httpd_auditors.c
index 8373f15..69e613b 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -70,7 +70,7 @@ json_t *j_auditors;
  * @param mh exchange issuing @a dk
  * @param dk a denomination issued by @a mh
  * @param exchange_trusted #GNUNET_YES if the exchange of @a dk is trusted by 
config
- * @return #GNUNET_OK if we accept this denomination
+ * @return #GNUNET_OK if we accept this denomination // FIXME: should return 
TALER_EC instead!
  */
 int
 TMH_AUDITORS_check_dk (struct TALER_EXCHANGE_Handle *mh,
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index 1e1ac4c..83cc4f4 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -1195,15 +1195,17 @@ process_pay_with_exchange (void *cls,
           "exchange_keys", TALER_EXCHANGE_get_keys_raw (mh)));
       return;
     }
+    // FIXME: AUDITORS_check_dk should return TALER_EC instead!
     if (GNUNET_OK !=
         TMH_AUDITORS_check_dk (mh,
                                denom_details,
                                exchange_trusted))
     {
+      // FIXME: and we should use THAT EC in our error code generation here!
       GNUNET_break_op (0);
       resume_pay_with_response
         (pc,
-        MHD_HTTP_BAD_REQUEST,
+        MHD_HTTP_FAILED_DEPENDENCY,
         TALER_MHD_make_json_pack
           ("{s:s, s:I, s:o}",
           "error", "invalid denomination",

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