taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjust ECs

Browse Source
This commit is contained in:
Christian Grothoff 2020-11-07 18:51:14 +01:00
parent dde5d38c4f
commit 8d312562bf
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
47 changed files with 292 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 7f367f41521556e61eb5010fa605c21c2cb0b714 Subproject commit 3f974ec9d5fd9ce604ac612cc344d3f50bd993c0

16
src/auditor/taler-auditor-httpd_deposit-confirmation.c
View File

@ -85,7 +85,7 @@ verify_and_execute_deposit_confirmation (
TALER_LOG_WARNING ("Expired exchange signing key\n"); TALER_LOG_WARNING ("Expired exchange signing key\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID,
"master signature expired"); "master signature expired");
} }
@ -104,7 +104,7 @@ verify_and_execute_deposit_confirmation (
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_SETUP_FAILED, TALER_EC_GENERIC_DB_SETUP_FAILED,
NULL); NULL);
} }
if (! cached) if (! cached)
@ -119,7 +119,7 @@ verify_and_execute_deposit_confirmation (
TALER_LOG_WARNING ("Invalid signature on exchange signing key\n"); TALER_LOG_WARNING ("Invalid signature on exchange signing key\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID,
"master 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"); TALER_LOG_WARNING ("Failed to store exchange signing key in database\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_AUDITOR_EXCHANGE_STORE_DB_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "exchange signing key");
} }
/* Cache it, due to concurreny it might already be in the cache, /* 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"); "Invalid signature on /deposit-confirmation request\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID, TALER_EC_AUDITOR_DEPOSIT_CONFIRMATION_SIGNATURE_INVALID,
"exchange 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"); TALER_LOG_WARNING ("Failed to store /deposit-confirmation in database\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_CONFIRMATION_STORE_DB_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "deposit confirmation");
} }
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_OK, MHD_HTTP_OK,

6
src/auditor/taler-auditor-httpd_exchanges.c
View File

@ -89,7 +89,7 @@ TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh,
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_SETUP_FAILED, TALER_EC_GENERIC_DB_SETUP_FAILED,
NULL); NULL);
} }
ja = json_array (); ja = json_array ();
@ -105,8 +105,8 @@ TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh,
TALER_LOG_WARNING ("Failed to handle /exchanges in database\n"); TALER_LOG_WARNING ("Failed to handle /exchanges in database\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_LIST_EXCHANGES_DB_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "exchanges");
} }
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_OK, MHD_HTTP_OK,

0
src/auditor/taler-auditor.in Executable file → Normal file
View File

4
src/bank-lib/bank_api_admin.c
View File

@ -84,7 +84,7 @@ handle_admin_add_incoming_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
@ -103,7 +103,7 @@ handle_admin_add_incoming_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
response_code = 0; response_code = 0;
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
} }
ec = TALER_EC_NONE; ec = TALER_EC_NONE;

4
src/bank-lib/bank_api_credit.c
View File

@ -152,7 +152,7 @@ handle_credit_history_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -161,7 +161,7 @@ handle_credit_history_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
response_code = 0; response_code = 0;
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
} }
response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */ response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */

4
src/bank-lib/bank_api_debit.c
View File

@ -154,7 +154,7 @@ handle_debit_history_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -163,7 +163,7 @@ handle_debit_history_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
response_code = 0; response_code = 0;
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
} }
response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */ response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */

4
src/bank-lib/bank_api_transfer.c
View File

@ -177,7 +177,7 @@ handle_transfer_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
@ -196,7 +196,7 @@ handle_transfer_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
response_code = 0; response_code = 0;
ec = TALER_EC_INVALID_RESPONSE; ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
} }
ec = TALER_EC_NONE; ec = TALER_EC_NONE;

12
src/exchange/taler-exchange-httpd.c
View File

@ -235,7 +235,7 @@ handle_post_coins (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_COINS_INVALID_COIN_PUB, TALER_EC_EXCHANGE_GENERIC_COINS_INVALID_COIN_PUB,
args[0]); args[0]);
} }
for (unsigned int i = 0; NULL != h[i].op; i++) for (unsigned int i = 0; NULL != h[i].op; i++)
@ -246,7 +246,7 @@ handle_post_coins (const struct TEH_RequestHandler *rh,
root); root);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_OPERATION_UNKNOWN, TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
args[1]); args[1]);
} }
@ -330,7 +330,7 @@ proceed_with_handler (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_URI_TOO_LONG, MHD_HTTP_URI_TOO_LONG,
TALER_EC_URI_TOO_LONG, TALER_EC_GENERIC_URI_TOO_LONG,
url); url);
} }
@ -399,7 +399,7 @@ proceed_with_handler (const struct TEH_RequestHandler *rh,
json_decref (root); json_decref (root);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_WRONG_NUMBER_OF_SEGMENTS, TALER_EC_EXCHANGE_GENERIC_WRONG_NUMBER_OF_SEGMENTS,
emsg); emsg);
} }
} }
@ -744,7 +744,7 @@ handle_mhd_request (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_METHOD_NOT_ALLOWED, MHD_HTTP_METHOD_NOT_ALLOWED,
TALER_EC_METHOD_INVALID, TALER_EC_GENERIC_METHOD_INVALID,
method); method);
} }
} }
@ -755,7 +755,7 @@ handle_mhd_request (void *cls,
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_ENDPOINT_UNKNOWN, TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
url); url);
GNUNET_async_scope_restore (&old_scope); GNUNET_async_scope_restore (&old_scope);
return ret; return ret;

14
src/exchange/taler-exchange-httpd_db.c
View File

@ -73,7 +73,7 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
*mhd_ret *mhd_ret
= TALER_MHD_reply_with_error (connection, = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COIN_HISTORY_STORE_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
case TALER_EXCHANGEDB_CKS_CONFLICT: case TALER_EXCHANGEDB_CKS_CONFLICT:
@ -95,14 +95,14 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
*mhd_ret = TALER_MHD_reply_with_error ( *mhd_ret = TALER_MHD_reply_with_error (
connection, connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_HISTORY_DB_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); NULL);
return qs; return qs;
} }
*mhd_ret *mhd_ret
= TEH_RESPONSE_reply_coin_insufficient_funds ( = TEH_RESPONSE_reply_coin_insufficient_funds (
connection, connection,
TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY, TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY,
&coin->coin_pub, &coin->coin_pub,
tl); tl);
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls, TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
@ -145,7 +145,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_SETUP_FAILED, TALER_EC_GENERIC_DB_SETUP_FAILED,
NULL); NULL);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -164,7 +164,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_START_FAILED, TALER_EC_GENERIC_DB_START_FAILED,
NULL); NULL);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -185,7 +185,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COMMIT_FAILED_HARD, TALER_EC_GENERIC_DB_COMMIT_FAILED,
NULL); NULL);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -201,7 +201,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
if (NULL != mhd_ret) if (NULL != mhd_ret)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DB_COMMIT_FAILED_ON_RETRY, TALER_EC_GENERIC_DB_SOFT_FAILURE,
NULL); NULL);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }

28
src/exchange/taler-exchange-httpd_deposit.c
View File

@ -85,7 +85,7 @@ reply_deposit_success (struct MHD_Connection *connection,
{ {
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
return TALER_MHD_reply_json_pack ( return TALER_MHD_reply_json_pack (
@ -160,7 +160,7 @@ deposit_precheck (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_HISTORY_DB_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -254,7 +254,7 @@ deposit_transaction (void *cls,
*mhd_ret = TALER_MHD_reply_with_error ( *mhd_ret = TALER_MHD_reply_with_error (
connection, connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_HISTORY_DB_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); NULL);
return qs; return qs;
} }
@ -268,7 +268,7 @@ deposit_transaction (void *cls,
*mhd_ret = TALER_MHD_reply_with_error ( *mhd_ret = TALER_MHD_reply_with_error (
connection, connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_HISTORY_DB_ERROR, TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -280,7 +280,7 @@ deposit_transaction (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Deposited coin has insufficient funds left!\n"); "Deposited coin has insufficient funds left!\n");
*mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (connection, *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (connection,
TALER_EC_DEPOSIT_INSUFFICIENT_FUNDS, TALER_EC_EXCHANGE_DEPOSIT_INSUFFICIENT_FUNDS,
&deposit->coin. &deposit->coin.
coin_pub, coin_pub,
tl); tl);
@ -300,7 +300,7 @@ deposit_transaction (void *cls,
TALER_LOG_WARNING ("Failed to store /deposit information in database\n"); TALER_LOG_WARNING ("Failed to store /deposit information in database\n");
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSIT_STORE_DB_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); NULL);
} }
return qs; return qs;
@ -381,7 +381,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE, TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE,
NULL); NULL);
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -393,7 +393,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSIT_INVALID_WIRE_FORMAT_JSON, TALER_EC_EXCHANGE_DEPOSIT_INVALID_WIRE_FORMAT_JSON,
NULL); NULL);
} }
if (0 != GNUNET_memcmp (&deposit.h_wire, if (0 != GNUNET_memcmp (&deposit.h_wire,
@ -403,7 +403,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSIT_INVALID_WIRE_FORMAT_CONTRACT_HASH_CONFLICT, TALER_EC_EXCHANGE_DEPOSIT_INVALID_WIRE_FORMAT_CONTRACT_HASH_CONFLICT,
NULL); NULL);
} }
@ -441,7 +441,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
dki = TEH_KS_denomination_key_lookup_by_hash (key_state, dki = TEH_KS_denomination_key_lookup_by_hash (key_state,
@ -470,7 +470,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSIT_CURRENCY_MISMATCH, TALER_EC_GENERIC_CURRENCY_MISMATCH,
deposit.deposit_fee.currency); deposit.deposit_fee.currency);
} }
/* check coin signature */ /* check coin signature */
@ -483,7 +483,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_UNAUTHORIZED, MHD_HTTP_UNAUTHORIZED,
TALER_EC_DEPOSIT_DENOMINATION_SIGNATURE_INVALID, TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
NULL); NULL);
} }
TALER_amount_ntoh (&dc.value, TALER_amount_ntoh (&dc.value,
@ -497,7 +497,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE, TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
NULL); NULL);
} }
@ -529,7 +529,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_UNAUTHORIZED, MHD_HTTP_UNAUTHORIZED,
TALER_EC_DEPOSIT_COIN_SIGNATURE_INVALID, TALER_EC_EXCHANGE_DEPOSIT_COIN_SIGNATURE_INVALID,
NULL); NULL);
} }
} }

