[GNUnet-SVN] [taler-merchant] branch master updated: Still on #4877

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 8808d12  Still on #4877
8808d12 is described below

commit 8808d12c9bf32495286718706ef7fa2eb978cc7a
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Mar 29 18:41:01 2017 +0200

    Still on #4877
---
 src/lib/merchant_api_pay.c               | 12 ++++--------
 src/lib/merchant_api_track_transaction.c |  4 ++--
 src/lib/merchant_api_track_transfer.c    |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index 6910bde..632a8ac 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -252,24 +252,19 @@ handle_pay_finished (void *cls,
  * @param ctx the execution loop context
  * @param merchant_uri base URI of the merchant's backend
  * @param instance which merchant instance will receive this payment
- * @param h_wire hash of the merchant’s account details
- * @param h_contract hash of the contact of the merchant with the customer
- * @param transaction_id transaction id for the transaction between merchant 
and customer
+ * @param h_proposal_data hashcode of the proposal being paid
  * @param amount total value of the contract to be paid to the merchant
  * @param max_fee maximum fee covered by the merchant (according to the 
contract)
  * @param merchant_pub the public key of the merchant (used to identify the 
merchant for refund requests)
  * @param merchant_sig signature from the merchant over the original contract
  * @param timestamp timestamp when the contract was finalized, must match 
approximately the current time of the merchant
- * @param transaction_id transaction id for the transaction between merchant 
and customer
- * @param merchant_pub the public key of the merchant (used to identify the 
merchant for refund requests)
  * @param refund_deadline date until which the merchant can issue a refund to 
the customer via the merchant (can be zero if refunds are not allowed)
  * @param pay_deadline maximum time limit to pay for this contract
+ * @param h_wire hash of the merchant’s account details
  * @param exchange_uri URI of the exchange that the coins belong to
+ * @param order_id order id of the proposal being paid
  * @param num_coins number of coins used to pay
  * @param coins array of coins we use to pay
- * @param coin_sig the signature made with purpose 
#TALER_SIGNATURE_WALLET_COIN_DEPOSIT made by the customer with the coin’s 
private key.
- * @param max_fee maximum fee covered by the merchant (according to the 
contract)
- * @param amount total value of the contract to be paid to the merchant
  * @param pay_cb the callback to call when a reply for this request is 
available
  * @param pay_cb_cls closure for @a pay_cb
  * @return a handle for this request
@@ -371,6 +366,7 @@ TALER_MERCHANT_pay_wallet (struct GNUNET_CURL_Context *ctx,
  *
  * @param ctx the execution loop context
  * @param merchant_uri base URI of the merchant's backend
+ * @param merchant_pub public key of the merchant
  * @param exchange_uri URI of the exchange that the coins belong to
  * @param num_coins number of coins used to pay
  * @param coins array of coins we use to pay
diff --git a/src/lib/merchant_api_track_transaction.c 
b/src/lib/merchant_api_track_transaction.c
index 5349e47..4e11acc 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -149,7 +149,7 @@ handle_track_transaction_finished (void *cls,
  * @param ctx execution context
  * @param backend_uri base URI of the backend
  * @param instance which merchant instance is going to be tracked
- * @param transaction_id which transaction should we trace
+ * @param order_id order id pointing to the transaction being tracked
  * @param track_transaction_cb the callback to call when a reply for this 
request is available
  * @param track_transaction_cb_cls closure for @a track_transaction_cb
  * @return a handle for this request
@@ -195,7 +195,7 @@ TALER_MERCHANT_track_transaction (struct 
GNUNET_CURL_Context *ctx,
  * Cancel a /track/transaction request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param co the transaction's tracking handle
+ * @param tdo handle to the tracking operation being cancelled
  */
 void
 TALER_MERCHANT_track_transaction_cancel (struct 
TALER_MERCHANT_TrackTransactionHandle *tdo)
diff --git a/src/lib/merchant_api_track_transfer.c 
b/src/lib/merchant_api_track_transfer.c
index c73e155..0de4ac8 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -213,7 +213,7 @@ handle_track_transfer_finished (void *cls,
  * @param backend_uri base URI of the backend
  * @param instance which merchant instance is going to be tracked
  * @param wtid base32 string indicating a wtid
- * @param exchange base URL of the exchange in charge of returning the wanted 
information
+ * @param exchange_uri base URL of the exchange in charge of returning the 
wanted information
  * @param track_transfer_cb the callback to call when a reply for this request 
is available
  * @param track_transfer_cb_cls closure for @a contract_cb
  * @return a handle for this request
@@ -263,7 +263,7 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context 
*ctx,
  * Cancel a /track/transfer request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param co the transfer's tracking handle
+ * @param tdo handle to the tracking operation being cancelled
  */
 void
 TALER_MERCHANT_track_transfer_cancel (struct 
TALER_MERCHANT_TrackTransferHandle *tdo)

-- 
To stop receiving notification emails like this one, please contact
address@hidden