fix lib/ FTBFS

1 files changed, 12 insertions, 15 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 82e81b4b..9ba1b628 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -689,7 +689,7 @@ struct TALER_MERCHANT_Account
   /**
    * Hash of @e payto_uri and @e salt.
    */
-  struct GNUNET_HashCode h_wire;
+  struct TALER_MerchantWireHash h_wire;
 
   /**
    * true if the account is active,
@@ -1654,7 +1654,8 @@ struct TALER_MERCHANT_OrderWalletGetHandle *
 TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx,
                                  const char *backend_url,
                                  const char *order_id,
-                                 const struct GNUNET_HashCode *h_contract,
+                                 const struct
+                                 TALER_PrivateContractHash *h_contract,
                                  struct GNUNET_TIME_Relative timeout,
                                  const char *session_id,
                                  const struct TALER_Amount *min_refund,
@@ -2071,7 +2072,7 @@ typedef void
   const struct TALER_MERCHANT_HttpResponse *hr,
   const json_t *contract_terms,
   const struct TALER_MerchantSignatureP *sig,
-  const struct GNUNET_HashCode *h_contract_terms);
+  const struct TALER_PrivateContractHash *h_contract_terms);
 
 
 /**
@@ -2285,7 +2286,7 @@ struct TALER_MERCHANT_OrderPayHandle *
 TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx,
                           const char *merchant_url,
                           const char *session_id,
-                          const struct GNUNET_HashCode *h_contract,
+                          const struct TALER_PrivateContractHash *h_contract,
                           const struct TALER_Amount *amount,
                           const struct TALER_Amount *max_fee,
                           const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -2293,7 +2294,7 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx,
                           struct GNUNET_TIME_Absolute timestamp,
                           struct GNUNET_TIME_Absolute refund_deadline,
                           struct GNUNET_TIME_Absolute pay_deadline,
-                          const struct GNUNET_HashCode *h_wire,
+                          const struct TALER_MerchantWireHash *h_wire,
                           const char *order_id,
                           unsigned int num_coins,
                           const struct TALER_MERCHANT_PayCoin coins[],
@@ -2357,7 +2358,7 @@ TALER_MERCHANT_order_paid (
   const char *merchant_url,
   const char *order_id,
   const char *session_id,
-  const struct GNUNET_HashCode *h_contract_terms,
+  const struct TALER_PrivateContractHash *h_contract_terms,
   const struct TALER_MerchantSignatureP *merchant_sig,
   TALER_MERCHANT_OrderPaidCallback paid_cb,
   void *paid_cb_cls);
@@ -2461,7 +2462,7 @@ TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx,
                             const char *merchant_url,
                             const char *order_id,
                             const struct TALER_MerchantPublicKeyP *merchant_pub,
-                            const struct GNUNET_HashCode *h_contract,
+                            const struct TALER_PrivateContractHash *h_contract,
                             unsigned int num_coins,
                             const struct TALER_MERCHANT_AbortCoin coins[],
                             TALER_MERCHANT_AbortCallback cb,
@@ -2553,7 +2554,7 @@ typedef void
   void *cls,
   const struct TALER_MERCHANT_HttpResponse *hr,
   const char *taler_refund_uri,
-  const struct GNUNET_HashCode *h_contract);
+  const struct TALER_PrivateContractHash *h_contract);
 
 
 /**
@@ -2669,7 +2670,7 @@ TALER_MERCHANT_wallet_post_order_refund (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *order_id,
-  const struct GNUNET_HashCode *h_contract_terms,
+  const struct TALER_PrivateContractHash *h_contract_terms,
   TALER_MERCHANT_WalletRefundCallback cb,
   void *cb_cls);
 
@@ -3734,7 +3735,6 @@ TALER_MERCHANT_tip_pickup2_cancel (
   struct TALER_MERCHANT_TipPickup2Handle *tp);
 
 
-
 /* ********************* /kyc ************************** */
 
 /**
@@ -3866,7 +3866,7 @@ typedef void
 struct TALER_MERCHANT_KycGetHandle *
 TALER_MERCHANT_kyc_get (struct GNUNET_CURL_Context *ctx,
                         const char *backend_url,
-                        const struct GNUNET_HashCode *h_wire,
+                        const struct TALER_MerchantWireHash *h_wire,
                         const char *exchange_url,
                         struct GNUNET_TIME_Relative timeout,
                         TALER_MERCHANT_KycGetCallback cb,
@@ -3891,7 +3891,7 @@ struct TALER_MERCHANT_KycGetHandle *
 TALER_MERCHANT_management_kyc_get (struct GNUNET_CURL_Context *ctx,
                                    const char *backend_url,
                                    const char *instance_id,
-                                   const struct GNUNET_HashCode *h_wire,
+                                   const struct TALER_MerchantWireHash *h_wire,
                                    const char *exchange_url,
                                    struct GNUNET_TIME_Relative timeout,
                                    TALER_MERCHANT_KycGetCallback cb,
@@ -3908,7 +3908,4 @@ TALER_MERCHANT_kyc_get_cancel (
   struct TALER_MERCHANT_KycGetHandle *kyc);
 
 
-
-
-
 #endif  /* _TALER_MERCHANT_SERVICE_H */