-big renaming of structs for consistent naming with P suffix

13 files changed, 28 insertions, 28 deletions

diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h
index b865dcc7..847701a1 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -68,7 +68,7 @@ struct TMH_WireMethod
   /**
    * Hash of our wire format details as given in #j_wire.
    */
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * Is this wire method active (should it be included in new contracts)?
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 9748f469..c563f7c2 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -47,7 +47,7 @@ struct GetOrderData
   /**
    * Hashed version of contract terms. All zeros if not provided.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Claim token used for access control. All zeros if not provided.
@@ -366,7 +366,7 @@ TMH_make_order_status_url (struct MHD_Connection *con,
                            const char *session_id,
                            const char *instance_id,
                            struct TALER_ClaimTokenP *claim_token,
-                           struct TALER_PrivateContractHash *h_contract)
+                           struct TALER_PrivateContractHashP *h_contract)
 {
   const char *host;
   const char *forwarded_host;
@@ -1052,7 +1052,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
   /* Check if client provided the right hash code of the contract terms */
   if (NULL != god->contract_terms)
   {
-    struct TALER_PrivateContractHash h;
+    struct TALER_PrivateContractHashP h;
 
     contract_available = true;
     if (GNUNET_OK !=
@@ -1308,7 +1308,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
 
   {
     /* Check if paid. */
-    struct TALER_PrivateContractHash h_contract;
+    struct TALER_PrivateContractHashP h_contract;
     bool paid;
 
     qs = TMH_db->lookup_order_status (TMH_db->cls,
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.h b/src/backend/taler-merchant-httpd_get-orders-ID.h
index a09d40a3..97b8525b 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.h
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.h
@@ -67,7 +67,7 @@ TMH_make_order_status_url (struct MHD_Connection *con,
                            const char *session_id,
                            const char *instance_id,
                            struct TALER_ClaimTokenP *claim_token,
-                           struct TALER_PrivateContractHash *h_contract);
+                           struct TALER_PrivateContractHashP *h_contract);
 
 
 /**
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
index 4c5f0313..d0fcfbc0 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
@@ -126,7 +126,7 @@ struct AbortContext
   /**
    * Hashed contract terms (according to client).
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Context for our operation.
@@ -746,7 +746,7 @@ begin_transaction (struct AbortContext *ac)
   /* check payment was indeed incomplete
      (now that we are in the transaction scope!) */
   {
-    struct TALER_PrivateContractHash h_contract_terms;
+    struct TALER_PrivateContractHashP h_contract_terms;
     bool paid;
 
     qs = TMH_db->lookup_order_status (TMH_db->cls,
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
index 7b1a7863..0e7ea59e 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c
@@ -151,7 +151,7 @@ TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh,
   }
 
   {
-    struct TALER_PrivateContractHash h_contract_terms;
+    struct TALER_PrivateContractHashP h_contract_terms;
 
     if (GNUNET_OK !=
         TALER_JSON_contract_hash (contract_terms,
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 5ee70de9..edd37d24 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -83,7 +83,7 @@ struct DepositConfirmation
   /**
    * Hash of the denomination of this coin.
    */
-  struct TALER_DenominationHash h_denom;
+  struct TALER_DenominationHashP h_denom;
 
   /**
    * Amount this coin contributes to the total purchase price.
@@ -225,13 +225,13 @@ struct PayContext
   /**
    * Hashed proposal.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * "h_wire" from @e contract_terms.  Used to identify
    * the instance's wire transfer method.
    */
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * Maximum fee the merchant is willing to pay, from @e root.
@@ -409,7 +409,7 @@ struct KycContext
   /**
    * Contract we are looking up.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Coin we are looking up.
@@ -786,7 +786,7 @@ process_kyc_with_exchange (void *cls,
 static void
 kyc_cb (
   void *cls,
-  const struct TALER_MerchantWireHash *h_wire,
+  const struct TALER_MerchantWireHashP *h_wire,
   uint64_t exchange_kyc_serial,
   const char *payto_uri,
   const char *exchange_url,
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_post-orders-ID-refund.c
index a80e1446..b6aebf71 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-refund.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-refund.c
@@ -134,7 +134,7 @@ struct PostRefundData
   /**
    * Hashed version of contract terms. All zeros if not provided.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * DLL of (suspended) requests.
@@ -624,7 +624,7 @@ TMH_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
                                            hc->infix);
       }
       {
-        struct TALER_PrivateContractHash h_contract_terms;
+        struct TALER_PrivateContractHashP h_contract_terms;
 
         if (GNUNET_OK !=
             TALER_JSON_contract_hash (contract_terms,
diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c
index 03f799a9..e4edfe34 100644
--- a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c
+++ b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c
@@ -71,7 +71,7 @@ struct ExchangeKycRequest
   /**
    * Hash of the wire account (with salt) we are checking.
    */
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * Handle for the actual HTTP request to the exchange.
@@ -179,7 +179,7 @@ struct KycContext
    * Set to the h_wire of the merchant account if
    * @a have_h_wire is true, used to filter by account.
    */
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * How long are we willing to wait for the exchange(s)?
@@ -523,7 +523,7 @@ kyc_with_exchange (void *cls,
 {
   struct ExchangeKycRequest *ekr = cls;
   struct KycContext *kc = ekr->kc;
-  struct TALER_PaytoHash h_payto;
+  struct TALER_PaytoHashP h_payto;
 
   ekr->fo = NULL;
   TALER_payto_hash (ekr->payto_uri,
@@ -551,7 +551,7 @@ kyc_with_exchange (void *cls,
  */
 static void
 kyc_status_cb (void *cls,
-               const struct TALER_MerchantWireHash *h_wire,
+               const struct TALER_MerchantWireHashP *h_wire,
                uint64_t exchange_kyc_serial,
                const char *payto_uri,
                const char *exchange_url,
diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c
index 5cfba15e..6ef119c5 100644
--- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c
@@ -83,7 +83,7 @@ struct TransferQuery
   /**
    * Hash of the merchant's bank account the transfer (presumably) went to.
    */
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * Value deposited (including deposit fee).
@@ -200,7 +200,7 @@ struct GetOrderRequestContext
   /**
    * Hash over the @e contract_terms.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Total amount the exchange deposited into our bank account
@@ -677,7 +677,7 @@ static void
 deposit_cb (void *cls,
             uint64_t deposit_serial,
             const char *exchange_url,
-            const struct TALER_MerchantWireHash *h_wire,
+            const struct TALER_MerchantWireHashP *h_wire,
             const struct TALER_Amount *amount_with_fee,
             const struct TALER_Amount *deposit_fee,
             const struct TALER_CoinSpendPublicKeyP *coin_pub)
@@ -1444,7 +1444,7 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh,
     }
 
     {
-      struct TALER_PrivateContractHash *h_contract = NULL;
+      struct TALER_PrivateContractHashP *h_contract = NULL;
 
       /* In a session-bound payment, allow the browser to check the order
        * status page (e.g. to get a refund).
diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c
index 444e564d..04fd8bbd 100644
--- a/src/backend/taler-merchant-httpd_private-get-orders.c
+++ b/src/backend/taler-merchant-httpd_private-get-orders.c
@@ -274,7 +274,7 @@ add_order (void *cls,
 {
   struct TMH_PendingOrder *po = cls;
   json_t *contract_terms = NULL;
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
   enum GNUNET_DB_QueryStatus qs;
   const char *summary;
   char *order_id = NULL;
diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
index fe120212..96352a93 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
@@ -150,7 +150,7 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
     GNUNET_JSON_spec_end ()
   };
   enum TALER_MERCHANTDB_RefundStatus rs;
-  struct TALER_PrivateContractHash h_contract;
+  struct TALER_PrivateContractHashP h_contract;
 
   {
     enum GNUNET_DB_QueryStatus qs;
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
index d144c53c..baaf3de9 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -1059,7 +1059,7 @@ patch_order (struct MHD_Connection *connection,
 
   /* sanity check result */
   {
-    struct TALER_PrivateContractHash h_control;
+    struct TALER_PrivateContractHashP h_control;
 
     switch (TALER_JSON_contract_hash (order,
                                       &h_control))
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
index b6745c55..83742d01 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -303,7 +303,7 @@ check_transfer (void *cls,
                 const struct TALER_Amount *deposit_fee,
                 const struct TALER_Amount *refund_fee,
                 const struct TALER_Amount *wire_fee,
-                const struct TALER_MerchantWireHash *h_wire,
+                const struct TALER_MerchantWireHashP *h_wire,
                 struct GNUNET_TIME_Timestamp deposit_timestamp,
                 struct GNUNET_TIME_Timestamp refund_deadline,
                 const struct TALER_ExchangeSignatureP *exchange_sig,