refactor private-get-products

author: Florian Dold <florian@dold.me> 2021-07-21 16:18:52 +0200
committer: Florian Dold <florian@dold.me> 2021-07-21 16:19:00 +0200
commit: 0a1162b5a19814467adce5b490fd2d925b0a31e4 (patch)
tree: b04d6f2e77cf3f612c41b787266cab15b1754e3d /src
parent: 0bbb02adc90f7b968d52c65e566737228964f7d3 (diff)
2 files changed, 307 insertions, 306 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 6d272d05..5668d7f1 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -969,6 +969,7 @@ postgres_lookup_products (void *cls,
   };
   enum GNUNET_DB_QueryStatus qs;
 
+  check_connection (pg);
   qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
                                              "lookup_products",
                                              params,
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 6756a681..58f93b6e 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -197,6 +197,11 @@ struct TALER_MERCHANTDB_ProductDetails
   struct TALER_Amount price;
 
   /**
+   * Base64-encoded product image, or an empty string.
+   */
+  char *image;
+
+  /**
    * List of taxes the merchant pays for this product. Never NULL,
    * but can be an empty array.
    */
@@ -220,11 +225,6 @@ struct TALER_MERCHANTDB_ProductDetails
   uint64_t total_lost;
 
   /**
-   * Base64-encoded product image, or an empty string.
-   */
-  char *image;
-
-  /**
    * Identifies where the product is in stock, possibly an empty map.
    */
   json_t *address;
@@ -766,7 +766,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*commit)(void *cls);
+    (*commit)(void *cls);
 
   /**
    * Lookup all of the instances this backend has configured.
@@ -777,10 +777,10 @@ struct TALER_MERCHANTDB_Plugin
    * @param cb_cls closure for @a cb
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_instances)(void *cls,
-                      bool active_only,
-                      TALER_MERCHANTDB_InstanceCallback cb,
-                      void *cb_cls);
+    (*lookup_instances)(void *cls,
+                        bool active_only,
+                        TALER_MERCHANTDB_InstanceCallback cb,
+                        void *cb_cls);
 
   /**
    * Lookup authentication data of an instance.
@@ -790,9 +790,9 @@ struct TALER_MERCHANTDB_Plugin
    * @param[out] ias where to store the auth data
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_instance_auth)(void *cls,
-                          const char *instance_id,
-                          struct TALER_MERCHANTDB_InstanceAuthSettings *ias);
+    (*lookup_instance_auth)(void *cls,
+                            const char *instance_id,
+                            struct TALER_MERCHANTDB_InstanceAuthSettings *ias);
 
 
   /**
@@ -805,11 +805,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_instance)(void *cls,
-                     const struct TALER_MerchantPublicKeyP *merchant_pub,
-                     const struct TALER_MerchantPrivateKeyP *merchant_priv,
-                     const struct TALER_MERCHANTDB_InstanceSettings *is,
-                     const struct TALER_MERCHANTDB_InstanceAuthSettings *ias);
+    (*insert_instance)(void *cls,
+                       const struct TALER_MerchantPublicKeyP *merchant_pub,
+                       const struct TALER_MerchantPrivateKeyP *merchant_priv,
+                       const struct TALER_MERCHANTDB_InstanceSettings *is,
+                       const struct TALER_MERCHANTDB_InstanceAuthSettings *ias);
 
   /**
    * Insert information about an instance's account into our database.
@@ -820,7 +820,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_account)(
+    (*insert_account)(
     void *cls,
     const char *id,
     const struct TALER_MERCHANTDB_AccountDetails *account_details);
@@ -833,7 +833,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_instance_private_key)(
+    (*delete_instance_private_key)(
     void *cls,
     const char *merchant_id);
 
@@ -846,8 +846,8 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*purge_instance)(void *cls,
-                    const char *merchant_id);
+    (*purge_instance)(void *cls,
+                      const char *merchant_id);
 
   /**
    * Update information about an instance into our database.
@@ -857,8 +857,8 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_instance)(void *cls,
-                     const struct TALER_MERCHANTDB_InstanceSettings *is);
+    (*update_instance)(void *cls,
+                       const struct TALER_MERCHANTDB_InstanceSettings *is);
 
   /**
    * Update information about an instance's authentication settings
@@ -870,10 +870,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_instance_auth)(void *cls,
-                          const char *merchant_id,
-                          const struct
-                          TALER_MERCHANTDB_InstanceAuthSettings *ias);
+    (*update_instance_auth)(void *cls,
+                            const char *merchant_id,
+                            const struct
+                            TALER_MERCHANTDB_InstanceAuthSettings *ias);
 
   /**
    * Set an instance's account in our database to "inactive".
@@ -884,9 +884,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*inactivate_account)(void *cls,
-                        const char *merchant_id,
-                        const struct GNUNET_HashCode *h_wire);
+    (*inactivate_account)(void *cls,
+                          const char *merchant_id,
+                          const struct GNUNET_HashCode *h_wire);
 
 
   /**
@@ -898,9 +898,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*activate_account)(void *cls,
-                      const char *merchant_id,
-                      const struct GNUNET_HashCode *h_wire);
+    (*activate_account)(void *cls,
+                        const char *merchant_id,
+                        const struct GNUNET_HashCode *h_wire);
 
   /**
    * Lookup all of the products the given instance has configured.
@@ -912,10 +912,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_products)(void *cls,
-                     const char *instance_id,
-                     TALER_MERCHANTDB_ProductsCallback cb,
-                     void *cb_cls);
+    (*lookup_products)(void *cls,
+                       const char *instance_id,
+                       TALER_MERCHANTDB_ProductsCallback cb,
+                       void *cb_cls);
 
   /**
    * Lookup details about a particular product.
@@ -928,10 +928,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_product)(void *cls,
-                    const char *instance_id,
-                    const char *product_id,
-                    struct TALER_MERCHANTDB_ProductDetails *pd);
+    (*lookup_product)(void *cls,
+                      const char *instance_id,
+                      const char *product_id,
+                      struct TALER_MERCHANTDB_ProductDetails *pd);
 
   /**
    * Delete information about a product. Note that the transaction must
@@ -944,9 +944,9 @@ struct TALER_MERCHANTDB_Plugin
    *           if locks prevent deletion OR product unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_product)(void *cls,
-                    const char *instance_id,
-                    const char *product_id);
+    (*delete_product)(void *cls,
+                      const char *instance_id,
+                      const char *product_id);
 
   /**
    * Insert details about a particular product.
@@ -958,10 +958,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return database result code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_product)(void *cls,
-                    const char *instance_id,
-                    const char *product_id,
-                    const struct TALER_MERCHANTDB_ProductDetails *pd);
+    (*insert_product)(void *cls,
+                      const char *instance_id,
+                      const char *product_id,
+                      const struct TALER_MERCHANTDB_ProductDetails *pd);
 
   /**
    * Update details about a particular product. Note that the
@@ -983,10 +983,10 @@ struct TALER_MERCHANTDB_Plugin
    *         does not yet exist.
    */
   enum GNUNET_DB_QueryStatus
