merchant

commit 0d500cb4d5ed757ccdceabb3fe68d06442be8cf1
parent 47993fae5431c150e03fdce586f8806b86e69b53
Author: Florian Dold <florian.dold@gmail.com>
Date:   Wed, 17 Feb 2016 03:20:28 +0100

better error handling for hash-contract, again

Diffstat:
M
src/backend/taler-merchant-httpd_contract.c
 | 
4
++--
M
src/backend/taler-merchant-httpd_util.c
 | 
10
+++-------

2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c
@@ -93,7 +93,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh,
 
   if (NULL == jcontract)
   {
-    return TMH_RESPONSE_reply_internal_error (connection,
+    return TMH_RESPONSE_reply_external_error (connection,
                                               "contract request malformed");
   }
   /* extract fields we need to sign separately */
@@ -103,7 +103,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh,
   if (GNUNET_NO == res)
     return MHD_YES;
   if (GNUNET_SYSERR == res)
-    return TMH_RESPONSE_reply_internal_error (connection,
+    return TMH_RESPONSE_reply_external_error (connection,
                                               "contract request malformed");
 
   /* add fields to the contract that the backend should provide */
diff --git a/src/backend/taler-merchant-httpd_util.c b/src/backend/taler-merchant-httpd_util.c
@@ -81,19 +81,15 @@ MH_handler_hash_contract (struct TMH_RequestHandler *rh,
 
   if (NULL == jcontract)
   {
-    return TMH_RESPONSE_reply_internal_error (connection,
+    return TMH_RESPONSE_reply_external_error (connection,
                                               "missing 'contract' field");
   }
 
   if (GNUNET_OK != TALER_hash_json (jcontract,
                                     &hc))
   {
-    res = TMH_RESPONSE_reply_json_pack (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        "{s:s, s:s}",
-                                        "error", "invalid contract",
-                                        "hint", "expected object");
-    return res;
+    return TMH_RESPONSE_reply_external_error (connection,
+                                              "expected object as contract");
   }
 
   GNUNET_assert (GNUNET_OK ==