-introduce new types for tip identifiers and tip pickups

1 files changed, 11 insertions, 11 deletions

diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 3925011a..b4dc17b2 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -552,7 +552,7 @@ struct TALER_MERCHANTDB_TipDetails
   /**
    * ID of the tip.
    */
-  struct GNUNET_HashCode tip_id;
+  struct TALER_TipIdentifierP tip_id;
 
   /**
    * Total amount of the tip.
@@ -633,7 +633,7 @@ typedef void
 typedef void
 (*TALER_MERCHANTDB_TipsCallback)(void *cls,
                                  uint64_t row_id,
-                                 struct GNUNET_HashCode tip_id,
+                                 struct TALER_TipIdentifierP tip_id,
                                  struct TALER_Amount amount);
 
 
@@ -675,7 +675,7 @@ struct TALER_MERCHANTDB_PickupDetails
   /**
    * Identifier for the pickup operation.
    */
-  struct GNUNET_HashCode pickup_id;
+  struct TALER_PickupIdentifierP pickup_id;
 
   /**
    * Total amount requested for this @e pickup_id.
@@ -2168,7 +2168,7 @@ struct TALER_MERCHANTDB_Plugin
                    const struct TALER_Amount *amount,
                    const char *justification,
                    const char *next_url,
-                   struct GNUNET_HashCode *tip_id,
+                   struct TALER_TipIdentifierP *tip_id,
                    struct GNUNET_TIME_Timestamp *expiration);
 
 
@@ -2189,8 +2189,8 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_pickup)(void *cls,
                    const char *instance_id,
-                   const struct GNUNET_HashCode *tip_id,
-                   const struct GNUNET_HashCode *pickup_id,
+                   const struct TALER_TipIdentifierP *tip_id,
+                   const struct TALER_PickupIdentifierP *pickup_id,
                    char **exchange_url,
                    struct TALER_ReservePrivateKeyP *reserve_priv,
                    unsigned int sigs_length,
@@ -2213,7 +2213,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_tip)(void *cls,
                 const char *instance_id,
-                const struct GNUNET_HashCode *tip_id,
+                const struct TALER_TipIdentifierP *tip_id,
                 struct TALER_Amount *total_authorized,
                 struct TALER_Amount *total_picked_up,
                 struct GNUNET_TIME_Timestamp *expiration,
@@ -2263,7 +2263,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_tip_details)(void *cls,
                         const char *instance_id,
-                        const struct GNUNET_HashCode *tip_id,
+                        const struct TALER_TipIdentifierP *tip_id,
                         bool fpu,
                         struct TALER_Amount *total_authorized,
                         struct TALER_Amount *total_picked_up,
@@ -2295,9 +2295,9 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*insert_pickup)(void *cls,
                    const char *instance_id,
-                   const struct GNUNET_HashCode *tip_id,
+                   const struct TALER_TipIdentifierP *tip_id,
                    const struct TALER_Amount *total_picked_up,
-                   const struct GNUNET_HashCode *pickup_id,
+                   const struct TALER_PickupIdentifierP *pickup_id,
                    const struct TALER_Amount *total_requested);
 
 
@@ -2316,7 +2316,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*insert_pickup_blind_signature)(
     void *cls,
-    const struct GNUNET_HashCode *pickup_id,
+    const struct TALER_PickupIdentifierP *pickup_id,
     uint32_t offset,
     const struct TALER_BlindedDenominationSignature *blind_sig);