From 9e206f533f28a1ea1a4ac57c138924e61f4ae80c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 9 Jan 2020 09:50:35 +0100 Subject: H_wire -> h_wire (#6032) --- src/exchange/taler-exchange-httpd_deposit.c | 4 ++-- src/exchange/taler-exchange-httpd_track_transaction.c | 2 +- src/exchange/taler-exchange-httpd_track_transfer.c | 2 +- src/lib/auditor_api_deposit_confirmation.c | 2 +- src/lib/exchange_api_deposit.c | 4 ++-- src/lib/exchange_api_track_transaction.c | 4 ++-- src/lib/exchange_api_track_transfer.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index 23a97fb1b..024482389 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -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 ("merchant_pub", &deposit.merchant_pub), 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_absolute_time ("timestamp", &deposit.timestamp), 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, MHD_HTTP_BAD_REQUEST, TALER_EC_DEPOSIT_INVALID_WIRE_FORMAT_CONTRACT_HASH_CONFLICT, - "H_wire"); + "h_wire"); } /* check denomination exists and is valid */ diff --git a/src/exchange/taler-exchange-httpd_track_transaction.c b/src/exchange/taler-exchange-httpd_track_transaction.c index 757f28bad..31147c32f 100644 --- a/src/exchange/taler-exchange-httpd_track_transaction.c +++ b/src/exchange/taler-exchange-httpd_track_transaction.c @@ -357,7 +357,7 @@ TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, struct TALER_DepositTrackPS tps; struct TALER_MerchantSignatureP merchant_sig; 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 ("coin_pub", &tps.coin_pub), GNUNET_JSON_spec_fixed_auto ("merchant_pub", &tps.merchant), diff --git a/src/exchange/taler-exchange-httpd_track_transfer.c b/src/exchange/taler-exchange-httpd_track_transfer.c index f40d7c819..2b2e179f9 100644 --- a/src/exchange/taler-exchange-httpd_track_transfer.c +++ b/src/exchange/taler-exchange-httpd_track_transfer.c @@ -164,7 +164,7 @@ reply_track_transfer_details (struct MHD_Connection *connection, "merchant_pub", GNUNET_JSON_from_data_auto ( merchant_pub), - "H_wire", GNUNET_JSON_from_data_auto ( + "h_wire", GNUNET_JSON_from_data_auto ( h_wire), "execution_time", GNUNET_JSON_from_time_abs (exec_time), diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c index 73173cc31..a02c660e4 100644 --- a/src/lib/auditor_api_deposit_confirmation.c +++ b/src/lib/auditor_api_deposit_confirmation.c @@ -312,7 +312,7 @@ TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor, } 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," /* amount_without_fees, coin_pub */ " s:o, s:o," /* merchant_pub, exchange_sig */ diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c index 30bb6c976..69584ee24 100644 --- a/src/lib/exchange_api_deposit.c +++ b/src/lib/exchange_api_deposit.c @@ -554,7 +554,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange, } 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," /* ub_sig, timestamp */ " s:o," /* merchant_pub */ @@ -562,7 +562,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange, " s:o}", /* coin_sig */ "contribution", TALER_JSON_from_amount (amount), "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), "coin_pub", GNUNET_JSON_from_data_auto (coin_pub), diff --git a/src/lib/exchange_api_track_transaction.c b/src/lib/exchange_api_track_transaction.c index de3f98b65..ed8185e41 100644 --- a/src/lib/exchange_api_track_transaction.c +++ b/src/lib/exchange_api_track_transaction.c @@ -301,10 +301,10 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange, GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv, &dtp.purpose, &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, 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), "coin_pub", GNUNET_JSON_from_data_auto ( diff --git a/src/lib/exchange_api_track_transfer.c b/src/lib/exchange_api_track_transfer.c index 2c90bf199..8720793a2 100644 --- a/src/lib/exchange_api_track_transfer.c +++ b/src/lib/exchange_api_track_transfer.c @@ -98,7 +98,7 @@ check_track_transfer_response_ok (struct TALER_JSON_spec_amount ("total", &total_amount), TALER_JSON_spec_amount ("wire_fee", &wire_fee), 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_json ("deposits", &details_j), GNUNET_JSON_spec_fixed_auto ("exchange_sig", &exchange_sig), -- cgit v1.2.3