[taler-merchant] branch master updated: use corret HTTP status codes (#6434)

[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 bba9a0a  use corret HTTP status codes (#6434)
bba9a0a is described below

commit bba9a0ac75846ab5a9c9d85d80174e9c77a37a79
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Oct 26 13:30:55 2020 +0100

    use corret HTTP status codes (#6434)
---
 src/backend/taler-merchant-httpd_private-patch-instances-ID.c | 4 ++--
 src/backend/taler-merchant-httpd_private-post-orders.c        | 2 +-
 src/backend/taler-merchant-httpd_private-post-transfers.c     | 2 +-
 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
index 5cfc567..1534f62 100644
--- 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
index 312d71f..8411420 100644
--- 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
index 3bf0947..d12156f 100644
--- 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
index c7348e8..162f082 100644
--- 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",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.