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

introduce TALER_JSON_pack_ec

Browse Source
This commit is contained in:
Christian Grothoff 2021-08-01 15:36:38 +02:00
parent f1f0bf637b
commit d45774ccec
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
6 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,7 @@ reply_melt_insufficient_funds (
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS),
TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS)),
GNUNET_JSON_pack_uint64 ("code",
TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS),
GNUNET_JSON_pack_data_auto ("coin_pub", GNUNET_JSON_pack_data_auto ("coin_pub",
coin_pub), coin_pub),
TALER_JSON_pack_amount ("original_value", TALER_JSON_pack_amount ("original_value",

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

@ -387,10 +387,7 @@ refreshes_reveal_transaction (void *cls,
*mhd_ret = TALER_MHD_REPLY_JSON_PACK ( *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (
TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_REFRESHES_REVEAL_COMMITMENT_VIOLATION)),
GNUNET_JSON_pack_uint64 ("code",
TALER_EC_EXCHANGE_REFRESHES_REVEAL_COMMITMENT_VIOLATION), TALER_EC_EXCHANGE_REFRESHES_REVEAL_COMMITMENT_VIOLATION),
GNUNET_JSON_pack_data_auto ("rc_expected", GNUNET_JSON_pack_data_auto ("rc_expected",
&rc_expected)); &rc_expected));

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

@ -233,11 +233,7 @@ refund_transaction (void *cls,
MHD_HTTP_PRECONDITION_FAILED, MHD_HTTP_PRECONDITION_FAILED,
TALER_JSON_pack_amount ("detail", TALER_JSON_pack_amount ("detail",
&ref->refund_amount), &ref->refund_amount),
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT),
TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT)),
GNUNET_JSON_pack_uint64 ("code",
TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT),
GNUNET_JSON_pack_array_steal ("history", GNUNET_JSON_pack_array_steal ("history",
TEH_RESPONSE_compile_transaction_history ( TEH_RESPONSE_compile_transaction_history (
&refund->coin.coin_pub, &refund->coin.coin_pub,
@ -332,10 +328,7 @@ refund_transaction (void *cls,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
GNUNET_JSON_pack_string ("detail", GNUNET_JSON_pack_string ("detail",
"total amount refunded exceeds total amount deposited for this coin"), "total amount refunded exceeds total amount deposited for this coin"),
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (
TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT)),
GNUNET_JSON_pack_uint64 ("code",
TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT), TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT),
GNUNET_JSON_pack_array_steal ("history", GNUNET_JSON_pack_array_steal ("history",
TEH_RESPONSE_compile_transaction_history ( TEH_RESPONSE_compile_transaction_history (

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

@ -450,8 +450,7 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash (
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
GNUNET_JSON_pack_uint64 ("code", TALER_JSON_pack_ec (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN),
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN),
GNUNET_JSON_pack_time_abs ("timestamp", GNUNET_JSON_pack_time_abs ("timestamp",
now), now),
GNUNET_JSON_pack_data_auto ("exchange_pub", GNUNET_JSON_pack_data_auto ("exchange_pub",
@ -501,8 +500,7 @@ TEH_RESPONSE_reply_expired_denom_pub_hash (
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_GONE, MHD_HTTP_GONE,
GNUNET_JSON_pack_uint64 ("code", TALER_JSON_pack_ec (ec),
ec),
GNUNET_JSON_pack_string ("oper", GNUNET_JSON_pack_string ("oper",
oper), oper),
GNUNET_JSON_pack_time_abs ("timestamp", GNUNET_JSON_pack_time_abs ("timestamp",
@ -550,10 +548,7 @@ TEH_RESPONSE_reply_coin_insufficient_funds (
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (ec),
TALER_ErrorCode_get_hint (ec)),
GNUNET_JSON_pack_uint64 ("code",
ec),
GNUNET_JSON_pack_array_steal ("history", GNUNET_JSON_pack_array_steal ("history",
history)); history));
} }

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

@ -81,11 +81,7 @@ reply_withdraw_insufficient_funds (
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
GNUNET_JSON_pack_string ("hint", TALER_JSON_pack_ec (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS),
TALER_ErrorCode_get_hint (
TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS)),
GNUNET_JSON_pack_uint64 ("code",
TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS),
TALER_JSON_pack_amount ("balance", TALER_JSON_pack_amount ("balance",
&balance), &balance),
GNUNET_JSON_pack_array_steal ("history", GNUNET_JSON_pack_array_steal ("history",

10
src/include/taler_json_lib.h
View File

@ -79,6 +79,16 @@ TALER_JSON_pack_time_abs_nbo (const char *name,
struct GNUNET_TIME_AbsoluteNBO at); struct GNUNET_TIME_AbsoluteNBO at);
/**
* Put an error code into a JSON reply, including
* both the numeric value and the hint.
*
* @param ec error code to encode using canonical field names
*/
#define TALER_JSON_pack_ec(ec) \
GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec)), \
GNUNET_JSON_pack_uint64 ("code", ec)
/** /**
* Generate packer instruction for a JSON field of type * Generate packer instruction for a JSON field of type
* absolute time creating a human-readable timestamp. * absolute time creating a human-readable timestamp.