-  (*update_product)(void *cls,
-                    const char *instance_id,
-                    const char *product_id,
-                    const struct TALER_MERCHANTDB_ProductDetails *pd);
+    (*update_product)(void *cls,
+                      const char *instance_id,
+                      const char *product_id,
+                      const struct TALER_MERCHANTDB_ProductDetails *pd);
 
   /**
    * Lock stocks of a particular product. Note that the transaction must
@@ -1002,12 +1002,12 @@ struct TALER_MERCHANTDB_Plugin
    *         product is unknown OR if there insufficient stocks remaining
    */
   enum GNUNET_DB_QueryStatus
-  (*lock_product)(void *cls,
-                  const char *instance_id,
-                  const char *product_id,
-                  const struct GNUNET_Uuid *uuid,
-                  uint64_t quantity,
-                  struct GNUNET_TIME_Absolute expiration_time);
+    (*lock_product)(void *cls,
+                    const char *instance_id,
+                    const char *product_id,
+                    const struct GNUNET_Uuid *uuid,
+                    uint64_t quantity,
+                    struct GNUNET_TIME_Absolute expiration_time);
 
 
   /**
@@ -1021,9 +1021,9 @@ struct TALER_MERCHANTDB_Plugin
    *           if locks prevent deletion OR order unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_order)(void *cls,
-                  const char *instance_id,
-                  const char *order_id);
+    (*delete_order)(void *cls,
+                    const char *instance_id,
+                    const char *order_id);
 
 
   /**
@@ -1040,12 +1040,12 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_order)(void *cls,
-                  const char *instance_id,
-                  const char *order_id,
-                  struct TALER_ClaimTokenP *claim_token,
-                  struct GNUNET_HashCode *h_post_data,
-                  json_t **contract_terms);
+    (*lookup_order)(void *cls,
+                    const char *instance_id,
+                    const char *order_id,
+                    struct TALER_ClaimTokenP *claim_token,
+                    struct GNUNET_HashCode *h_post_data,
+                    json_t **contract_terms);
 
 
   /**
@@ -1059,11 +1059,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_order_summary)(void *cls,
-                          const char *instance_id,
-                          const char *order_id,
-                          struct GNUNET_TIME_Absolute *timestamp,
-                          uint64_t *order_serial);
+    (*lookup_order_summary)(void *cls,
+                            const char *instance_id,
+                            const char *order_id,
+                            struct GNUNET_TIME_Absolute *timestamp,
+                            uint64_t *order_serial);
 
 
   /**
@@ -1077,11 +1077,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_orders)(void *cls,
-                   const char *instance_id,
-                   const struct TALER_MERCHANTDB_OrderFilter *of,
-                   TALER_MERCHANTDB_OrdersCallback cb,
-                   void *cb_cls);
+    (*lookup_orders)(void *cls,
+                     const char *instance_id,
+                     const struct TALER_MERCHANTDB_OrderFilter *of,
+                     TALER_MERCHANTDB_OrdersCallback cb,
+                     void *cb_cls);
 
 
   /**
@@ -1097,13 +1097,13 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_order)(void *cls,
-                  const char *instance_id,
-                  const char *order_id,
-                  const struct GNUNET_HashCode *h_post_order,
-                  struct GNUNET_TIME_Absolute pay_deadline,
-                  const struct TALER_ClaimTokenP *claim_token,
-                  const json_t *contract_terms);
+    (*insert_order)(void *cls,
+                    const char *instance_id,
+                    const char *order_id,
+                    const struct GNUNET_HashCode *h_post_order,
+                    struct GNUNET_TIME_Absolute pay_deadline,
+                    const struct TALER_ClaimTokenP *claim_token,
+                    const json_t *contract_terms);
 
 
   /**
@@ -1117,8 +1117,8 @@ struct TALER_MERCHANTDB_Plugin
    *   #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT indicates success
    */
   enum GNUNET_DB_QueryStatus