20
src/exchange/taler-exchange-httpd_deposits_get.c
View File

@ -75,7 +75,7 @@ reply_deposit_details (struct MHD_Connection *connection,
{ {
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
@ -233,7 +233,7 @@ deposits_get_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSITS_GET_DB_FETCH_FAILED, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); NULL);
} }
return qs; return qs;
@ -242,7 +242,7 @@ deposits_get_transaction (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_DEPOSITS_GET_NOT_FOUND, TALER_EC_EXCHANGE_DEPOSITS_GET_NOT_FOUND,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -288,8 +288,8 @@ handle_track_transaction_request (
if (GNUNET_SYSERR == ctx.pending) if (GNUNET_SYSERR == ctx.pending)
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_DEPOSITS_GET_DB_FEE_INCONSISTENT, TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
NULL); "wire fees exceed aggregate in database");
return reply_deposit_details (connection, return reply_deposit_details (connection,
&tps->h_contract_terms, &tps->h_contract_terms,
&tps->h_wire, &tps->h_wire,
@ -332,7 +332,7 @@ TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSITS_INVALID_H_WIRE, TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_WIRE,
args[0]); args[0]);
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -344,7 +344,7 @@ TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSITS_INVALID_MERCHANT_PUB, TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_MERCHANT_PUB,
args[1]); args[1]);
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -356,7 +356,7 @@ TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSITS_INVALID_H_CONTRACT_TERMS, TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_CONTRACT_TERMS,
args[2]); args[2]);
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -368,7 +368,7 @@ TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_DEPOSITS_INVALID_COIN_PUB, TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_COIN_PUB,
args[3]); args[3]);
} }
res = TALER_MHD_parse_request_arg_data (connection, res = TALER_MHD_parse_request_arg_data (connection,
@ -388,7 +388,7 @@ TEH_handler_deposits_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_DEPOSITS_GET_MERCHANT_SIGNATURE_INVALID, TALER_EC_EXCHANGE_DEPOSITS_GET_MERCHANT_SIGNATURE_INVALID,
NULL); NULL);
} }

