work on tokens

1 files changed, 4 insertions, 6 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 1907f88f..24f5e61c 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -3344,8 +3344,7 @@ struct TALER_MERCHANT_OutputToken
  * @param coins array of coins to pay with
  * @param num_tokens length of the @a tokens array
  * @param tokens array of tokens used
- * @param num_output_tokens length of the @a output_tokens array
- * @param output_tokens array of output token to be issued by the merchant
+ * @param j_output_tokens json array of token envelopes, NULL for none
  * @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
@@ -3361,8 +3360,7 @@ TALER_MERCHANT_order_pay_frontend (
   const struct TALER_MERCHANT_PaidCoin coins[static num_coins],
   unsigned int num_tokens,
   const struct TALER_MERCHANT_UsedToken tokens[static num_tokens],
-  unsigned int num_output_tokens,
-  const struct TALER_MERCHANT_OutputToken output_tokens[static num_output_tokens],
+  json_t *j_output_tokens,
   TALER_MERCHANT_OrderPayCallback pay_cb,
   void *pay_cb_cls);
 
@@ -3449,7 +3447,7 @@ struct TALER_MERCHANT_UseToken
  * @param merchant_url base URL of the merchant
  * @param session_id session to pay for, or NULL for none
  * @param h_contract hash of the contact of the merchant with the customer
- * @param wallet_data inputs from the wallet for the contract, NULL for none
+ * @param choice_index index of the selected contract coice, -1 for none
  * @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)
@@ -3475,7 +3473,7 @@ TALER_MERCHANT_order_pay (
   const char *merchant_url,
   const char *session_id,
   const struct TALER_PrivateContractHashP *h_contract,
-  const json_t *wallet_data,
+  int choice_index,
   const struct TALER_Amount *amount,
   const struct TALER_Amount *max_fee,
   const struct TALER_MerchantPublicKeyP *merchant_pub,