-  (*unlock_inventory)(void *cls,
-                      const struct GNUNET_Uuid *uuid);
+    (*unlock_inventory)(void *cls,
+                        const struct GNUNET_Uuid *uuid);
 
 
   /**
@@ -1134,11 +1134,11 @@ struct TALER_MERCHANTDB_Plugin
    *   #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT indicates success
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_order_lock)(void *cls,
-                       const char *instance_id,
-                       const char *order_id,
-                       const char *product_id,
-                       uint64_t quantity);
+    (*insert_order_lock)(void *cls,
+                         const char *instance_id,
+                         const char *order_id,
+                         const char *product_id,
+                         uint64_t quantity);
 
 
   /**
@@ -1152,11 +1152,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_contract_terms)(void *cls,
-                           const char *instance_id,
-                           const char *order_id,
-                           json_t **contract_terms,
-                           uint64_t *order_serial);
+    (*lookup_contract_terms)(void *cls,
+                             const char *instance_id,
+                             const char *order_id,
+                             json_t **contract_terms,
+                             uint64_t *order_serial);
 
 
   /**
@@ -1175,10 +1175,10 @@ struct TALER_MERCHANTDB_Plugin
    *          is malformed
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_contract_terms)(void *cls,
-                           const char *instance_id,
-                           const char *order_id,
-                           json_t *contract_terms);
+    (*insert_contract_terms)(void *cls,
+                             const char *instance_id,
+                             const char *order_id,
+                             json_t *contract_terms);
 
 
   /**
@@ -1197,10 +1197,10 @@ struct TALER_MERCHANTDB_Plugin
    *          is malformed
    */
   enum GNUNET_DB_QueryStatus