52
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -2029,21 +2029,7 @@ TEH_KS_denomination_key_lookup_by_hash (
if (NULL == dki) if (NULL == dki)
{ {
*hc = MHD_HTTP_NOT_FOUND; *hc = MHD_HTTP_NOT_FOUND;
switch (use) *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
{
case TEH_KS_DKU_RECOUP:
*ec = TALER_EC_RECOUP_DENOMINATION_KEY_UNKNOWN;
break;
case TEH_KS_DKU_ZOMBIE:
*ec = TALER_EC_REFRESH_RECOUP_DENOMINATION_KEY_NOT_FOUND;
break;
case TEH_KS_DKU_WITHDRAW:
*ec = TALER_EC_WITHDRAW_DENOMINATION_KEY_NOT_FOUND;
break;
case TEH_KS_DKU_DEPOSIT:
*ec = TALER_EC_DEPOSIT_DENOMINATION_KEY_UNKNOWN;
break;
}
return NULL; return NULL;
} }
now = GNUNET_TIME_absolute_get (); now = GNUNET_TIME_absolute_get ();
@ -2054,21 +2040,7 @@ TEH_KS_denomination_key_lookup_by_hash (
"Not returning DKI for %s, as start time is in the future\n", "Not returning DKI for %s, as start time is in the future\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*hc = MHD_HTTP_PRECONDITION_FAILED; *hc = MHD_HTTP_PRECONDITION_FAILED;
switch (use) *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE;
{
case TEH_KS_DKU_RECOUP:
*ec = TALER_EC_RECOUP_DENOMINATION_VALIDITY_IN_FUTURE;
break;
case TEH_KS_DKU_ZOMBIE:
*ec = TALER_EC_REFRESH_RECOUP_DENOMINATION_VALIDITY_IN_FUTURE;
break;
case TEH_KS_DKU_WITHDRAW:
*ec = TALER_EC_WITHDRAW_VALIDITY_IN_FUTURE;
break;
case TEH_KS_DKU_DEPOSIT:
*ec = TALER_EC_DEPOSIT_DENOMINATION_VALIDITY_IN_FUTURE;
break;
}
return NULL; return NULL;
} }
now = GNUNET_TIME_absolute_get (); now = GNUNET_TIME_absolute_get ();
@ -2082,7 +2054,7 @@ TEH_KS_denomination_key_lookup_by_hash (
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Not returning DKI for %s, as time to create coins has passed\n", "Not returning DKI for %s, as time to create coins has passed\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*ec = TALER_EC_WITHDRAW_VALIDITY_IN_PAST; *ec = TALER_EC_EXCHANGE_WITHDRAW_VALIDITY_IN_PAST;
*hc = MHD_HTTP_GONE; *hc = MHD_HTTP_GONE;
return NULL; return NULL;
} }
@ -2091,7 +2063,7 @@ TEH_KS_denomination_key_lookup_by_hash (
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Not returning DKI of %s for WITHDRAW operation as we lack the private key, even though the withdraw period did not yet expire!\n", "Not returning DKI of %s for WITHDRAW operation as we lack the private key, even though the withdraw period did not yet expire!\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*ec = TALER_EC_DENOMINATION_KEY_LOST; *ec = TALER_EC_EXCHANGE_WITHDRAW_DENOMINATION_KEY_LOST;
*hc = MHD_HTTP_SERVICE_UNAVAILABLE; *hc = MHD_HTTP_SERVICE_UNAVAILABLE;
return NULL; return NULL;
} }
@ -2104,7 +2076,7 @@ TEH_KS_denomination_key_lookup_by_hash (
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Not returning DKI for %s, as time to spend coin has passed\n", "Not returning DKI for %s, as time to spend coin has passed\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*ec = TALER_EC_DEPOSIT_DENOMINATION_EXPIRED; *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED;
*hc = MHD_HTTP_GONE; *hc = MHD_HTTP_GONE;
return NULL; return NULL;
} }
@ -2117,7 +2089,7 @@ TEH_KS_denomination_key_lookup_by_hash (
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Not returning DKI for %s, as time to recoup coin has passed\n", "Not returning DKI for %s, as time to recoup coin has passed\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*ec = TALER_EC_REFRESH_RECOUP_DENOMINATION_EXPIRED; *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED;
*hc = MHD_HTTP_GONE; *hc = MHD_HTTP_GONE;
return NULL; return NULL;
} }
@ -2130,7 +2102,7 @@ TEH_KS_denomination_key_lookup_by_hash (
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Not returning DKI for %s, as legal expiration of coin has passed\n", "Not returning DKI for %s, as legal expiration of coin has passed\n",
GNUNET_h2s (denom_pub_hash)); GNUNET_h2s (denom_pub_hash));
*ec = TALER_EC_REFRESH_ZOMBIE_DENOMINATION_EXPIRED; *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED;
*hc = MHD_HTTP_GONE; *hc = MHD_HTTP_GONE;
return NULL; return NULL;
} }
@ -2501,7 +2473,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_KEYS_HAVE_NOT_NUMERIC, // FIXME: use more GENERIC code! TALER_EC_GENERIC_PARAMETER_MALFORMED,
have_cherrypick); have_cherrypick);
} }
/* The following multiplication may overflow; but this should not really /* The following multiplication may overflow; but this should not really
@ -2530,7 +2502,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_KEYS_HAVE_NOT_NUMERIC, // FIXME: use more GENERIC code! TALER_EC_GENERIC_PARAMETER_MALFORMED,
have_fakenow); have_fakenow);
} }
if (TEH_allow_keys_timetravel) if (TEH_allow_keys_timetravel)
@ -2546,7 +2518,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
/* Option not allowed by configuration */ /* Option not allowed by configuration */
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_KEYS_TIMETRAVEL_FORBIDDEN, TALER_EC_EXCHANGE_KEYS_TIMETRAVEL_FORBIDDEN,
NULL); NULL);
} }
} }
@ -2566,7 +2538,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
to be our fault, so let's speculatively assume we are to blame ;-) */ to be our fault, so let's speculatively assume we are to blame ;-) */
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
NULL); NULL);
} }
krd = bsearch (&last_issue_date, krd = bsearch (&last_issue_date,
@ -2598,7 +2570,7 @@ TEH_handler_keys (const struct TEH_RequestHandler *rh,
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_KEYS_MISSING, TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
NULL); NULL);
} }
ret = MHD_queue_response (connection, ret = MHD_queue_response (connection,

8
src/exchange/taler-exchange-httpd_link.c
View File

@ -116,7 +116,7 @@ handle_link_data (void *cls,
} }
return; return;
fail: fail:
ctx->ec = TALER_EC_JSON_ALLOCATION_FAILURE; ctx->ec = TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE;
json_decref (ctx->mlist); json_decref (ctx->mlist);
ctx->mlist = NULL; ctx->mlist = NULL;
} }
@ -164,7 +164,7 @@ link_transaction (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_LINK_COIN_UNKNOWN, TALER_EC_EXCHANGE_LINK_COIN_UNKNOWN,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -201,7 +201,7 @@ TEH_handler_link (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_COINS_INVALID_COIN_PUB, TALER_EC_EXCHANGE_GENERIC_COINS_INVALID_COIN_PUB,
args[0]); args[0]);
} }
ctx.mlist = json_array (); ctx.mlist = json_array ();
@ -210,7 +210,7 @@ TEH_handler_link (const struct TEH_RequestHandler *rh,
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_array() call failed"); "json_array() call failed");
} }
if (GNUNET_OK != if (GNUNET_OK !=

47
src/exchange/taler-exchange-httpd_melt.c
View File

@ -63,16 +63,16 @@ reply_melt_insufficient_funds (
if (NULL == history) if (NULL == history)
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_HISTORY_DB_ERROR_INSUFFICIENT_FUNDS, TALER_EC_EXCHANGE_MELT_HISTORY_DB_ERROR_INSUFFICIENT_FUNDS,
NULL); NULL);
return TALER_MHD_reply_json_pack ( return TALER_MHD_reply_json_pack (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o, s:o, s:o, s:o, s:o}", "{s:s, s:I, s:o, s:o, s:o, s:o, s:o}",
"hint", "hint",
TALER_ErrorCode_get_hint (TALER_EC_MELT_INSUFFICIENT_FUNDS), TALER_ErrorCode_get_hint (TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS),
"code", "code",
(json_int_t) TALER_EC_MELT_INSUFFICIENT_FUNDS, (json_int_t) TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS,
"coin_pub", "coin_pub",
GNUNET_JSON_from_data_auto (coin_pub), GNUNET_JSON_from_data_auto (coin_pub),
"original_value", "original_value",
@ -115,7 +115,7 @@ reply_melt_success (struct MHD_Connection *connection,
{ {
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
return TALER_MHD_reply_json_pack ( return TALER_MHD_reply_json_pack (
@ -201,8 +201,8 @@ refresh_check_melt (struct MHD_Connection *connection,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "coin transaction history");
return qs; return qs;
} }
if (rmc->zombie_required) if (rmc->zombie_required)
@ -228,7 +228,7 @@ refresh_check_melt (struct MHD_Connection *connection,
tl); tl);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_MELT_COIN_EXPIRED_NO_ZOMBIE, TALER_EC_EXCHANGE_MELT_COIN_EXPIRED_NO_ZOMBIE,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -243,7 +243,7 @@ refresh_check_melt (struct MHD_Connection *connection,
tl); tl);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_COIN_HISTORY_COMPUTATION_FAILED, TALER_EC_EXCHANGE_MELT_COIN_HISTORY_COMPUTATION_FAILED,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -349,8 +349,8 @@ melt_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "melt index");
return qs; return qs;
} }
@ -375,8 +375,8 @@ melt_transaction (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_DB_STORE_SESSION_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "melt");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
return qs; return qs;
@ -425,7 +425,7 @@ handle_melt (struct MHD_Connection *connection,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_MELT_COIN_SIGNATURE_INVALID, TALER_EC_EXCHANGE_MELT_COIN_SIGNATURE_INVALID,
NULL); NULL);
} }
} }
@ -470,7 +470,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
TALER_LOG_ERROR ("Lacking keys to operate\n"); TALER_LOG_ERROR ("Lacking keys to operate\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
@ -517,8 +517,8 @@ check_for_denomination_key (struct MHD_Connection *connection,
GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs); GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_MELT_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "coin denomination");
} }
/* sanity check */ /* sanity check */
GNUNET_break (0 == GNUNET_break (0 ==
@ -572,12 +572,11 @@ check_for_denomination_key (struct MHD_Connection *connection,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (
MHD_HTTP_BAD_REQUEST, connection,
TALER_EC_MELT_CURRENCY_MISMATCH, MHD_HTTP_BAD_REQUEST,
rmc->refresh_session.amount_with_fee. TALER_EC_GENERIC_CURRENCY_MISMATCH,
currency); rmc->refresh_session.amount_with_fee.currency);
} }
/* check coin is actually properly signed */ /* check coin is actually properly signed */
if (GNUNET_OK != if (GNUNET_OK !=
@ -588,7 +587,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_MELT_DENOMINATION_SIGNATURE_INVALID, TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
NULL); NULL);
} }
} }
@ -602,7 +601,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_MELT_FEES_EXCEED_CONTRIBUTION, TALER_EC_EXCHANGE_MELT_FEES_EXCEED_CONTRIBUTION,
NULL); NULL);
} }
return handle_melt (connection, return handle_melt (connection,

34
src/exchange/taler-exchange-httpd_recoup.c
View File

@ -155,8 +155,8 @@ recoup_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_DB_FETCH_FAILED, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "old coin by h_blind");
} }
return qs; return qs;
} }
@ -174,8 +174,8 @@ recoup_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_DB_FETCH_FAILED, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "reserve by h_blind");
} }
return qs; return qs;
} }
@ -187,7 +187,7 @@ recoup_transaction (void *cls,
GNUNET_h2s (&pc->h_blind)); GNUNET_h2s (&pc->h_blind));
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_RECOUP_WITHDRAW_NOT_FOUND, TALER_EC_EXCHANGE_RECOUP_WITHDRAW_NOT_FOUND,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -205,8 +205,8 @@ recoup_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_DB_FETCH_FAILED, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "coin transaction list");
} }
return qs; return qs;
} }
@ -240,8 +240,8 @@ recoup_transaction (void *cls,
tl); tl);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_HISTORY_DB_ERROR, TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
NULL); "coin transaction history");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -260,7 +260,7 @@ recoup_transaction (void *cls,
tl); tl);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_COIN_BALANCE_NEGATIVE, TALER_EC_EXCHANGE_RECOUP_COIN_BALANCE_NEGATIVE,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -276,7 +276,7 @@ recoup_transaction (void *cls,
{ {
/* Refuse: insufficient funds for recoup */ /* Refuse: insufficient funds for recoup */
*mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (connection, *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (connection,
TALER_EC_RECOUP_COIN_BALANCE_ZERO, TALER_EC_EXCHANGE_RECOUP_COIN_BALANCE_ZERO,
&pc->coin->coin_pub, &pc->coin->coin_pub,
tl); tl);
ret = GNUNET_DB_STATUS_HARD_ERROR; ret = GNUNET_DB_STATUS_HARD_ERROR;
@ -327,8 +327,8 @@ recoup_transaction (void *cls,
TALER_LOG_WARNING ("Failed to store recoup information in database\n"); TALER_LOG_WARNING ("Failed to store recoup information in database\n");
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_DB_PUT_FAILED, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "recoup request");
} }
return qs; return qs;
} }
@ -376,7 +376,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
TALER_LOG_ERROR ("Lacking keys to operate\n"); TALER_LOG_ERROR ("Lacking keys to operate\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
dki = TEH_KS_denomination_key_lookup_by_hash (key_state, dki = TEH_KS_denomination_key_lookup_by_hash (key_state,
@ -406,7 +406,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_RECOUP_DENOMINATION_SIGNATURE_INVALID, TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
NULL); NULL);
} }
@ -430,7 +430,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_RECOUP_SIGNATURE_INVALID, TALER_EC_EXCHANGE_RECOUP_SIGNATURE_INVALID,
NULL); NULL);
} }
} }
@ -448,7 +448,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
TEH_KS_release (key_state); TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RECOUP_BLINDING_FAILED, TALER_EC_EXCHANGE_RECOUP_BLINDING_FAILED,
NULL); NULL);
} }
TEH_KS_release (key_state); TEH_KS_release (key_state);

