From e42cf1a738aef2c2aee32997d157965b02e2fe0d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 8 Nov 2020 00:50:16 +0100 Subject: adjust error codes in merchant --- ...ler-merchant-httpd_private-patch-orders-ID-forget.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c') diff --git a/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c b/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c index d9d8df49..494787ed 100644 --- a/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c +++ b/src/backend/taler-merchant-httpd_private-patch-orders-ID-forget.c @@ -81,7 +81,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, { return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_FORGET_ORDER_DB_START_ERROR, + TALER_EC_GENERIC_DB_START_FAILED, NULL); } qs = TMH_db->lookup_contract_terms (TMH_db->cls, @@ -95,8 +95,8 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, TMH_db->rollback (TMH_db->cls); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_ORDERS_CLAIM_HARD_DB_ERROR, - NULL); + TALER_EC_GENERIC_DB_FETCH_FAILED, + "contract terms"); case GNUNET_DB_STATUS_SOFT_ERROR: TMH_db->rollback (TMH_db->cls); continue; @@ -104,7 +104,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, TMH_db->rollback (TMH_db->cls); return TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, - TALER_EC_FORGET_ORDER_NOT_FOUND, + TALER_EC_MERCHANT_GENERIC_ORDER_UNKNOWN, order_id); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: GNUNET_assert (NULL != contract_terms); @@ -138,7 +138,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, json_decref (fields); return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, - TALER_EC_PARAMETER_MALFORMED, + TALER_EC_GENERIC_PARAMETER_MALFORMED, "fields"); } @@ -156,7 +156,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, json_decref (fields); return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, - TALER_EC_FORGET_PATH_SYNTAX_INCORRECT, + TALER_EC_MERCHANT_PRIVATE_PATCH_ORDERS_ID_FORGET_PATH_SYNTAX_INCORRECT, "field is not a string"); } expand_status = TALER_JSON_expand_path (contract_terms, @@ -171,7 +171,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, json_decref (fields); return TALER_MHD_reply_with_error (connection, MHD_HTTP_CONFLICT, - TALER_EC_FORGET_PATH_NOT_FORGETTABLE, + TALER_EC_MERCHANT_PRIVATE_PATCH_ORDERS_ID_FORGET_PATH_NOT_FORGETTABLE, json_string_value (value)); } if (GNUNET_SYSERR == expand_status) @@ -182,7 +182,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, json_decref (fields); return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, - TALER_EC_FORGET_PATH_SYNTAX_INCORRECT, + TALER_EC_MERCHANT_PRIVATE_PATCH_ORDERS_ID_FORGET_PATH_SYNTAX_INCORRECT, json_string_value (value)); } } @@ -211,7 +211,7 @@ TMH_private_patch_orders_ID_forget (const struct TMH_RequestHandler *rh, { return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_FORGET_ORDER_DB_COMMIT_ERROR, + TALER_EC_GENERIC_DB_COMMIT_FAILED, NULL); } -- cgit v1.2.3