-  (*update_contract_terms)(void *cls,
-                           const char *instance_id,
-                           const char *order_id,
-                           json_t *contract_terms);
+    (*update_contract_terms)(void *cls,
+                             const char *instance_id,
+                             const char *order_id,
+                             json_t *contract_terms);
 
 
   /**
@@ -1217,10 +1217,10 @@ struct TALER_MERCHANTDB_Plugin
    *           if locks prevent deletion OR order unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_contract_terms)(void *cls,
-                           const char *instance_id,
-                           const char *order_id,
-                           struct GNUNET_TIME_Relative legal_expiration);
+    (*delete_contract_terms)(void *cls,
+                             const char *instance_id,
+                             const char *order_id,
+                             struct GNUNET_TIME_Relative legal_expiration);
 
 
   /**
@@ -1235,11 +1235,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_deposits)(void *cls,
-                     const char *instance_id,
-                     const struct GNUNET_HashCode *h_contract_terms,
-                     TALER_MERCHANTDB_DepositsCallback cb,
-                     void *cb_cls);
+    (*lookup_deposits)(void *cls,
+                       const char *instance_id,
+                       const struct GNUNET_HashCode *h_contract_terms,
+                       TALER_MERCHANTDB_DepositsCallback cb,
+                       void *cb_cls);
 
 
   /**
@@ -1254,7 +1254,7 @@ struct TALER_MERCHANTDB_Plugin
    * @param master_sig signature of @a master_pub over the @a exchange_pub and the dates
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_exchange_signkey)(
+    (*insert_exchange_signkey)(
     void *cls,
     const struct TALER_MasterPublicKeyP *master_pub,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
@@ -1282,19 +1282,19 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_deposit)(void *cls,
-                    const char *instance_id,
-                    struct GNUNET_TIME_Absolute deposit_timestamp,
-                    const struct GNUNET_HashCode *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_ExchangeSignatureP *exchange_sig,
-                    const struct TALER_ExchangePublicKeyP *exchange_pub);
+    (*insert_deposit)(void *cls,
+                      const char *instance_id,
+                      struct GNUNET_TIME_Absolute deposit_timestamp,
+                      const struct GNUNET_HashCode *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_ExchangeSignatureP *exchange_sig,
+                      const struct TALER_ExchangePublicKeyP *exchange_pub);
 
 
   /**
@@ -1308,11 +1308,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_refunds)(void *cls,
-                    const char *instance_id,
-                    const struct GNUNET_HashCode *h_contract_terms,
-                    TALER_MERCHANTDB_RefundCallback rc,
-                    void *rc_cls);
+    (*lookup_refunds)(void *cls,
+                      const char *instance_id,
+                      const struct GNUNET_HashCode *h_contract_terms,
+                      TALER_MERCHANTDB_RefundCallback rc,
+                      void *rc_cls);
 
 
   /**
@@ -1327,10 +1327,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*mark_contract_paid)(void *cls,
-                        const char *instance_id,
-                        const struct GNUNET_HashCode *h_contract_terms,
-                        const char *session_id);
+    (*mark_contract_paid)(void *cls,
+                          const char *instance_id,
+                          const struct GNUNET_HashCode *h_contract_terms,
+                          const char *session_id);
 
 
   /**
@@ -1349,12 +1349,12 @@ struct TALER_MERCHANTDB_Plugin
    *        regardless of whether it actually increased the refund
    */
   enum GNUNET_DB_QueryStatus
-  (*refund_coin)(void *cls,
-                 const char *instance_id,
-                 const struct GNUNET_HashCode *h_contract_terms,
-                 struct GNUNET_TIME_Absolute refund_timestamp,
-                 const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                 const char *reason);
+    (*refund_coin)(void *cls,
+                   const char *instance_id,
+                   const struct GNUNET_HashCode *h_contract_terms,
+                   struct GNUNET_TIME_Absolute refund_timestamp,
+                   const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                   const char *reason);
 
 
   /**
@@ -1368,11 +1368,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_order_status)(void *cls,
-                         const char *instance_id,
-                         const char *order_id,
-                         struct GNUNET_HashCode *h_contract_terms,
-                         bool *paid);
+    (*lookup_order_status)(void *cls,
+                           const char *instance_id,
+                           const char *order_id,
+                           struct GNUNET_HashCode *h_contract_terms,
+                           bool *paid);
 
 
   /**
@@ -1387,11 +1387,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_payment_status)(void *cls,
-                           uint64_t order_serial,
-                           const char *session_id,
-                           bool *paid,
-                           bool *wired);
+    (*lookup_payment_status)(void *cls,
+                             uint64_t order_serial,
+                             const char *session_id,
+                             bool *paid,
+                             bool *wired);
 
 
   /**
@@ -1404,10 +1404,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_deposits_by_order)(void *cls,
-                              uint64_t order_serial,
-                              TALER_MERCHANTDB_DepositedCoinsCallback cb,
-                              void *cb_cls);
+    (*lookup_deposits_by_order)(void *cls,
+                                uint64_t order_serial,
+                                TALER_MERCHANTDB_DepositedCoinsCallback cb,
+                                void *cb_cls);
 
 
   /**
@@ -1421,7 +1421,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfer_details_by_order)(
+    (*lookup_transfer_details_by_order)(
     void *cls,
     uint64_t order_serial,
     TALER_MERCHANTDB_OrderTransferDetailsCallback cb,
@@ -1437,9 +1437,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_deposit_to_transfer)(void *cls,
-                                uint64_t deposit_serial,
-                                const struct TALER_EXCHANGE_DepositData *dd);
+    (*insert_deposit_to_transfer)(void *cls,
+                                  uint64_t deposit_serial,
+                                  const struct TALER_EXCHANGE_DepositData *dd);
 
 
   /**
@@ -1450,8 +1450,8 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*mark_order_wired)(void *cls,
-                      uint64_t order_serial);
+    (*mark_order_wired)(void *cls,
+                        uint64_t order_serial);
 
 
   /**
@@ -1474,11 +1474,11 @@ struct TALER_MERCHANTDB_Plugin
    *        what was already refunded (idempotency!)
    */
   enum TALER_MERCHANTDB_RefundStatus
