summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-10-26 13:30:55 +0100
committerChristian Grothoff <christian@grothoff.org>2020-10-26 13:30:55 +0100
commitbba9a0ac75846ab5a9c9d85d80174e9c77a37a79 (patch)
treeb335c48c52f505fb704fcc29e2e73a7b9538bb07
parent46bfed8c3b1463c26ac0404188e9ff0613177c57 (diff)
downloadmerchant-bba9a0ac75846ab5a9c9d85d80174e9c77a37a79.tar.gz
merchant-bba9a0ac75846ab5a9c9d85d80174e9c77a37a79.tar.bz2
merchant-bba9a0ac75846ab5a9c9d85d80174e9c77a37a79.zip
use corret HTTP status codes (#6434)
-rw-r--r--src/backend/taler-merchant-httpd_private-patch-instances-ID.c4
-rw-r--r--src/backend/taler-merchant-httpd_private-post-orders.c2
-rw-r--r--src/backend/taler-merchant-httpd_private-post-transfers.c2
-rw-r--r--src/testing/test_merchant_api.c2
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 5cfc567c..1534f62b 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 312d71f5..84114205 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 3bf09470..d12156f8 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 c7348e84..162f0826 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",