-work on fixing FTBFS

1 files changed, 21 insertions, 18 deletions

diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 4ba2dade..929ad7af 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -41,7 +41,7 @@ struct TALER_MERCHANTDB_AccountDetails
   /**
    * Hash of the wire details (@e payto_uri and @e salt).
    */
-  struct GNUNET_HashCode h_wire;
+  struct TALER_MerchantWireHash h_wire;
 
   /**
    * Salt value used for hashing @e payto_uri.
@@ -396,7 +396,7 @@ typedef void
 typedef void
 (*TALER_MERCHANTDB_KycCallback)(
   void *cls,
-  const struct GNUNET_HashCode *h_wire,
+  const struct TALER_MerchantWireHash *h_wire,
   uint64_t exchange_kyc_serial,
   const char *payto_uri,
   const char *exchange_url,
@@ -582,7 +582,7 @@ typedef void
   void *cls,
   uint64_t deposit_serial,
   const char *exchange_url,
-  const struct GNUNET_HashCode *h_wire,
+  const struct TALER_MerchantWireHash *h_wire,
   const struct TALER_Amount *amount_with_fee,
   const struct TALER_Amount *deposit_fee,
   const struct TALER_CoinSpendPublicKeyP *coin_pub);
@@ -660,7 +660,7 @@ typedef void
   const struct TALER_Amount *deposit_fee,
   const struct TALER_Amount *refund_fee,
   const struct TALER_Amount *wire_fee,
-  const struct GNUNET_HashCode *h_wire,
+  const struct TALER_MerchantWireHash *h_wire,
   struct GNUNET_TIME_Absolute deposit_timestamp,
   struct GNUNET_TIME_Absolute refund_deadline,
   const struct TALER_ExchangeSignatureP *exchange_sig,
@@ -967,7 +967,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*inactivate_account)(void *cls,
                         const char *merchant_id,
-                        const struct GNUNET_HashCode *h_wire);
+                        const struct TALER_MerchantWireHash *h_wire);
 
 
   /**
@@ -981,7 +981,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*activate_account)(void *cls,
                       const char *merchant_id,
-                      const struct GNUNET_HashCode *h_wire);
+                      const struct TALER_MerchantWireHash *h_wire);
 
 
   /**
@@ -1000,7 +1000,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*account_kyc_get_status)(void *cls,
                             const char *merchant_id,
-                            const struct GNUNET_HashCode *h_wire,
+                            const struct TALER_MerchantWireHash *h_wire,
                             const char *exchange_url,
                             TALER_MERCHANTDB_KycCallback kyc_cb,
                             void *kyc_cb_cls);
@@ -1022,7 +1022,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*account_kyc_set_status)(void *cls,
                             const char *merchant_id,
-                            const struct GNUNET_HashCode *h_wire,
+                            const struct TALER_MerchantWireHash *h_wire,
                             const char *exchange_url,
                             uint64_t exchange_kyc_serial,
                             const struct TALER_ExchangeSignatureP *exchange_sig,
@@ -1379,7 +1379,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_deposits)(void *cls,
                      const char *instance_id,
-                     const struct GNUNET_HashCode *h_contract_terms,
+                     const struct TALER_PrivateContractHash *h_contract_terms,
                      TALER_MERCHANTDB_DepositsCallback cb,
                      void *cb_cls);
 
@@ -1427,14 +1427,14 @@ struct TALER_MERCHANTDB_Plugin
   (*insert_deposit)(void *cls,
                     const char *instance_id,
                     struct GNUNET_TIME_Absolute deposit_timestamp,
-                    const struct GNUNET_HashCode *h_contract_terms,
+                    const struct TALER_PrivateContractHash *h_contract_terms,
                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
                     const char *exchange_url,
                     const struct TALER_Amount *amount_with_fee,
                     const struct TALER_Amount *deposit_fee,
                     const struct TALER_Amount *refund_fee,
                     const struct TALER_Amount *wire_fee,
-                    const struct GNUNET_HashCode *h_wire,
+                    const struct TALER_MerchantWireHash *h_wire,
                     const struct TALER_ExchangeSignatureP *exchange_sig,
                     const struct TALER_ExchangePublicKeyP *exchange_pub);
 
@@ -1452,7 +1452,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_refunds)(void *cls,
                     const char *instance_id,
-                    const struct GNUNET_HashCode *h_contract_terms,
+                    const struct TALER_PrivateContractHash *h_contract_terms,
                     TALER_MERCHANTDB_RefundCallback rc,
                     void *rc_cls);
 
@@ -1471,7 +1471,8 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*mark_contract_paid)(void *cls,
                         const char *instance_id,
-                        const struct GNUNET_HashCode *h_contract_terms,
+                        const struct
+                        TALER_PrivateContractHash *h_contract_terms,
                         const char *session_id);
 
 
@@ -1493,7 +1494,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*refund_coin)(void *cls,
                  const char *instance_id,
-                 const struct GNUNET_HashCode *h_contract_terms,
+                 const struct TALER_PrivateContractHash *h_contract_terms,
                  struct GNUNET_TIME_Absolute refund_timestamp,
                  const struct TALER_CoinSpendPublicKeyP *coin_pub,
                  const char *reason);
@@ -1513,7 +1514,7 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_order_status)(void *cls,
                          const char *instance_id,
                          const char *order_id,
-                         struct GNUNET_HashCode *h_contract_terms,
+                         struct TALER_PrivateContractHash *h_contract_terms,
                          bool *paid);
 
   /**
@@ -1532,7 +1533,8 @@ struct TALER_MERCHANTDB_Plugin
                                    const char *instance_id,
                                    uint64_t order_serial,
                                    char **order_id,
-                                   struct GNUNET_HashCode *h_contract_terms,
+                                   struct TALER_PrivateContractHash *
+                                   h_contract_terms,
                                    bool *paid);
 
 
@@ -1655,7 +1657,8 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_refunds_detailed)(void *cls,
                              const char *instance_id,
-                             const struct GNUNET_HashCode *h_contract_terms,
+                             const struct
+                             TALER_PrivateContractHash *h_contract_terms,
                              TALER_MERCHANTDB_RefundDetailCallback rc,
                              void *rc_cls);
 
@@ -1849,7 +1852,7 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_deposits_by_contract_and_coin)(
     void *cls,
     const char *instance_id,
-    const struct GNUNET_HashCode *h_contract_terms,
+    const struct TALER_PrivateContractHash *h_contract_terms,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     TALER_MERCHANTDB_CoinDepositCallback cb,
     void *cb_cls);