-  (*increase_refund)(void *cls,
-                     const char *instance_id,
-                     const char *order_id,
-                     const struct TALER_Amount *refund,
-                     const char *reason);
+    (*increase_refund)(void *cls,
+                       const char *instance_id,
+                       const char *order_id,
+                       const struct TALER_Amount *refund,
+                       const char *reason);
 
 
   /**
@@ -1492,11 +1492,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_refunds_detailed)(void *cls,
-                             const char *instance_id,
-                             const struct GNUNET_HashCode *h_contract_terms,
-                             TALER_MERCHANTDB_RefundDetailCallback rc,
-                             void *rc_cls);
+    (*lookup_refunds_detailed)(void *cls,
+                               const char *instance_id,
+                               const struct GNUNET_HashCode *h_contract_terms,
+                               TALER_MERCHANTDB_RefundDetailCallback rc,
+                               void *rc_cls);
 
   /**
    * Insert refund proof data from the exchange into the database.
@@ -1508,10 +1508,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_refund_proof)(void *cls,
-                         uint64_t refund_serial,
-                         const struct TALER_ExchangeSignatureP *exchange_sig,
-                         const struct TALER_ExchangePublicKeyP *exchange_pub);
+    (*insert_refund_proof)(void *cls,
+                           uint64_t refund_serial,
+                           const struct TALER_ExchangeSignatureP *exchange_sig,
+                           const struct TALER_ExchangePublicKeyP *exchange_pub);
 
 
   /**
@@ -1524,10 +1524,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_refund_proof)(void *cls,
-                         uint64_t refund_serial,
-                         struct TALER_ExchangeSignatureP *exchange_sig,
-                         struct TALER_ExchangePublicKeyP *exchange_pub);
+    (*lookup_refund_proof)(void *cls,
+                           uint64_t refund_serial,
+                           struct TALER_ExchangeSignatureP *exchange_sig,
+                           struct TALER_ExchangePublicKeyP *exchange_pub);
 
 
   /**
@@ -1543,11 +1543,11 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_order_by_fulfillment)(void *cls,
-                                 const char *instance_id,
-                                 const char *fulfillment_url,
-                                 const char *session_id,
-                                 char **order_id);
+    (*lookup_order_by_fulfillment)(void *cls,
+                                   const char *instance_id,
+                                   const char *fulfillment_url,
+                                   const char *session_id,
+                                   char **order_id);
 
   /**
    * Insert information about a wire transfer the merchant has received.
@@ -1563,7 +1563,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_transfer)(
+    (*insert_transfer)(
     void *cls,
     const char *instance_id,
     const char *exchange_url,
@@ -1584,9 +1584,9 @@ struct TALER_MERCHANTDB_Plugin
    *           if deletion is prohibited OR transfer is unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_transfer)(void *cls,
-                     const char *instance_id,
-                     uint64_t transfer_serial_id);
+    (*delete_transfer)(void *cls,
+                       const char *instance_id,
+                       uint64_t transfer_serial_id);
 
 
   /**
@@ -1600,9 +1600,9 @@ struct TALER_MERCHANTDB_Plugin
    *           if the transfer record exists
    */
   enum GNUNET_DB_QueryStatus
