merchant

commit bba9a0ac75846ab5a9c9d85d80174e9c77a37a79
parent 46bfed8c3b1463c26ac0404188e9ff0613177c57
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 26 Oct 2020 13:30:55 +0100

use corret HTTP status codes (#6434)

Diffstat:
M
src/backend/taler-merchant-httpd_private-patch-instances-ID.c
 | 
4
++--
M
src/backend/taler-merchant-httpd_private-post-orders.c
 | 
2
+-
M
src/backend/taler-merchant-httpd_private-post-transfers.c
 | 
2
+-
M
src/testing/test_merchant_api.c
 | 
2
+-

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
@@ -128,8 +128,8 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh,
       GNUNET_break_op (0);
       GNUNET_JSON_parse_free (spec);
       return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_POST_INSTANCES_BAD_CURRENCY,
+                                         MHD_HTTP_CONFLICT,
+                                         TALER_EC_PATCH_INSTANCES_BAD_CURRENCY,
                                          NULL);
     }
     if (GNUNET_OK !=
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -1231,7 +1231,7 @@ TMH_private_post_orders (const struct TMH_RequestHandler *rh,
       GNUNET_break (0);
       GNUNET_JSON_parse_free (spec);
       return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
                                          TALER_EC_ALLOCATION_FAILURE,
                                          "request body normalization for hashing");
     }
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -567,7 +567,7 @@ process_transfer_with_exchange (void *cls,
     {
       GNUNET_break (0);
       resume_transfer_with_error (ptc,
-                                  MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                  MHD_HTTP_FAILED_DEPENDENCY,
                                   TALER_EC_POST_TRANSFERS_EXCHANGE_KEYS_FAILURE,
                                   "failed to get keys");
       return;
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
@@ -1175,7 +1175,7 @@ run (void *cls,
                                                "USD:0.5",
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_TIME_UNIT_MINUTES,
-                                               MHD_HTTP_BAD_REQUEST),
+                                               MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-i1",
                                                merchant_url,
                                                "i1",