work on tip APIs

1 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c
index 6e48f169..08f59359 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -57,7 +57,7 @@ struct PlanchetData
 /**
  * Handle for a /tip-pickup operation.
  */
-struct TALER_MERCHANT_TipPickupOperation
+struct TALER_MERCHANT_TipPickupHandle
 {
 
   /**
@@ -73,7 +73,7 @@ struct TALER_MERCHANT_TipPickupOperation
   /**
    * Handle for the actual (internal) withdraw operation.
    */
-  struct TALER_MERCHANT_TipPickup2Operation *tpo2;
+  struct TALER_MERCHANT_TipPickup2Handle *tpo2;
 
   /**
    * Number of planchets/coins used for this operation.
@@ -92,7 +92,7 @@ struct TALER_MERCHANT_TipPickupOperation
  * Callback for a /tip-pickup request.  Returns the result of the operation.
  * Note that the client MUST still do the unblinding of the @a blind_sigs.
  *
- * @param cls closure, a `struct TALER_MERCHANT_TipPickupOperation *`
+ * @param cls closure, a `struct TALER_MERCHANT_TipPickupHandle *`
  * @param hr HTTP response details
  * @param num_blind_sigs length of the @a reserve_sigs array, 0 on error
  * @param blind_sigs array of blind signatures over the planchets, NULL on error
@@ -103,7 +103,7 @@ pickup_done_cb (void *cls,
                 unsigned int num_blind_sigs,
                 const struct TALER_MERCHANT_BlindSignature *blind_sigs)
 {
-  struct TALER_MERCHANT_TipPickupOperation *tp = cls;
+  struct TALER_MERCHANT_TipPickupHandle *tp = cls;
 
   tp->tpo2 = NULL;
   if (NULL == blind_sigs)
@@ -180,7 +180,7 @@ pickup_done_cb (void *cls,
  * @param pickup_cb_cls closure to pass to @a pickup_cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipPickupOperation *
+struct TALER_MERCHANT_TipPickupHandle *
 TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
                            const char *backend_url,
                            const struct GNUNET_HashCode *tip_id,
@@ -189,7 +189,7 @@ TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
                            TALER_MERCHANT_TipPickupCallback pickup_cb,
                            void *pickup_cb_cls)
 {
-  struct TALER_MERCHANT_TipPickupOperation *tp;
+  struct TALER_MERCHANT_TipPickupHandle *tp;
   struct TALER_PlanchetDetail details[GNUNET_NZL (num_planchets)];
 
   if (0 == num_planchets)
@@ -197,7 +197,7 @@ TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
     GNUNET_break (0);
     return NULL;
   }
-  tp = GNUNET_new (struct TALER_MERCHANT_TipPickupOperation);
+  tp = GNUNET_new (struct TALER_MERCHANT_TipPickupHandle);
   GNUNET_array_grow (tp->planchets,
                      tp->num_planchets,
                      num_planchets);
@@ -249,7 +249,7 @@ TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
  * @param tp handle from the operation to cancel
  */
 void
-TALER_MERCHANT_tip_pickup_cancel (struct TALER_MERCHANT_TipPickupOperation *tp)
+TALER_MERCHANT_tip_pickup_cancel (struct TALER_MERCHANT_TipPickupHandle *tp)
 {
   for (unsigned int i = 0; i<tp->num_planchets; i++)
     GNUNET_CRYPTO_rsa_public_key_dup (tp->planchets[i].pk.key.rsa_public_key);