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

change 'f' to 'contribution' in /deposit

Browse Source
This commit is contained in:
Christian Grothoff 2018-01-01 22:10:26 +01:00
parent 346c351e5f
commit 4f2ad1051b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange-lib/exchange_api_deposit.c
View File

@ -454,7 +454,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange,
" s:o," /* merchant_pub */ " s:o," /* merchant_pub */
" s:o, s:o," /* refund_deadline, wire_deadline */ " s:o, s:o," /* refund_deadline, wire_deadline */
" s:o}", /* coin_sig */ " s:o}", /* coin_sig */
"f", TALER_JSON_from_amount (amount), "contribution", TALER_JSON_from_amount (amount),
"wire", wire_details, "wire", wire_details,
"H_wire", GNUNET_JSON_from_data_auto (&h_wire), "H_wire", GNUNET_JSON_from_data_auto (&h_wire),
"h_contract_terms", GNUNET_JSON_from_data_auto (h_contract_terms), "h_contract_terms", GNUNET_JSON_from_data_auto (h_contract_terms),

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

@ -149,6 +149,8 @@ deposit_transaction (void *cls,
{ {
struct TALER_Amount amount_without_fee; struct TALER_Amount amount_without_fee;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"/deposit replay, accepting again!\n");
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_subtract (&amount_without_fee, TALER_amount_subtract (&amount_without_fee,
&deposit->amount_with_fee, &deposit->amount_with_fee,
@ -191,6 +193,8 @@ deposit_transaction (void *cls,
if (0 < TALER_amount_cmp (&spent, if (0 < TALER_amount_cmp (&spent,
&dc->value)) &dc->value))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"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_DEPOSIT_INSUFFICIENT_FUNDS,
tl); tl);
@ -376,7 +380,7 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh,
struct GNUNET_HashCode my_h_wire; struct GNUNET_HashCode my_h_wire;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_json ("wire", &wire), GNUNET_JSON_spec_json ("wire", &wire),
TALER_JSON_spec_amount ("f", &deposit.amount_with_fee), TALER_JSON_spec_amount ("contribution", &deposit.amount_with_fee),
TALER_JSON_spec_denomination_public_key ("denom_pub", &deposit.coin.denom_pub), TALER_JSON_spec_denomination_public_key ("denom_pub", &deposit.coin.denom_pub),
TALER_JSON_spec_denomination_signature ("ub_sig", &deposit.coin.denom_sig), TALER_JSON_spec_denomination_signature ("ub_sig", &deposit.coin.denom_sig),
GNUNET_JSON_spec_fixed_auto ("coin_pub", &deposit.coin.coin_pub), GNUNET_JSON_spec_fixed_auto ("coin_pub", &deposit.coin.coin_pub),

1
src/include/taler_error_codes.h
View File

@ -1001,6 +1001,7 @@ enum TALER_ErrorCode
TALER_EC_PAY_REFUND_DEADLINE_PAST_WIRE_TRANSFER_DEADLINE = 2114, TALER_EC_PAY_REFUND_DEADLINE_PAST_WIRE_TRANSFER_DEADLINE = 2114,
/** /**
* The request fails to provide coins for the payment. * The request fails to provide coins for the payment.
* This response is provided with HTTP status code * This response is provided with HTTP status code
* MHD_HTTP_BAD_REQUEST. * MHD_HTTP_BAD_REQUEST.