57
src/exchange/taler-exchange-httpd_refreshes_reveal.c
View File

@ -65,7 +65,7 @@ reply_refreshes_reveal_success (struct MHD_Connection *connection,
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_array() call failed"); "json_array() call failed");
} }
for (unsigned int freshcoin_index = 0; for (unsigned int freshcoin_index = 0;
@ -84,7 +84,7 @@ reply_refreshes_reveal_success (struct MHD_Connection *connection,
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_pack() failed"); "json_pack() failed");
} }
if (0 != if (0 !=
@ -95,7 +95,7 @@ reply_refreshes_reveal_success (struct MHD_Connection *connection,
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_array_append_new() failed"); "json_array_append_new() failed");
} }
} }
@ -256,8 +256,8 @@ refreshes_reveal_preflight (void *cls,
GNUNET_break (qs); GNUNET_break (qs);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_DB_FETCH_REVEAL_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "refresh reveal");
rctx->preflight_ok = GNUNET_SYSERR; rctx->preflight_ok = GNUNET_SYSERR;
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
@ -308,7 +308,7 @@ refreshes_reveal_transaction (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REVEAL_SESSION_UNKNOWN, TALER_EC_EXCHANGE_REFRESHES_REVEAL_SESSION_UNKNOWN,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -320,8 +320,8 @@ refreshes_reveal_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_DB_FETCH_SESSION_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "melt");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -414,9 +414,10 @@ refreshes_reveal_transaction (void *cls,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o}", "{s:s, s:I, s:o}",
"hint", "hint",
TALER_ErrorCode_get_hint (TALER_EC_REVEAL_COMMITMENT_VIOLATION), TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_REFRESHES_REVEAL_COMMITMENT_VIOLATION),
"code", "code",
(json_int_t) TALER_EC_REVEAL_COMMITMENT_VIOLATION, (json_int_t) TALER_EC_EXCHANGE_REFRESHES_REVEAL_COMMITMENT_VIOLATION,
"rc_expected", "rc_expected",
GNUNET_JSON_from_data_auto ( GNUNET_JSON_from_data_auto (
&rc_expected)); &rc_expected));
@ -451,7 +452,7 @@ refreshes_reveal_transaction (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_COST_CALCULATION_OVERFLOW, TALER_EC_EXCHANGE_REFRESHES_REVEAL_COST_CALCULATION_OVERFLOW,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -462,7 +463,7 @@ refreshes_reveal_transaction (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_AMOUNT_INSUFFICIENT, TALER_EC_EXCHANGE_REFRESHES_REVEAL_AMOUNT_INSUFFICIENT,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -517,8 +518,8 @@ refreshes_reveal_persist (void *cls,
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_DB_COMMIT_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "refresh_reveal");
} }
return qs; return qs;
} }
@ -630,21 +631,21 @@ resolve_refreshes_reveal_denominations (struct TEH_KS_StateHandle *key_state,
case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REVEAL_SESSION_UNKNOWN, TALER_EC_EXCHANGE_REFRESHES_REVEAL_SESSION_UNKNOWN,
NULL); NULL);
break; break;
case GNUNET_DB_STATUS_HARD_ERROR: case GNUNET_DB_STATUS_HARD_ERROR:
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_DB_FETCH_SESSION_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "melt");
break; break;
case GNUNET_DB_STATUS_SOFT_ERROR: case GNUNET_DB_STATUS_SOFT_ERROR:
default: default:
GNUNET_break (0); /* should be impossible */ GNUNET_break (0); /* should be impossible */
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_INTERNAL_INVARIANT_FAILURE, TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
NULL); NULL);
break; break;
} }
@ -689,7 +690,7 @@ resolve_refreshes_reveal_denominations (struct TEH_KS_StateHandle *key_state,
GNUNET_break_op (0); GNUNET_break_op (0);
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_REVEAL_LINK_SIGNATURE_INVALID, TALER_EC_EXCHANGE_REFRESHES_REVEAL_LINK_SIGNATURE_INVALID,
NULL); NULL);
goto cleanup; goto cleanup;
} }
@ -716,7 +717,7 @@ resolve_refreshes_reveal_denominations (struct TEH_KS_StateHandle *key_state,
GNUNET_break (0); GNUNET_break (0);
ret = TALER_MHD_reply_with_error (connection, ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_SIGNING_ERROR, TALER_EC_EXCHANGE_REFRESHES_REVEAL_SIGNING_ERROR,
NULL); NULL);
goto cleanup; goto cleanup;
} }
@ -831,7 +832,7 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_EXCESSIVE, TALER_EC_EXCHANGE_REFRESHES_REVEAL_NEW_DENOMS_ARRAY_SIZE_EXCESSIVE,
NULL); NULL);
} }
@ -841,7 +842,7 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH, TALER_EC_EXCHANGE_REFRESHES_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH,
"new_denoms/coin_evs"); "new_denoms/coin_evs");
} }
if (json_array_size (new_denoms_h_json) != if (json_array_size (new_denoms_h_json) !=
@ -850,7 +851,7 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH, TALER_EC_EXCHANGE_REFRESHES_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH,
"new_denoms/link_sigs"); "new_denoms/link_sigs");
} }
@ -882,8 +883,8 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
TALER_LOG_ERROR ("Lacking keys to operate\n"); TALER_LOG_ERROR ("Lacking keys to operate\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REVEAL_KEYS_MISSING, TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
"exchange lacks keys"); NULL);
} }
ret = resolve_refreshes_reveal_denominations (key_state, ret = resolve_refreshes_reveal_denominations (key_state,
connection, connection,
@ -945,7 +946,7 @@ TEH_handler_reveal (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_INVALID_RCH, TALER_EC_EXCHANGE_REFRESHES_REVEAL_INVALID_RCH,
args[0]); args[0]);
} }
if (0 != strcmp (args[1], if (0 != strcmp (args[1],
@ -954,7 +955,7 @@ TEH_handler_reveal (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_OPERATION_INVALID, TALER_EC_EXCHANGE_REFRESHES_REVEAL_OPERATION_INVALID,
args[1]); args[1]);
} }
@ -979,7 +980,7 @@ TEH_handler_reveal (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REVEAL_CNC_TRANSFER_ARRAY_SIZE_INVALID, TALER_EC_EXCHANGE_REFRESHES_REVEAL_CNC_TRANSFER_ARRAY_SIZE_INVALID,
NULL); NULL);
} }

35
src/exchange/taler-exchange-httpd_refund.c
View File

@ -68,7 +68,7 @@ reply_refund_success (struct MHD_Connection *connection,
{ {
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no online signing key"); "no online signing key");
} }
return TALER_MHD_reply_json_pack ( return TALER_MHD_reply_json_pack (
@ -126,8 +126,8 @@ refund_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REFUND_DATABASE_LOOKUP_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "coin transactions");
return qs; return qs;
} }
deposit_found = false; deposit_found = false;
@ -162,7 +162,7 @@ refund_transaction (void *cls,
/* money was already transferred to merchant, can no longer refund */ /* money was already transferred to merchant, can no longer refund */
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_GONE, MHD_HTTP_GONE,
TALER_EC_REFUND_MERCHANT_ALREADY_PAID, TALER_EC_EXCHANGE_REFUND_MERCHANT_ALREADY_PAID,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -230,12 +230,12 @@ refund_transaction (void *cls,
*mhd_ret = TALER_MHD_reply_json_pack ( *mhd_ret = TALER_MHD_reply_json_pack (
connection, connection,
MHD_HTTP_PRECONDITION_FAILED, MHD_HTTP_PRECONDITION_FAILED,
"{s:s, s:s, s:I, s:o}", "{s:o, s:s, s:I, s:o}",
"detail", "detail",
"conflicting refund with different amount but same refund transaction ID", TALER_JSON_from_amount (&ref->refund_amount),
"hint", TALER_ErrorCode_get_hint ( "hint", TALER_ErrorCode_get_hint (
TALER_EC_REFUND_INCONSISTENT_AMOUNT), TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT),
"code", (json_int_t) TALER_EC_REFUND_INCONSISTENT_AMOUNT, "code", (json_int_t) TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT,
"history", TEH_RESPONSE_compile_transaction_history ( "history", TEH_RESPONSE_compile_transaction_history (
&refund->coin.coin_pub, &refund->coin.coin_pub,
tli)); tli));
@ -307,7 +307,7 @@ refund_transaction (void *cls,
tlx); tlx);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REFUND_DEPOSIT_NOT_FOUND, TALER_EC_EXCHANGE_REFUND_DEPOSIT_NOT_FOUND,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -322,7 +322,7 @@ refund_transaction (void *cls,
tlx); tlx);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_REFUND_CURRENCY_MISMATCH, TALER_EC_GENERIC_CURRENCY_MISMATCH,
deposit_total.currency); deposit_total.currency);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -346,9 +346,10 @@ refund_transaction (void *cls,
"detail", "detail",
"total amount refunded exceeds total amount deposited for this coin", "total amount refunded exceeds total amount deposited for this coin",
"hint", "hint",
TALER_ErrorCode_get_hint (TALER_EC_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT), TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT),
"code", "code",
(json_int_t) TALER_EC_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT, (json_int_t) TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT,
"history", "history",
TEH_RESPONSE_compile_transaction_history (&refund->coin.coin_pub, TEH_RESPONSE_compile_transaction_history (&refund->coin.coin_pub,
tlx)); tlx));
@ -369,8 +370,8 @@ refund_transaction (void *cls,
TALER_LOG_WARNING ("Failed to store /refund information in database\n"); TALER_LOG_WARNING ("Failed to store /refund information in database\n");
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_REFUND_STORE_DB_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "refund");
return qs; return qs;
} }
/* Success or soft failure */ /* Success or soft failure */
@ -415,7 +416,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
TALER_LOG_WARNING ("Invalid signature on refund request\n"); TALER_LOG_WARNING ("Invalid signature on refund request\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_REFUND_MERCHANT_SIGNATURE_INVALID, TALER_EC_EXCHANGE_REFUND_MERCHANT_SIGNATURE_INVALID,
NULL); NULL);
} }
} }
@ -438,7 +439,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
sizeof (denom_hash)); sizeof (denom_hash));
res = TALER_MHD_reply_with_error (connection, res = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_REFUND_COIN_NOT_FOUND, TALER_EC_EXCHANGE_REFUND_COIN_NOT_FOUND,
dhs); dhs);
GNUNET_free (dhs); GNUNET_free (dhs);
return res; return res;
@ -454,7 +455,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
TALER_LOG_ERROR ("Lacking keys to operate\n"); TALER_LOG_ERROR ("Lacking keys to operate\n");
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
/* Obtain information about the coin's denomination! */ /* Obtain information about the coin's denomination! */

