From bb511560fe6d963ff01113b0d242813ca173cf51 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 9 Jun 2016 21:03:07 +0200
Subject: [PATCH] move TALER_TrackTransferDetails to taler_crypto_lib.h as it
 is not exchange-specific

---
 src/exchange-lib/exchange_api_wire_deposits.c |  4 +-
 src/include/taler_crypto_lib.h                | 34 ++++++++++++
 src/include/taler_exchange_service.h          | 52 ++++---------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c
index 68eb9d35e..71afa24d5 100644
--- a/src/exchange-lib/exchange_api_wire_deposits.c
+++ b/src/exchange-lib/exchange_api_wire_deposits.c
@@ -56,7 +56,7 @@ struct TALER_EXCHANGE_TrackTransferHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_WireDepositsCallback cb;
+  TALER_EXCHANGE_TrackTransferCallback cb;
 
   /**
    * Closure for @a cb.
@@ -245,7 +245,7 @@ handle_wire_deposits_finished (void *cls,
 struct TALER_EXCHANGE_TrackTransferHandle *
 TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
                               const struct TALER_WireTransferIdentifierRawP *wtid,
-                              TALER_EXCHANGE_WireDepositsCallback cb,
+                              TALER_EXCHANGE_TrackTransferCallback cb,
                               void *cb_cls)
 {
   struct TALER_EXCHANGE_TrackTransferHandle *wdh;
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index af451b208..b07da775f 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -354,6 +354,40 @@ struct TALER_CoinPublicInfo
 };
 
 
+/**
+ * Details for one of the /deposit operations that the
+ * exchange combined into a single wire transfer.
+ */
+struct TALER_TrackTransferDetails
+{
+  /**
+   * Hash of the contract.
+   */
+  struct GNUNET_HashCode h_contract;
+
+  /**
+   * Which coin was deposited?
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Value of the deposit (including fee).
+   */
+  struct TALER_Amount coin_value;
+
+  /**
+   * Fee charged by the exchange for the deposit.
+   */
+  struct TALER_Amount coin_fee;
+
+  /**
+   * Merchant's transaction identifier.
+   */
+  uint64_t transaction_id;
+
+};
+
+
 /**
  * Check if a coin is valid; that is, whether the denomination key exists,
  * is not expired, and the signature is correct.
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 2938b9f93..1d52481d7 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1101,40 +1101,6 @@ TALER_EXCHANGE_admin_add_incoming_cancel (struct TALER_EXCHANGE_AdminAddIncoming
 struct TALER_EXCHANGE_TrackTransferHandle;
 
 
-/**
- * Details for one of the /deposit operations that the
- * exchange combined into a single wire transfer.
- */
-struct TALER_TrackTransferDetails
-{
-  /**
-   * Hash of the contract.
-   */
-  struct GNUNET_HashCode h_contract;
-
-  /**
-   * Which coin was deposited?
-   */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
-
-  /**
-   * Value of the deposit (including fee).
-   */
-  struct TALER_Amount coin_value;
-
-  /**
-   * Fee charged by the exchange for the deposit.
-   */
-  struct TALER_Amount coin_fee;
-
-  /**
-   * Merchant's transaction identifier.
-   */
-  uint64_t transaction_id;
-
-};
-
-
 /**
  * Function called with detailed wire transfer data, including all
  * of the coin transactions that were combined into the wire transfer.
@@ -1152,14 +1118,14 @@ struct TALER_TrackTransferDetails
  * @param details array with details about the combined transactions
  */
 typedef void
-(*TALER_EXCHANGE_WireDepositsCallback)(void *cls,
-                                       unsigned int http_status,
-                                       const struct TALER_ExchangePublicKeyP *sign_key,
-                                       const json_t *json,
-                                       const struct GNUNET_HashCode *h_wire,
-                                       const struct TALER_Amount *total_amount,
-                                       unsigned int details_length,
-                                       const struct TALER_TrackTransferDetails *details);
+(*TALER_EXCHANGE_TrackTransferCallback)(void *cls,
+                                        unsigned int http_status,
+                                        const struct TALER_ExchangePublicKeyP *sign_key,
+                                        const json_t *json,
+                                        const struct GNUNET_HashCode *h_wire,
+                                        const struct TALER_Amount *total_amount,
+                                        unsigned int details_length,
+                                        const struct TALER_TrackTransferDetails *details);
 
 
 /**
@@ -1175,7 +1141,7 @@ typedef void
 struct TALER_EXCHANGE_TrackTransferHandle *
 TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
                                const struct TALER_WireTransferIdentifierRawP *wtid,
-                               TALER_EXCHANGE_WireDepositsCallback cb,
+                               TALER_EXCHANGE_TrackTransferCallback cb,
                                void *cb_cls);