From 20aad54c3e010020185c76d9e0727f3f497c2f73 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 8 May 2017 13:18:36 +0200
Subject: remove dead transfer details field from reserves_in (API, exchangedb,
 etc.)

---
 src/include/taler_exchange_service.h  |  9 +++++++--
 src/include/taler_exchangedb_plugin.h | 16 +++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/include')

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index d1d6f3bda..f65cf2a01 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -711,9 +711,14 @@ struct TALER_EXCHANGE_ReserveHistory
       json_t *sender_account_details;
 
       /**
-       * Wire transfer details for the incoming transfer.
+       * Information that uniquely identifies the wire transfer.
        */
-      json_t *transfer_details;
+      void *wire_reference;
+
+      /**
+       * Number of bytes stored in @e wire_reference.
+       */
+      size_t wire_reference_size;
 
     } in_details;
 
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index a8df8c859..e4277b462 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -55,12 +55,6 @@ struct TALER_EXCHANGEDB_BankTransfer
    */
   json_t *sender_account_details;
 
-  /**
-   * Detailed wire transfer information that uniquely identifies the
-   * wire transfer.
-   */
-  json_t *transfer_details;
-
   /**
    * Data uniquely identifying the wire transfer (wire transfer-type specific)
    */
@@ -809,7 +803,6 @@ typedef int
  * @param reserve_pub public key of the reserve (also the WTID)
  * @param credit amount that was received
  * @param sender_account_details information about the sender's bank account
- * @param transfer_details information that uniquely identifies the wire transfer
  * @param wire_reference unique identifier for the wire transfer (plugin-specific format)
  * @param wire_reference_size number of bytes in @a wire_reference
  * @param execution_date when did we receive the funds
@@ -821,7 +814,6 @@ typedef int
                                       const struct TALER_ReservePublicKeyP *reserve_pub,
                                       const struct TALER_Amount *credit,
                                       const json_t *sender_account_details,
-                                      const json_t *transfer_details,
                                       const void *wire_reference,
                                       size_t wire_reference_size,
                                       struct GNUNET_TIME_Absolute execution_date);
@@ -1197,7 +1189,6 @@ struct TALER_EXCHANGEDB_Plugin
    * @param sender_account_details information about the sender's bank account
    * @param wire_reference unique reference identifying the wire transfer (binary blob)
    * @param wire_reference_size number of bytes in @a wire_reference
-   * @param transfer_details information that uniquely identifies the wire transfer
    * @return #GNUNET_OK upon success; #GNUNET_NO if the given
    *         @a details are already known for this @a reserve_pub,
    *         #GNUNET_SYSERR upon failures (DB error, incompatible currency)
@@ -1210,8 +1201,7 @@ struct TALER_EXCHANGEDB_Plugin
                          struct GNUNET_TIME_Absolute execution_time,
                          const json_t *sender_account_details,
                          const void *wire_reference,
-                         size_t wire_reference_size,
-                         const json_t *transfer_details);
+                         size_t wire_reference_size);
 
 
   /**
@@ -1938,7 +1928,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param session database connection
    * @param date time of the wire transfer
    * @param wtid subject of the wire transfer
-   * @param wire details about the receiver account of the wire transfer
+   * @param wire_account details about the receiver account of the wire transfer
    * @param amount amount that was transmitted
    * @return #GNUNET_OK on success
    *         #GNUNET_SYSERR on DB errors
@@ -1948,7 +1938,7 @@ struct TALER_EXCHANGEDB_Plugin
                              struct TALER_EXCHANGEDB_Session *session,
                              struct GNUNET_TIME_Absolute date,
                              const struct TALER_WireTransferIdentifierRawP *wtid,
-                             const json_t *wire,
+                             const json_t *wire_account,
                              const struct TALER_Amount *amount);
 
 
-- 
cgit v1.2.3