summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-09 09:48:30 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-09 09:48:30 +0100
commit7202823d81e868d411b733fcce61906ba268f932 (patch)
treea3fe807d4b1b5bf4bc13bc44961f9fdc94289d08
parent3c412bf3e5a3c3cbbfa1350ac3d190d64a3b826d (diff)
downloadmerchant-7202823d81e868d411b733fcce61906ba268f932.tar.gz
merchant-7202823d81e868d411b733fcce61906ba268f932.tar.bz2
merchant-7202823d81e868d411b733fcce61906ba268f932.zip
H_wire -> h_wire (#6032)
-rw-r--r--src/backend/taler-merchant-httpd_order.c4
-rw-r--r--src/backend/taler-merchant-httpd_pay.c4
-rw-r--r--src/backend/taler-merchant-httpd_track-transaction.c2
-rw-r--r--src/lib/merchant_api_track_transfer.c2
-rw-r--r--src/lib/test_merchant_api_twisted.c2
-rw-r--r--src/lib/testing_api_cmd_pay.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_order.c b/src/backend/taler-merchant-httpd_order.c
index 779f836e..a35b2cef 100644
--- a/src/backend/taler-merchant-httpd_order.c
+++ b/src/backend/taler-merchant-httpd_order.c
@@ -527,7 +527,7 @@ proposal_put (struct MHD_Connection *connection,
"No wire method configured for instance");
}
json_object_set_new (order,
- "H_wire",
+ "h_wire",
GNUNET_JSON_from_data_auto (&wm->h_wire));
json_object_set_new (order,
"wire_method",
@@ -635,7 +635,7 @@ proposal_put (struct MHD_Connection *connection,
/**
* Generate a proposal, given its order. In practical terms,
- * it adds the fields 'exchanges', 'merchant_pub', and 'H_wire'
+ * it adds the fields 'exchanges', 'merchant_pub', and 'h_wire'
* to the order gotten from the frontend. Finally, it signs this
* data, and returns it to the frontend.
*
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index a828392b..0be292b7 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -224,7 +224,7 @@ struct PayContext
struct GNUNET_HashCode h_contract_terms;
/**
- * "H_wire" from @e contract_terms. Used to identify
+ * "h_wire" from @e contract_terms. Used to identify
* the instance's wire transfer method.
*/
struct GNUNET_HashCode h_wire;
@@ -1573,7 +1573,7 @@ parse_pay (struct MHD_Connection *connection,
&pc->amount),
GNUNET_JSON_spec_string ("fulfillment_url",
&fulfillment_url),
- GNUNET_JSON_spec_fixed_auto ("H_wire",
+ GNUNET_JSON_spec_fixed_auto ("h_wire",
&pc->h_wire),
GNUNET_JSON_spec_end ()
};
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c
index 49eea32d..48bcc070 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -1171,7 +1171,7 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh,
&tctx->timestamp),
TALER_JSON_spec_amount ("amount",
&tctx->total_amount),
- GNUNET_JSON_spec_fixed_auto ("H_wire",
+ GNUNET_JSON_spec_fixed_auto ("h_wire",
&tctx->h_wire),
GNUNET_JSON_spec_end ()
};
diff --git a/src/lib/merchant_api_track_transfer.c b/src/lib/merchant_api_track_transfer.c
index 4122b0b3..45306fcb 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -95,7 +95,7 @@ check_track_transfer_response_ok (struct
struct GNUNET_JSON_Specification inner_spec[] = {
TALER_JSON_spec_amount ("total", &total_amount),
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_json ("deposits_sums", &deposits),
GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub),
GNUNET_JSON_spec_end ()
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
index d6277dc7..ab2c3013 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -569,7 +569,7 @@ run (void *cls,
("create-proposal-unaggregation",
/* Need a fresh instance in order to associate this
* proposal with a fresh h_wire; this way, this proposal
- * won't get hooked by the aggregator gathering same-H_wire'd
+ * won't get hooked by the aggregator gathering same-h_wire'd
* transactions. */
twister_merchant_url_instance_tor,
MHD_HTTP_OK,
diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c
index 44f332ca..d248dd5a 100644
--- a/src/lib/testing_api_cmd_pay.c
+++ b/src/lib/testing_api_cmd_pay.c
@@ -545,7 +545,7 @@ _pay_run (const char *merchant_url,
&timestamp),
GNUNET_JSON_spec_fixed_auto ("merchant_pub",
&merchant_pub),
- GNUNET_JSON_spec_fixed_auto ("H_wire",
+ GNUNET_JSON_spec_fixed_auto ("h_wire",
&h_wire),
TALER_JSON_spec_amount ("amount",
&total_amount),