-  (*check_transfer_exists)(void *cls,
-                           const char *instance_id,
-                           uint64_t transfer_serial_id);
+    (*check_transfer_exists)(void *cls,
+                             const char *instance_id,
+                             uint64_t transfer_serial_id);
 
 
   /**
@@ -1615,10 +1615,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_account)(void *cls,
-                    const char *instance_id,
-                    const char *payto_uri,
-                    uint64_t *account_serial);
+    (*lookup_account)(void *cls,
+                      const char *instance_id,
+                      const char *payto_uri,
+                      uint64_t *account_serial);
 
 
   /**
@@ -1635,7 +1635,7 @@ struct TALER_MERCHANTDB_Plugin
    *   #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT on success
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_transfer_details)(
+    (*insert_transfer_details)(
     void *cls,
     const char *instance_id,
     const char *exchange_url,
@@ -1661,15 +1661,15 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_wire_fee)(void *cls,
-                     const struct TALER_MasterPublicKeyP *master_pub,
-                     const char *wire_method,
-                     struct GNUNET_TIME_Absolute contract_date,
-                     struct TALER_Amount *wire_fee,
-                     struct TALER_Amount *closing_fee,
-                     struct GNUNET_TIME_Absolute *start_date,
-                     struct GNUNET_TIME_Absolute *end_date,
-                     struct TALER_MasterSignatureP *master_sig);
+    (*lookup_wire_fee)(void *cls,
+                       const struct TALER_MasterPublicKeyP *master_pub,
+                       const char *wire_method,
+                       struct GNUNET_TIME_Absolute contract_date,
+                       struct TALER_Amount *wire_fee,
+                       struct TALER_Amount *closing_fee,
+                       struct GNUNET_TIME_Absolute *start_date,
+                       struct GNUNET_TIME_Absolute *end_date,
+                       struct TALER_MasterSignatureP *master_sig);
 
 
   /**
@@ -1685,7 +1685,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_deposits_by_contract_and_coin)(
+    (*lookup_deposits_by_contract_and_coin)(
     void *cls,
     const char *instance_id,
     const struct GNUNET_HashCode *h_contract_terms,
@@ -1713,7 +1713,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfer)(
+    (*lookup_transfer)(
     void *cls,
     const char *instance_id,
     const char *exchange_url,
@@ -1737,7 +1737,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*set_transfer_status_to_verified)(
+    (*set_transfer_status_to_verified)(
     void *cls,
     const char *exchange_url,
     const struct TALER_WireTransferIdentifierRawP *wtid);
@@ -1756,7 +1756,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfer_summary)(
+    (*lookup_transfer_summary)(
     void *cls,
     const char *exchange_url,
     const struct TALER_WireTransferIdentifierRawP *wtid,
@@ -1777,7 +1777,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfer_details)(
+    (*lookup_transfer_details)(
     void *cls,
     const char *exchange_url,
     const struct TALER_WireTransferIdentifierRawP *wtid,
@@ -1802,16 +1802,16 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfers)(void *cls,
-                      const char *instance_id,
-                      const char *payto_uri,
-                      struct GNUNET_TIME_Absolute before,
-                      struct GNUNET_TIME_Absolute after,
-                      int64_t limit,
-                      uint64_t offset,
-                      enum TALER_EXCHANGE_YesNoAll yna,
-                      TALER_MERCHANTDB_TransferCallback cb,
-                      void *cb_cls);
+    (*lookup_transfers)(void *cls,
+                        const char *instance_id,
+                        const char *payto_uri,
+                        struct GNUNET_TIME_Absolute before,
+                        struct GNUNET_TIME_Absolute after,
+                        int64_t limit,
+                        uint64_t offset,
+                        enum TALER_EXCHANGE_YesNoAll yna,
+                        TALER_MERCHANTDB_TransferCallback cb,
+                        void *cb_cls);
 
 
   /**
@@ -1830,7 +1830,7 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*store_wire_fee_by_exchange)(
+    (*store_wire_fee_by_exchange)(
     void *cls,
     const struct TALER_MasterPublicKeyP *exchange_pub,
     const struct GNUNET_HashCode *h_wire_method,
@@ -1860,14 +1860,14 @@ struct TALER_MERCHANTDB_Plugin
    *      #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT for success
    */
   enum TALER_ErrorCode
-  (*insert_reserve)(void *cls,
-                    const char *instance_id,
-                    const struct TALER_ReservePrivateKeyP *reserve_priv,
-                    const struct TALER_ReservePublicKeyP *reserve_pub,
-                    const char *exchange_url,
-                    const char *payto_uri,
-                    const struct TALER_Amount *initial_balance,
-                    struct GNUNET_TIME_Absolute expiration);
+    (*insert_reserve)(void *cls,
+                      const char *instance_id,
+                      const struct TALER_ReservePrivateKeyP *reserve_priv,
+                      const struct TALER_ReservePublicKeyP *reserve_pub,
+                      const char *exchange_url,
+                      const char *payto_uri,
+                      const struct TALER_Amount *initial_balance,
+                      struct GNUNET_TIME_Absolute expiration);
 
 
   /**
@@ -1884,10 +1884,10 @@ struct TALER_MERCHANTDB_Plugin
    *      #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT for success
    */
   enum GNUNET_DB_QueryStatus
