From 8d312562bf04eeb2afac53a2f24624f8e48529bd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Nov 2020 18:51:14 +0100 Subject: adjust ECs --- src/auditor/taler-auditor-httpd_deposit-confirmation.c | 16 ++++++++-------- src/auditor/taler-auditor-httpd_exchanges.c | 6 +++--- src/auditor/taler-auditor.in | 0 3 files changed, 11 insertions(+), 11 deletions(-) mode change 100755 => 100644 src/auditor/taler-auditor.in (limited to 'src/auditor') diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index 7ee5ead43..67bac1b79 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -85,7 +85,7 @@ verify_and_execute_deposit_confirmation ( TALER_LOG_WARNING ("Expired exchange signing key\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_FORBIDDEN, - TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, + TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, "master signature expired"); } @@ -104,7 +104,7 @@ verify_and_execute_deposit_confirmation ( GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_DB_SETUP_FAILED, + TALER_EC_GENERIC_DB_SETUP_FAILED, NULL); } if (! cached) @@ -119,7 +119,7 @@ verify_and_execute_deposit_confirmation ( TALER_LOG_WARNING ("Invalid signature on exchange signing key\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_FORBIDDEN, - TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, + TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, "master signature invalid"); } @@ -133,8 +133,8 @@ verify_and_execute_deposit_confirmation ( TALER_LOG_WARNING ("Failed to store exchange signing key in database\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_AUDITOR_EXCHANGE_STORE_DB_ERROR, - NULL); + TALER_EC_GENERIC_DB_STORE_FAILED, + "exchange signing key"); } /* Cache it, due to concurreny it might already be in the cache, @@ -173,7 +173,7 @@ verify_and_execute_deposit_confirmation ( "Invalid signature on /deposit-confirmation request\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_FORBIDDEN, - TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, + TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, "exchange signature invalid"); } } @@ -188,8 +188,8 @@ verify_and_execute_deposit_confirmation ( TALER_LOG_WARNING ("Failed to store /deposit-confirmation in database\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_DEPOSIT_CONFIRMATION_STORE_DB_ERROR, - NULL); + TALER_EC_GENERIC_DB_STORE_FAILED, + "deposit confirmation"); } return TALER_MHD_reply_json_pack (connection, MHD_HTTP_OK, diff --git a/src/auditor/taler-auditor-httpd_exchanges.c b/src/auditor/taler-auditor-httpd_exchanges.c index ffa215ec2..be627ba1c 100644 --- a/src/auditor/taler-auditor-httpd_exchanges.c +++ b/src/auditor/taler-auditor-httpd_exchanges.c @@ -89,7 +89,7 @@ TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh, GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_DB_SETUP_FAILED, + TALER_EC_GENERIC_DB_SETUP_FAILED, NULL); } ja = json_array (); @@ -105,8 +105,8 @@ TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh, TALER_LOG_WARNING ("Failed to handle /exchanges in database\n"); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_LIST_EXCHANGES_DB_ERROR, - NULL); + TALER_EC_GENERIC_DB_FETCH_FAILED, + "exchanges"); } return TALER_MHD_reply_json_pack (connection, MHD_HTTP_OK, diff --git a/src/auditor/taler-auditor.in b/src/auditor/taler-auditor.in old mode 100755 new mode 100644 -- cgit v1.2.3