6
src/exchange/taler-exchange-httpd_reserves_get.c
View File

@ -50,7 +50,7 @@ reply_reserve_history_success (struct MHD_Connection *connection,
if (NULL == json_history) if (NULL == json_history)
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_RESERVE_STATUS_DB_ERROR, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
NULL); NULL);
json_balance = TALER_JSON_from_amount (&balance); json_balance = TALER_JSON_from_amount (&balance);
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
@ -142,7 +142,7 @@ TEH_handler_reserves_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_RESERVES_INVALID_RESERVE_PUB, TALER_EC_MERCHANT_GENERIC_RESERVE_PUB_MALFORMED,
args[0]); args[0]);
} }
rsc.rh = NULL; rsc.rh = NULL;
@ -158,7 +158,7 @@ TEH_handler_reserves_get (const struct TEH_RequestHandler *rh,
if (NULL == rsc.rh) if (NULL == rsc.rh)
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_RESERVE_STATUS_UNKNOWN, TALER_EC_EXCHANGE_RESERVES_GET_STATUS_UNKNOWN,
args[0]); args[0]);
mhd_ret = reply_reserve_history_success (connection, mhd_ret = reply_reserve_history_success (connection,
rsc.rh); rsc.rh);

2
src/exchange/taler-exchange-httpd_responses.c
View File

@ -445,7 +445,7 @@ TEH_RESPONSE_reply_coin_insufficient_funds (
GNUNET_break (0); GNUNET_break (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"Failed to generated proof of insufficient funds"); "Failed to generated proof of insufficient funds");
} }
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,

22
src/exchange/taler-exchange-httpd_transfers_get.c
View File

@ -105,7 +105,7 @@ reply_transfer_details (struct MHD_Connection *connection,
{ {
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_array() failed"); "json_array() failed");
} }
@ -144,7 +144,7 @@ reply_transfer_details (struct MHD_Connection *connection,
GNUNET_CRYPTO_hash_context_abort (hash_context); GNUNET_CRYPTO_hash_context_abort (hash_context);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_JSON_ALLOCATION_FAILURE, TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
"json_array_append_new() failed"); "json_array_append_new() failed");
} }
} }
@ -166,7 +166,7 @@ reply_transfer_details (struct MHD_Connection *connection,
json_decref (deposits); json_decref (deposits);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
@ -445,8 +445,8 @@ get_transfer_deposits (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_TRANSFERS_GET_DB_FETCH_FAILED, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "wire transfer");
} }
return qs; return qs;
} }
@ -455,15 +455,15 @@ get_transfer_deposits (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_TRANSFERS_GET_DB_INCONSISTENT, TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
NULL); "wire history malformed");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
if (GNUNET_NO == ctx->is_valid) if (GNUNET_NO == ctx->is_valid)
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_TRANSFERS_GET_WTID_NOT_FOUND, TALER_EC_EXCHANGE_TRANSFERS_GET_WTID_NOT_FOUND,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -484,7 +484,7 @@ get_transfer_deposits (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_TRANSFERS_GET_WIRE_FEE_NOT_FOUND, TALER_EC_EXCHANGE_TRANSFERS_GET_WIRE_FEE_NOT_FOUND,
NULL); NULL);
} }
return qs; return qs;
@ -497,7 +497,7 @@ get_transfer_deposits (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_TRANSFERS_GET_WIRE_FEE_INCONSISTENT, TALER_EC_EXCHANGE_TRANSFERS_GET_WIRE_FEE_INCONSISTENT,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -534,7 +534,7 @@ TEH_handler_transfers_get (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_TRANSFERS_INVALID_WTID, TALER_EC_EXCHANGE_TRANSFERS_GET_WTID_MALFORMED,
args[0]); args[0]);
} }
if (GNUNET_OK != if (GNUNET_OK !=

40
src/exchange/taler-exchange-httpd_withdraw.c
View File

@ -65,7 +65,7 @@ reply_withdraw_insufficient_funds (
if (NULL == json_history) if (NULL == json_history)
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_HISTORY_DB_ERROR_INSUFFICIENT_FUNDS, TALER_EC_EXCHANGE_WITHDRAW_HISTORY_ERROR_INSUFFICIENT_FUNDS,
NULL); NULL);
if (0 != if (0 !=
TALER_amount_cmp (&balance, TALER_amount_cmp (&balance,
@ -75,17 +75,17 @@ reply_withdraw_insufficient_funds (
json_decref (json_history); json_decref (json_history);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_RESERVE_BALANCE_CORRUPT, TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
NULL); "reserve balance corrupt");
} }
return TALER_MHD_reply_json_pack ( return TALER_MHD_reply_json_pack (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
"{s:s, s:I, s:o, s:o}", "{s:s, s:I, s:o, s:o}",
"hint", "hint",
TALER_ErrorCode_get_hint (TALER_EC_WITHDRAW_INSUFFICIENT_FUNDS), TALER_ErrorCode_get_hint (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS),
"code", "code",
(json_int_t) TALER_EC_WITHDRAW_INSUFFICIENT_FUNDS, (json_int_t) TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS,
"balance", "balance",
TALER_JSON_from_amount (&balance), TALER_JSON_from_amount (&balance),
"history", "history",
@ -198,8 +198,8 @@ withdraw_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "withdraw details");
wc->collectable.sig = denom_sig; wc->collectable.sig = denom_sig;
return qs; return qs;
} }
@ -233,15 +233,15 @@ withdraw_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "reserves");
return qs; return qs;
} }
if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
{ {
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_WITHDRAW_RESERVE_UNKNOWN, TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -275,8 +275,8 @@ withdraw_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_DB_FETCH_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED,
NULL); "reserve history");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
*mhd_ret = reply_withdraw_insufficient_funds (connection, *mhd_ret = reply_withdraw_insufficient_funds (connection,
@ -300,7 +300,7 @@ withdraw_transaction (void *cls,
GNUNET_break (0); GNUNET_break (0);
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_SIGNATURE_FAILED, TALER_EC_EXCHANGE_WITHDRAW_SIGNATURE_FAILED,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -320,8 +320,8 @@ withdraw_transaction (void *cls,
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_DB_STORE_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED,
NULL); "withdraw details");
return qs; return qs;
} }
return qs; return qs;
@ -371,7 +371,7 @@ TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_RESERVES_INVALID_RESERVE_PUB, TALER_EC_MERCHANT_GENERIC_RESERVE_PUB_MALFORMED,
args[0]); args[0]);
} }
@ -391,7 +391,7 @@ TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_EXCHANGE_BAD_CONFIGURATION, TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
"no keys"); "no keys");
} }
{ {
@ -431,7 +431,7 @@ TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
TEH_KS_release (wc.key_state); TEH_KS_release (wc.key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_AMOUNT_FEE_OVERFLOW, TALER_EC_EXCHANGE_WITHDRAW_AMOUNT_FEE_OVERFLOW,
NULL); NULL);
} }
TALER_amount_hton (&wc.wsrd.amount_with_fee, TALER_amount_hton (&wc.wsrd.amount_with_fee,
@ -460,7 +460,7 @@ TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
TEH_KS_release (wc.key_state); TEH_KS_release (wc.key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_WITHDRAW_RESERVE_SIGNATURE_INVALID, TALER_EC_EXCHANGE_WITHDRAW_RESERVE_SIGNATURE_INVALID,
NULL); NULL);
} }
@ -477,7 +477,7 @@ TEH_handler_withdraw (const struct TEH_RequestHandler *rh,
TEH_KS_release (wc.key_state); TEH_KS_release (wc.key_state);
return TALER_MHD_reply_with_error (connection, return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_WITHDRAW_SIGNATURE_FAILED, TALER_EC_EXCHANGE_WITHDRAW_SIGNATURE_FAILED,
NULL); NULL);
} }
#endif #endif