-  (*activate_reserve)(void *cls,
-                      const char *instance_id,
-                      const struct TALER_ReservePublicKeyP *reserve_pub,
-                      const struct TALER_Amount *initial_exchange_balance);
+    (*activate_reserve)(void *cls,
+                        const char *instance_id,
+                        const struct TALER_ReservePublicKeyP *reserve_pub,
+                        const struct TALER_Amount *initial_exchange_balance);
 
 
   /**
@@ -1903,13 +1903,13 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_reserves)(void *cls,
-                     const char *instance_id,
-                     struct GNUNET_TIME_Absolute created_after,
-                     enum TALER_EXCHANGE_YesNoAll active,
-                     enum TALER_EXCHANGE_YesNoAll failures,
-                     TALER_MERCHANTDB_ReservesCallback cb,
-                     void *cb_cls);
+    (*lookup_reserves)(void *cls,
+                       const char *instance_id,
+                       struct GNUNET_TIME_Absolute created_after,
+                       enum TALER_EXCHANGE_YesNoAll active,
+                       enum TALER_EXCHANGE_YesNoAll failures,
+                       TALER_MERCHANTDB_ReservesCallback cb,
+                       void *cb_cls);
 
 
   /**
@@ -1921,9 +1921,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_pending_reserves)(void *cls,
-                             TALER_MERCHANTDB_PendingReservesCallback cb,
-                             void *cb_cls);
+    (*lookup_pending_reserves)(void *cls,
+                               TALER_MERCHANTDB_PendingReservesCallback cb,
+                               void *cb_cls);
 
 
   /**
@@ -1938,12 +1938,12 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_reserve)(void *cls,
-                    const char *instance_id,
-                    const struct TALER_ReservePublicKeyP *reserve_pub,
-                    bool fetch_tips,
-                    TALER_MERCHANTDB_ReserveDetailsCallback cb,
-                    void *cb_cls);
+    (*lookup_reserve)(void *cls,
+                      const char *instance_id,
+                      const struct TALER_ReservePublicKeyP *reserve_pub,
+                      bool fetch_tips,
+                      TALER_MERCHANTDB_ReserveDetailsCallback cb,
+                      void *cb_cls);
 
 
   /**
@@ -1955,9 +1955,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_reserve)(void *cls,
-                    const char *instance_id,
-                    const struct TALER_ReservePublicKeyP *reserve_pub);
+    (*delete_reserve)(void *cls,
+                      const char *instance_id,
+                      const struct TALER_ReservePublicKeyP *reserve_pub);
 
   /**
    * Purge all information about a reserve (including tips from it).
@@ -1968,9 +1968,9 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*purge_reserve)(void *cls,
-                   const char *instance_id,
-                   const struct TALER_ReservePublicKeyP *reserve_pub);
+    (*purge_reserve)(void *cls,
+                     const char *instance_id,
+                     const struct TALER_ReservePublicKeyP *reserve_pub);
 
 
   /**
@@ -1998,14 +1998,14 @@ struct TALER_MERCHANTDB_Plugin
    *      #TALER_EC_NONE upon success
    */
   enum TALER_ErrorCode
