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

H_wire -> h_wire (#6032)

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-09 09:50:35 +01:00
parent ea9c15026a
commit 9e206f533f
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,7 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh,
GNUNET_JSON_spec_fixed_auto ("coin_pub", &deposit.coin.coin_pub), GNUNET_JSON_spec_fixed_auto ("coin_pub", &deposit.coin.coin_pub),
GNUNET_JSON_spec_fixed_auto ("merchant_pub", &deposit.merchant_pub), GNUNET_JSON_spec_fixed_auto ("merchant_pub", &deposit.merchant_pub),
GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &deposit.h_contract_terms), GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &deposit.h_contract_terms),
GNUNET_JSON_spec_fixed_auto ("H_wire", &deposit.h_wire), GNUNET_JSON_spec_fixed_auto ("h_wire", &deposit.h_wire),
GNUNET_JSON_spec_fixed_auto ("coin_sig", &deposit.csig), GNUNET_JSON_spec_fixed_auto ("coin_sig", &deposit.csig),
GNUNET_JSON_spec_absolute_time ("timestamp", &deposit.timestamp), GNUNET_JSON_spec_absolute_time ("timestamp", &deposit.timestamp),
GNUNET_JSON_spec_absolute_time ("refund_deadline", GNUNET_JSON_spec_absolute_time ("refund_deadline",
@ -502,7 +502,7 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh,
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_DEPOSIT_INVALID_WIRE_FORMAT_CONTRACT_HASH_CONFLICT,
"H_wire"); "h_wire");
} }
/* check denomination exists and is valid */ /* check denomination exists and is valid */

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

@ -357,7 +357,7 @@ TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh,
struct TALER_DepositTrackPS tps; struct TALER_DepositTrackPS tps;
struct TALER_MerchantSignatureP merchant_sig; struct TALER_MerchantSignatureP merchant_sig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_fixed_auto ("H_wire", &tps.h_wire), GNUNET_JSON_spec_fixed_auto ("h_wire", &tps.h_wire),
GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &tps.h_contract_terms), GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &tps.h_contract_terms),
GNUNET_JSON_spec_fixed_auto ("coin_pub", &tps.coin_pub), GNUNET_JSON_spec_fixed_auto ("coin_pub", &tps.coin_pub),
GNUNET_JSON_spec_fixed_auto ("merchant_pub", &tps.merchant), GNUNET_JSON_spec_fixed_auto ("merchant_pub", &tps.merchant),

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

@ -164,7 +164,7 @@ reply_track_transfer_details (struct MHD_Connection *connection,
"merchant_pub", "merchant_pub",
GNUNET_JSON_from_data_auto ( GNUNET_JSON_from_data_auto (
merchant_pub), merchant_pub),
"H_wire", GNUNET_JSON_from_data_auto ( "h_wire", GNUNET_JSON_from_data_auto (
h_wire), h_wire),
"execution_time", "execution_time",
GNUNET_JSON_from_time_abs (exec_time), GNUNET_JSON_from_time_abs (exec_time),

2
src/lib/auditor_api_deposit_confirmation.c
View File

@ -312,7 +312,7 @@ TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor,
} }
deposit_confirmation_obj deposit_confirmation_obj
= json_pack ("{s:o, s:o," /* H_wire, h_contract_terms */ = json_pack ("{s:o, s:o," /* h_wire, h_contract_terms */
" s:o, s:o," /* timestamp, refund_deadline */ " s:o, s:o," /* timestamp, refund_deadline */
" s:o, s:o," /* amount_without_fees, coin_pub */ " s:o, s:o," /* amount_without_fees, coin_pub */
" s:o, s:o," /* merchant_pub, exchange_sig */ " s:o, s:o," /* merchant_pub, exchange_sig */

4
src/lib/exchange_api_deposit.c
View File

@ -554,7 +554,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange,
} }
deposit_obj = json_pack ("{s:o, s:O," /* f/wire */ deposit_obj = json_pack ("{s:o, s:O," /* f/wire */
" s:o, s:o," /* H_wire, h_contract_terms */ " s:o, s:o," /* h_wire, h_contract_terms */
" s:o, s:o," /* coin_pub, denom_pub */ " s:o, s:o," /* coin_pub, denom_pub */
" s:o, s:o," /* ub_sig, timestamp */ " s:o, s:o," /* ub_sig, timestamp */
" s:o," /* merchant_pub */ " s:o," /* merchant_pub */
@ -562,7 +562,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange,
" s:o}", /* coin_sig */ " s:o}", /* coin_sig */
"contribution", 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", GNUNET_JSON_from_data_auto (
h_contract_terms), h_contract_terms),
"coin_pub", GNUNET_JSON_from_data_auto (coin_pub), "coin_pub", GNUNET_JSON_from_data_auto (coin_pub),

4
src/lib/exchange_api_track_transaction.c
View File

@ -301,10 +301,10 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange,
GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv, GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv,
&dtp.purpose, &dtp.purpose,
&merchant_sig.eddsa_sig)); &merchant_sig.eddsa_sig));
deposit_wtid_obj = json_pack ("{s:o, s:o," /* H_wire, h_contract_terms */ deposit_wtid_obj = json_pack ("{s:o, s:o," /* h_wire, h_contract_terms */
" s:o," /* coin_pub */ " s:o," /* coin_pub */
" s:o, s:o}", /* merchant_pub, merchant_sig */ " s:o, s:o}", /* merchant_pub, merchant_sig */
"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", GNUNET_JSON_from_data_auto (
h_contract_terms), h_contract_terms),
"coin_pub", GNUNET_JSON_from_data_auto ( "coin_pub", GNUNET_JSON_from_data_auto (

2
src/lib/exchange_api_track_transfer.c
View File

@ -98,7 +98,7 @@ check_track_transfer_response_ok (struct
TALER_JSON_spec_amount ("total", &total_amount), TALER_JSON_spec_amount ("total", &total_amount),
TALER_JSON_spec_amount ("wire_fee", &wire_fee), TALER_JSON_spec_amount ("wire_fee", &wire_fee),
GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub), GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub),
GNUNET_JSON_spec_fixed_auto ("H_wire", &h_wire), GNUNET_JSON_spec_fixed_auto ("h_wire", &h_wire),
GNUNET_JSON_spec_absolute_time ("execution_time", &exec_time), GNUNET_JSON_spec_absolute_time ("execution_time", &exec_time),
GNUNET_JSON_spec_json ("deposits", &details_j), GNUNET_JSON_spec_json ("deposits", &details_j),
GNUNET_JSON_spec_fixed_auto ("exchange_sig", &exchange_sig), GNUNET_JSON_spec_fixed_auto ("exchange_sig", &exchange_sig),