2
src/json/json.c
View File

@ -616,7 +616,7 @@ TALER_JSON_get_error_code (const json_t *json)
if (NULL == json) if (NULL == json)
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_EC_INVALID_RESPONSE; return TALER_EC_GENERIC_INVALID_RESPONSE;
} }
jc = json_object_get (json, "code"); jc = json_object_get (json, "code");
/* The caller already knows that the JSON represents an error, /* The caller already knows that the JSON represents an error,

2
src/lib/auditor_api_deposit_confirmation.c
View File

@ -96,7 +96,7 @@ handle_deposit_confirmation_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
hr.ec = TALER_EC_NONE; hr.ec = TALER_EC_NONE;

8
src/lib/auditor_api_exchanges.c
View File

@ -98,7 +98,7 @@ handle_exchanges_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
ja = json_object_get (json, ja = json_object_get (json,
@ -107,7 +107,7 @@ handle_exchanges_finished (void *cls,
(! json_is_array (ja)) ) (! json_is_array (ja)) )
{ {
GNUNET_break (0); GNUNET_break (0);
hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0; hr.http_status = 0;
break; break;
} }
@ -116,7 +116,7 @@ handle_exchanges_finished (void *cls,
if (ja_len > MAX_EXCHANGES) if (ja_len > MAX_EXCHANGES)
{ {
GNUNET_break (0); GNUNET_break (0);
hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0; hr.http_status = 0;
break; break;
} }
@ -141,7 +141,7 @@ handle_exchanges_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
ok = GNUNET_NO; ok = GNUNET_NO;
hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0; hr.http_status = 0;
break; break;
} }

8
src/lib/auditor_api_handle.c
View File

@ -212,7 +212,7 @@ decode_version_json (const json_t *resp_obj,
if (JSON_OBJECT != json_typeof (resp_obj)) if (JSON_OBJECT != json_typeof (resp_obj))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_EC_JSON_INVALID; return TALER_EC_GENERIC_JSON_INVALID;
} }
/* check the version */ /* check the version */
if (GNUNET_OK != if (GNUNET_OK !=
@ -221,7 +221,7 @@ decode_version_json (const json_t *resp_obj,
NULL, NULL)) NULL, NULL))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_EC_JSON_INVALID; return TALER_EC_GENERIC_JSON_INVALID;
} }
if (3 != sscanf (ver, if (3 != sscanf (ver,
"%u:%u:%u", "%u:%u:%u",
@ -230,7 +230,7 @@ decode_version_json (const json_t *resp_obj,
&age)) &age))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_EC_VERSION_MALFORMED; return TALER_EC_GENERIC_VERSION_MALFORMED;
} }
auditor->version = GNUNET_strdup (ver); auditor->version = GNUNET_strdup (ver);
vi->version = auditor->version; vi->version = auditor->version;
@ -307,7 +307,7 @@ version_completed_cb (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
TALER_LOG_WARNING ("NULL body for a 200-OK /version\n"); TALER_LOG_WARNING ("NULL body for a 200-OK /version\n");
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
} }
hr.ec = decode_version_json (resp_obj, hr.ec = decode_version_json (resp_obj,

10
src/lib/exchange_api_deposit.c
View File

@ -274,7 +274,7 @@ verify_deposit_signature_conflict (
ec = TALER_JSON_get_error_code (json); ec = TALER_JSON_get_error_code (json);
switch (ec) switch (ec)
{ {
case TALER_EC_DEPOSIT_INSUFFICIENT_FUNDS: case TALER_EC_EXCHANGE_DEPOSIT_INSUFFICIENT_FUNDS:
if (0 > if (0 >
TALER_amount_add (&total, TALER_amount_add (&total,
&total, &total,
@ -294,7 +294,7 @@ verify_deposit_signature_conflict (
} }
/* everything OK, proof of double-spending was provided */ /* everything OK, proof of double-spending was provided */
return GNUNET_OK; return GNUNET_OK;
case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY: case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 != GNUNET_memcmp (&dh->dki.h_key, if (0 != GNUNET_memcmp (&dh->dki.h_key,
&h_denom_pub)) &h_denom_pub))
return GNUNET_OK; /* indeed, proof with different denomination key provided */ return GNUNET_OK; /* indeed, proof with different denomination key provided */
@ -336,7 +336,7 @@ handle_deposit_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -347,7 +347,7 @@ handle_deposit_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
} }
else else
{ {
@ -369,7 +369,7 @@ handle_deposit_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
} }
else else
{ {

8
src/lib/exchange_api_deposits_get.c
View File

@ -142,7 +142,7 @@ handle_deposit_wtid_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
@ -163,7 +163,7 @@ handle_deposit_wtid_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_DEPOSITS_INVALID_BODY_BY_EXCHANGE; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
dwh->depconf.execution_time = GNUNET_TIME_absolute_hton ( dwh->depconf.execution_time = GNUNET_TIME_absolute_hton (
@ -178,7 +178,7 @@ handle_deposit_wtid_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_DEPOSITS_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_SIGNATURE_BY_EXCHANGE;
} }
else else
{ {
@ -207,7 +207,7 @@ handle_deposit_wtid_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_DEPOSITS_INVALID_BODY_BY_EXCHANGE; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
else else

2
src/lib/exchange_api_handle.c
View File

@ -1326,7 +1326,7 @@ keys_completed_cb (void *cls,
{ {
TALER_LOG_ERROR ("Could not decode /keys response\n"); TALER_LOG_ERROR ("Could not decode /keys response\n");
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_KEYS_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
for (unsigned int i = 0; i<kd.num_auditors; i++) for (unsigned int i = 0; i<kd.num_auditors; i++)
{ {
struct TALER_EXCHANGE_AuditorInformation *anew = &kd.auditors[i]; struct TALER_EXCHANGE_AuditorInformation *anew = &kd.auditors[i];

4
src/lib/exchange_api_link.c
View File

@ -364,7 +364,7 @@ handle_link_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -373,7 +373,7 @@ handle_link_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_LINK_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
GNUNET_assert (NULL == lh->link_cb); GNUNET_assert (NULL == lh->link_cb);

18
src/lib/exchange_api_melt.c
View File

@ -282,7 +282,7 @@ verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
ec = TALER_JSON_get_error_code (json); ec = TALER_JSON_get_error_code (json);
switch (ec) switch (ec)
{ {
case TALER_EC_MELT_INSUFFICIENT_FUNDS: case TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS:
/* check if melt operation was really too expensive given history */ /* check if melt operation was really too expensive given history */
if (0 > if (0 >
TALER_amount_add (&total, TALER_amount_add (&total,
@ -304,7 +304,7 @@ verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
/* everything OK, valid proof of double-spending was provided */ /* everything OK, valid proof of double-spending was provided */
return GNUNET_OK; return GNUNET_OK;
case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY: case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 != GNUNET_memcmp (&mh->dki.h_key, if (0 != GNUNET_memcmp (&mh->dki.h_key,
&h_denom_pub)) &h_denom_pub))
return GNUNET_OK; /* indeed, proof with different denomination key provided */ return GNUNET_OK; /* indeed, proof with different denomination key provided */
@ -345,7 +345,7 @@ handle_melt_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -356,7 +356,7 @@ handle_melt_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
} }
if (NULL != mh->melt_cb) if (NULL != mh->melt_cb)
{ {
@ -379,7 +379,7 @@ handle_melt_finished (void *cls,
hr.ec = TALER_JSON_get_error_code (j); hr.ec = TALER_JSON_get_error_code (j);
switch (hr.ec) switch (hr.ec)
{ {
case TALER_EC_MELT_INSUFFICIENT_FUNDS: case TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS:
/* Double spending; check signatures on transaction history */ /* Double spending; check signatures on transaction history */
if (GNUNET_OK != if (GNUNET_OK !=
verify_melt_signature_spend_conflict (mh, verify_melt_signature_spend_conflict (mh,
@ -387,25 +387,25 @@ handle_melt_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j); hr.hint = TALER_JSON_get_error_hint (j);
} }
break; break;
case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY: case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (GNUNET_OK != if (GNUNET_OK !=
verify_melt_signature_denom_conflict (mh, verify_melt_signature_denom_conflict (mh,
j)) j))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j); hr.hint = TALER_JSON_get_error_hint (j);
} }
break; break;
default: default:
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j); hr.hint = TALER_JSON_get_error_hint (j);
break; break;
} }

19
src/lib/exchange_api_recoup.c
View File

@ -162,7 +162,7 @@ handle_recoup_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -170,7 +170,7 @@ handle_recoup_finished (void *cls,
j)) j))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0; hr.http_status = 0;
break; break;
} }
@ -204,7 +204,7 @@ handle_recoup_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
} }
else else
{ {
@ -214,7 +214,7 @@ handle_recoup_finished (void *cls,
ec = TALER_JSON_get_error_code (j); ec = TALER_JSON_get_error_code (j);
switch (ec) switch (ec)
{ {
case TALER_EC_RECOUP_COIN_BALANCE_ZERO: case TALER_EC_EXCHANGE_RECOUP_COIN_BALANCE_ZERO:
if (0 > TALER_amount_cmp (&total, if (0 > TALER_amount_cmp (&total,
&dki->value)) &dki->value))
{ {
@ -224,20 +224,21 @@ handle_recoup_finished (void *cls,
exchange is here. We should look at the key exchange is here. We should look at the key
structure of ph->exchange, and find the smallest structure of ph->exchange, and find the smallest
_currently withdrawable_ denomination and check _currently withdrawable_ denomination and check
if the value remaining would suffice... */GNUNET_break_op (0); if the value remaining would suffice... *///
GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
break; break;
case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY: case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 == GNUNET_memcmp (&ph->pk.h_key, if (0 == GNUNET_memcmp (&ph->pk.h_key,
&h_denom_pub)) &h_denom_pub))
{ {
/* invalid proof provided */ /* invalid proof provided */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
/* valid error from exchange */ /* valid error from exchange */
@ -245,7 +246,7 @@ handle_recoup_finished (void *cls,
default: default:
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
ph->cb (ph->cb_cls, ph->cb (ph->cb_cls,

4
src/lib/exchange_api_refreshes_reveal.c
View File

@ -211,7 +211,7 @@ handle_refresh_reveal_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
@ -225,7 +225,7 @@ handle_refresh_reveal_finished (void *cls,
if (GNUNET_OK != ret) if (GNUNET_OK != ret)
{ {
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_REVEAL_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
} }
else else
{ {

8
src/lib/exchange_api_refund.c
View File

@ -533,7 +533,7 @@ handle_refund_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -544,7 +544,7 @@ handle_refund_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_REFUND_INVALID_SIGNATURE_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_SIGNATURE_BY_EXCHANGE;
} }
else else
{ {
@ -581,7 +581,7 @@ handle_refund_finished (void *cls,
{ {
GNUNET_break (0); GNUNET_break (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
hr.hint = "conflict information provided by exchange is invalid"; hr.hint = "conflict information provided by exchange is invalid";
break; break;
} }
@ -601,7 +601,7 @@ handle_refund_finished (void *cls,
{ {
GNUNET_break (0); GNUNET_break (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE; hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
hr.hint = "failed precondition proof returned by exchange is invalid"; hr.hint = "failed precondition proof returned by exchange is invalid";
break; break;
} }

4
src/lib/exchange_api_reserves_get.c
View File

@ -182,7 +182,7 @@ handle_reserves_get_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -190,7 +190,7 @@ handle_reserves_get_finished (void *cls,
j)) j))
{ {
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_RESERVE_STATUS_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
} }
break; break;
case MHD_HTTP_BAD_REQUEST: case MHD_HTTP_BAD_REQUEST:

4
src/lib/exchange_api_transfers_get.c
View File

@ -276,7 +276,7 @@ handle_transfers_get_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK == if (GNUNET_OK ==
@ -284,7 +284,7 @@ handle_transfers_get_finished (void *cls,
j)) j))
return; return;
GNUNET_break_op (0); GNUNET_break_op (0);
hr.ec = TALER_EC_TRANSFERS_GET_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0; hr.http_status = 0;
break; break;
case MHD_HTTP_BAD_REQUEST: case MHD_HTTP_BAD_REQUEST:

16
src/lib/exchange_api_wire.c
View File

@ -219,7 +219,7 @@ handle_wire_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
@ -242,7 +242,7 @@ handle_wire_finished (void *cls,
/* bogus reply */ /* bogus reply */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
if (0 == (num_accounts = json_array_size (accounts))) if (0 == (num_accounts = json_array_size (accounts)))
@ -251,7 +251,7 @@ handle_wire_finished (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
if (NULL == (fm = parse_fees (fees))) if (NULL == (fm = parse_fees (fees)))
@ -260,7 +260,7 @@ handle_wire_finished (void *cls,
GNUNET_break_op (0); GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec); GNUNET_JSON_parse_free (spec);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
@ -289,7 +289,7 @@ handle_wire_finished (void *cls,
/* bogus reply */ /* bogus reply */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_SIGNATURE_INVALID; hr.ec = TALER_EC_EXCHANGE_WIRE_SIGNATURE_INVALID;
break; break;
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -300,7 +300,7 @@ handle_wire_finished (void *cls,
/* bogus reply */ /* bogus reply */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
if (NULL == (method = TALER_payto_get_method (wa->payto_uri))) if (NULL == (method = TALER_payto_get_method (wa->payto_uri)))
@ -308,7 +308,7 @@ handle_wire_finished (void *cls,
/* bogus reply */ /* bogus reply */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
if (NULL == (wa->fees = lookup_fee (fm, if (NULL == (wa->fees = lookup_fee (fm,
@ -317,7 +317,7 @@ handle_wire_finished (void *cls,
/* bogus reply */ /* bogus reply */
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_SERVER_JSON_INVALID; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
GNUNET_free (method); GNUNET_free (method);
break; break;
} }

2
src/lib/exchange_api_withdraw.c
View File

@ -113,7 +113,7 @@ handle_reserve_withdraw_finished (
struct TALER_EXCHANGE_HttpResponse hrx = { struct TALER_EXCHANGE_HttpResponse hrx = {
.reply = hr->reply, .reply = hr->reply,
.http_status = 0, .http_status = 0,
.ec = TALER_EC_WITHDRAW_UNBLIND_FAILURE .ec = TALER_EC_EXCHANGE_WITHDRAW_UNBLIND_FAILURE
}; };
wh->cb (wh->cb_cls, wh->cb (wh->cb_cls,

6
src/lib/exchange_api_withdraw2.c
View File

@ -254,7 +254,7 @@ handle_reserve_withdraw_finished (void *cls,
switch (response_code) switch (response_code)
{ {
case 0: case 0:
hr.ec = TALER_EC_INVALID_RESPONSE; hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
if (GNUNET_OK != if (GNUNET_OK !=
@ -263,7 +263,7 @@ handle_reserve_withdraw_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_WITHDRAW_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break; break;
} }
GNUNET_assert (NULL == wh->cb); GNUNET_assert (NULL == wh->cb);
@ -284,7 +284,7 @@ handle_reserve_withdraw_finished (void *cls,
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
hr.http_status = 0; hr.http_status = 0;
hr.ec = TALER_EC_WITHDRAW_REPLY_MALFORMED; hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
} }
else else
{ {

27
src/mhd/mhd_parsing.c
View File

@ -79,7 +79,7 @@ TALER_MHD_parse_post_json (struct MHD_Connection *connection,
TALER_MHD_reply_with_error ( TALER_MHD_reply_with_error (
connection, connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_PARSER_OUT_OF_MEMORY, TALER_EC_GENERIC_PARSER_OUT_OF_MEMORY,
NULL)) ? GNUNET_SYSERR : GNUNET_NO; NULL)) ? GNUNET_SYSERR : GNUNET_NO;
case GNUNET_JSON_PR_CONTINUE: case GNUNET_JSON_PR_CONTINUE:
@ -95,7 +95,7 @@ TALER_MHD_parse_post_json (struct MHD_Connection *connection,
return (MHD_YES == return (MHD_YES ==
TALER_MHD_reply_with_error (connection, TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_JSON_INVALID, TALER_EC_GENERIC_JSON_INVALID,
NULL)) NULL))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
case GNUNET_JSON_PR_SUCCESS: case GNUNET_JSON_PR_SUCCESS:
@ -153,7 +153,7 @@ TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
return (MHD_NO == return (MHD_NO ==
TALER_MHD_reply_with_error (connection, TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_PARAMETER_MISSING, TALER_EC_GENERIC_PARAMETER_MISSING,
param_name)) param_name))
? GNUNET_SYSERR : GNUNET_NO; ? GNUNET_SYSERR : GNUNET_NO;
} }
@ -165,7 +165,7 @@ TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
return (MHD_NO == return (MHD_NO ==
TALER_MHD_reply_with_error (connection, TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_PARAMETER_MALFORMED, TALER_EC_GENERIC_PARAMETER_MALFORMED,
param_name)) param_name))
? GNUNET_SYSERR : GNUNET_NO; ? GNUNET_SYSERR : GNUNET_NO;
return GNUNET_OK; return GNUNET_OK;
@ -208,9 +208,8 @@ TALER_MHD_parse_json_data (struct MHD_Connection *connection,
connection, connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
"{s:s, s:I, s:s, s:I}", "{s:s, s:I, s:s, s:I}",
"hint", TALER_ErrorCode_get_hint ( "hint", TALER_ErrorCode_get_hint (TALER_EC_GENERIC_JSON_INVALID),
TALER_EC_JSON_INVALID_WITH_DETAILS), "code", (json_int_t) TALER_EC_GENERIC_JSON_INVALID,
"code", (json_int_t) TALER_EC_JSON_INVALID_WITH_DETAILS,
"field", error_json_name, "field", error_json_name,
"line", (json_int_t) error_line)) "line", (json_int_t) error_line))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
@ -261,8 +260,8 @@ TALER_MHD_parse_internal_json_data (struct MHD_Connection *connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
"{s:s, s:I, s:s, s:I}", "{s:s, s:I, s:s, s:I}",
"hint", TALER_ErrorCode_get_hint ( "hint", TALER_ErrorCode_get_hint (
TALER_EC_INTERNAL_INVARIANT_FAILURE), TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE),
"code", (json_int_t) TALER_EC_INTERNAL_INVARIANT_FAILURE, "code", (json_int_t) TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
"field", error_json_name, "field", error_json_name,
"line", (json_int_t) error_line)) "line", (json_int_t) error_line))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
@ -315,9 +314,8 @@ TALER_MHD_parse_json_array (struct MHD_Connection *connection,
connection, connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
"{s:s, s:I, s:s, s:I}", "{s:s, s:I, s:s, s:I}",
"hint", TALER_ErrorCode_get_hint ( "hint", TALER_ErrorCode_get_hint (TALER_EC_GENERIC_JSON_INVALID),
TALER_EC_JSON_INVALID_WITH_DETAILS), "code", (json_int_t) TALER_EC_GENERIC_JSON_INVALID,
"code", (json_int_t) TALER_EC_JSON_INVALID_WITH_DETAILS,
"detail", "expected array", "detail", "expected array",
"dimension", dim)) "dimension", dim))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
@ -337,9 +335,8 @@ TALER_MHD_parse_json_array (struct MHD_Connection *connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
"{s:s, s:s, s:I, s:I}", "{s:s, s:s, s:I, s:I}",
"detail", error_json_name, "detail", error_json_name,
"hint", TALER_ErrorCode_get_hint ( "hint", TALER_ErrorCode_get_hint (TALER_EC_GENERIC_JSON_INVALID),
TALER_EC_JSON_INVALID_WITH_DETAILS), "code", (json_int_t) TALER_EC_GENERIC_JSON_INVALID,
"code", (json_int_t) TALER_EC_JSON_INVALID_WITH_DETAILS,
"line", (json_int_t) error_line)) "line", (json_int_t) error_line))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
return ret; return ret;

4
src/testing/testing_api_cmd_auditor_deposit_confirmation.c
View File

@ -153,7 +153,7 @@ deposit_confirmation_cb (void *cls,
{ {
dcs->do_retry--; dcs->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -161,7 +161,7 @@ deposit_confirmation_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
dcs->backoff = GNUNET_TIME_UNIT_ZERO; dcs->backoff = GNUNET_TIME_UNIT_ZERO;
else else
dcs->backoff = GNUNET_TIME_randomized_backoff (dcs->backoff, dcs->backoff = GNUNET_TIME_randomized_backoff (dcs->backoff,

4
src/testing/testing_api_cmd_auditor_exchanges.c
View File

@ -146,7 +146,7 @@ exchanges_cb (void *cls,
{ {
es->do_retry--; es->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -154,7 +154,7 @@ exchanges_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
es->backoff = GNUNET_TIME_UNIT_ZERO; es->backoff = GNUNET_TIME_UNIT_ZERO;
else else
es->backoff = GNUNET_TIME_randomized_backoff (es->backoff, es->backoff = GNUNET_TIME_randomized_backoff (es->backoff,

4
src/testing/testing_api_cmd_bank_admin_add_incoming.c
View File

@ -246,7 +246,7 @@ confirmation_cb (void *cls,
{ {
fts->do_retry--; fts->do_retry--;
if ( (0 == http_status) || if ( (0 == http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) )
{ {
GNUNET_log ( GNUNET_log (
@ -255,7 +255,7 @@ confirmation_cb (void *cls,
http_status, http_status,
(int) ec); (int) ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec)
fts->backoff = GNUNET_TIME_UNIT_ZERO; fts->backoff = GNUNET_TIME_UNIT_ZERO;
else else
fts->backoff = GNUNET_TIME_randomized_backoff (fts->backoff, fts->backoff = GNUNET_TIME_randomized_backoff (fts->backoff,

4
src/testing/testing_api_cmd_bank_transfer.c
View File

@ -187,7 +187,7 @@ confirmation_cb (void *cls,
{ {
fts->do_retry--; fts->do_retry--;
if ( (0 == http_status) || if ( (0 == http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -195,7 +195,7 @@ confirmation_cb (void *cls,
http_status, http_status,
(int) ec); (int) ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec)
fts->backoff = GNUNET_TIME_UNIT_ZERO; fts->backoff = GNUNET_TIME_UNIT_ZERO;
else else
fts->backoff = EXCHANGE_LIB_BACKOFF (fts->backoff); fts->backoff = EXCHANGE_LIB_BACKOFF (fts->backoff);

4
src/testing/testing_api_cmd_deposit.c
View File

@ -230,7 +230,7 @@ deposit_cb (void *cls,
{ {
ds->do_retry--; ds->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -238,7 +238,7 @@ deposit_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
ds->backoff = GNUNET_TIME_UNIT_ZERO; ds->backoff = GNUNET_TIME_UNIT_ZERO;
else else
ds->backoff = GNUNET_TIME_randomized_backoff (ds->backoff, ds->backoff = GNUNET_TIME_randomized_backoff (ds->backoff,

12
src/testing/testing_api_cmd_refresh.c
View File

@ -355,7 +355,7 @@ reveal_cb (void *cls,
{ {
rrs->do_retry--; rrs->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -363,7 +363,7 @@ reveal_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
rrs->backoff = GNUNET_TIME_UNIT_ZERO; rrs->backoff = GNUNET_TIME_UNIT_ZERO;
else else
rrs->backoff = GNUNET_TIME_randomized_backoff (rrs->backoff, rrs->backoff = GNUNET_TIME_randomized_backoff (rrs->backoff,
@ -592,7 +592,7 @@ link_cb (void *cls,
{ {
rls->do_retry--; rls->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -600,7 +600,7 @@ link_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
rls->backoff = GNUNET_TIME_UNIT_ZERO; rls->backoff = GNUNET_TIME_UNIT_ZERO;
else else
rls->backoff = GNUNET_TIME_randomized_backoff (rls->backoff, rls->backoff = GNUNET_TIME_randomized_backoff (rls->backoff,
@ -895,7 +895,7 @@ melt_cb (void *cls,
{ {
rms->do_retry--; rms->do_retry--;
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -903,7 +903,7 @@ melt_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
rms->backoff = GNUNET_TIME_UNIT_ZERO; rms->backoff = GNUNET_TIME_UNIT_ZERO;
else else
rms->backoff = GNUNET_TIME_randomized_backoff (rms->backoff, rms->backoff = GNUNET_TIME_randomized_backoff (rms->backoff,

12
src/testing/testing_api_cmd_withdraw.c
View File

@ -194,12 +194,12 @@ reserve_withdraw_cb (void *cls,
{ {
if (0 != ws->do_retry) if (0 != ws->do_retry)
{ {
if (TALER_EC_WITHDRAW_RESERVE_UNKNOWN != hr->ec) if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != hr->ec)
ws->do_retry--; /* we don't count reserve unknown as failures here */ ws->do_retry--; /* we don't count reserve unknown as failures here */
if ( (0 == hr->http_status) || if ( (0 == hr->http_status) ||
(TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) || (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
(TALER_EC_WITHDRAW_INSUFFICIENT_FUNDS == hr->ec) || (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS == hr->ec) ||
(TALER_EC_WITHDRAW_RESERVE_UNKNOWN == hr->ec) || (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN == hr->ec) ||
(MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) ) (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -207,9 +207,9 @@ reserve_withdraw_cb (void *cls,
hr->http_status, hr->http_status,
(int) hr->ec); (int) hr->ec);
/* on DB conflicts, do not use backoff */ /* on DB conflicts, do not use backoff */
if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == hr->ec) if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
ws->backoff = GNUNET_TIME_UNIT_ZERO; ws->backoff = GNUNET_TIME_UNIT_ZERO;
else if (TALER_EC_WITHDRAW_RESERVE_UNKNOWN != hr->ec) else if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != hr->ec)
ws->backoff = EXCHANGE_LIB_BACKOFF (ws->backoff); ws->backoff = EXCHANGE_LIB_BACKOFF (ws->backoff);
else else
ws->backoff = GNUNET_TIME_relative_max (UNKNOWN_MIN_BACKOFF, ws->backoff = GNUNET_TIME_relative_max (UNKNOWN_MIN_BACKOFF,