-  (*authorize_tip)(void *cls,
-                   const char *instance_id,
-                   const struct TALER_ReservePublicKeyP *reserve_pub,
-                   const struct TALER_Amount *amount,
-                   const char *justification,
-                   const char *next_url,
-                   struct GNUNET_HashCode *tip_id,
-                   struct GNUNET_TIME_Absolute *expiration);
+    (*authorize_tip)(void *cls,
+                     const char *instance_id,
+                     const struct TALER_ReservePublicKeyP *reserve_pub,
+                     const struct TALER_Amount *amount,
+                     const char *justification,
+                     const char *next_url,
+                     struct GNUNET_HashCode *tip_id,
+                     struct GNUNET_TIME_Absolute *expiration);
 
 
   /**
@@ -2023,14 +2023,14 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_pickup)(void *cls,
-                   const char *instance_id,
-                   const struct GNUNET_HashCode *tip_id,
-                   const struct GNUNET_HashCode *pickup_id,
-                   char **exchange_url,
-                   struct TALER_ReservePrivateKeyP *reserve_priv,
-                   unsigned int sigs_length,
-                   struct GNUNET_CRYPTO_RsaSignature *sigs[]);
+    (*lookup_pickup)(void *cls,
+                     const char *instance_id,
+                     const struct GNUNET_HashCode *tip_id,
+                     const struct GNUNET_HashCode *pickup_id,
+                     char **exchange_url,
+                     struct TALER_ReservePrivateKeyP *reserve_priv,
+                     unsigned int sigs_length,
+                     struct GNUNET_CRYPTO_RsaSignature *sigs[]);
 
 
   /**
@@ -2047,14 +2047,14 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_tip)(void *cls,
-                const char *instance_id,
-                const struct GNUNET_HashCode *tip_id,
-                struct TALER_Amount *total_authorized,
-                struct TALER_Amount *total_picked_up,
-                struct GNUNET_TIME_Absolute *expiration,
-                char **exchange_url,
-                struct TALER_ReservePrivateKeyP *reserve_priv);
+    (*lookup_tip)(void *cls,
+                  const char *instance_id,
+                  const struct GNUNET_HashCode *tip_id,
+                  struct TALER_Amount *total_authorized,
+                  struct TALER_Amount *total_picked_up,
+                  struct GNUNET_TIME_Absolute *expiration,
+                  char **exchange_url,
+                  struct TALER_ReservePrivateKeyP *reserve_priv);
 
 
   /**
@@ -2071,13 +2071,13 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_tips)(void *cls,
-                 const char *instance_id,
-                 enum TALER_EXCHANGE_YesNoAll expired,
-                 int64_t limit,
-                 uint64_t offset,
-                 TALER_MERCHANTDB_TipsCallback cb,
-                 void *cb_cls);
+    (*lookup_tips)(void *cls,
+                   const char *instance_id,
+                   enum TALER_EXCHANGE_YesNoAll expired,
+                   int64_t limit,
+                   uint64_t offset,
+                   TALER_MERCHANTDB_TipsCallback cb,
+                   void *cb_cls);
 
 
   /**
@@ -2097,17 +2097,17 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_tip_details)(void *cls,
-                        const char *instance_id,
-                        const struct GNUNET_HashCode *tip_id,
-                        bool fpu,
-                        struct TALER_Amount *total_authorized,
-                        struct TALER_Amount *total_picked_up,
-                        char **justification,
-                        struct GNUNET_TIME_Absolute *expiration,
-                        struct TALER_ReservePublicKeyP *reserve_pub,
-                        unsigned int *pickups_length,
-                        struct TALER_MERCHANTDB_PickupDetails **pickups);
+    (*lookup_tip_details)(void *cls,
+                          const char *instance_id,
+                          const struct GNUNET_HashCode *tip_id,
+                          bool fpu,
+                          struct TALER_Amount *total_authorized,
+                          struct TALER_Amount *total_picked_up,
+                          char **justification,
+                          struct GNUNET_TIME_Absolute *expiration,
+                          struct TALER_ReservePublicKeyP *reserve_pub,
+                          unsigned int *pickups_length,
+                          struct TALER_MERCHANTDB_PickupDetails **pickups);
 
 
   /**
@@ -2129,12 +2129,12 @@ struct TALER_MERCHANTDB_Plugin
    *      #GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if @a credit_uuid already known
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_pickup)(void *cls,
-                   const char *instance_id,
-                   const struct GNUNET_HashCode *tip_id,
-                   const struct TALER_Amount *total_picked_up,
-                   const struct GNUNET_HashCode *pickup_id,
-                   const struct TALER_Amount *total_requested);
+    (*insert_pickup)(void *cls,
+                     const char *instance_id,
+                     const struct GNUNET_HashCode *tip_id,
+                     const struct TALER_Amount *total_picked_up,
+                     const struct GNUNET_HashCode *pickup_id,
+                     const struct TALER_Amount *total_requested);
 
 
   /**
@@ -2150,7 +2150,7 @@ struct TALER_MERCHANTDB_Plugin
    *      #GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if @a credit_uuid already known
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_pickup_blind_signature)(
+    (*insert_pickup_blind_signature)(
     void *cls,
     const struct GNUNET_HashCode *pickup_id,
     uint32_t offset,
author	Florian Dold <florian@dold.me>	2021-07-21 16:18:52 +0200
committer	Florian Dold <florian@dold.me>	2021-07-21 16:19:00 +0200
commit	0a1162b5a19814467adce5b490fd2d925b0a31e4 (patch)
tree	b04d6f2e77cf3f612c41b787266cab15b1754e3d /src
parent	0bbb02adc90f7b968d52c65e566737228964f7d3 (diff)