[GNUnet-SVN] [taler-merchant] branch master updated: implementing #4929 (adjusting to exchange API changes)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 50bdee0  implementing #4929 (adjusting to exchange API changes)
50bdee0 is described below

commit 50bdee0736a9552d61b315d3cb686c9849ed4d5e
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Mar 4 16:49:48 2017 +0100

    implementing #4929 (adjusting to exchange API changes)
---
 src/backend/taler-merchant-httpd_track-transaction.c | 18 ++++++++++--------
 src/backend/taler-merchant-httpd_track-transfer.c    |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_track-transaction.c 
b/src/backend/taler-merchant-httpd_track-transaction.c
index 17b4542..b0dffaf 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -340,6 +340,7 @@ trace_coins (struct TrackTransactionContext *tctx);
  *             not provide any (set only if @a http_status is #MHD_HTTP_OK)
  * @param total_amount total amount of the wire transfer, or NULL if the 
exchange could
  *             not provide any @a wtid (set only if @a http_status is 
#MHD_HTTP_OK)
+ * @param wire_fee wire fee that was charged by the exchange
  * @param details_length length of the @a details array
  * @param details array with details about the combined transactions
  */
@@ -352,16 +353,17 @@ wire_deposits_cb (void *cls,
                   const struct GNUNET_HashCode *h_wire,
                   struct GNUNET_TIME_Absolute execution_time,
                   const struct TALER_Amount *total_amount,
+                  const struct TALER_Amount *wire_fee,
                   unsigned int details_length,
                   const struct TALER_TrackTransferDetails *details)
-    {
-      struct TrackTransactionContext *tctx = cls;
-      struct TrackCoinContext *tcc;
-      unsigned int i;
+{
+  struct TrackTransactionContext *tctx = cls;
+  struct TrackCoinContext *tcc;
+  unsigned int i;
 
-      tctx->wdh = NULL;
-      if (MHD_HTTP_OK != http_status)
-      {
+  tctx->wdh = NULL;
+  if (MHD_HTTP_OK != http_status)
+  {
     resume_track_transaction_with_response
       (tctx,
        MHD_HTTP_FAILED_DEPENDENCY,
@@ -509,7 +511,7 @@ wtid_cb (void *cls,
   /* WARNING: if two transactions got aggregated under the same
      WTID, then this branch is always taken (when attempting to
      track the second transaction). */
-  if (GNUNET_OK == 
+  if (GNUNET_OK ==
       db->find_proof_by_wtid (db->cls,
                               tctx->exchange_uri,
                               wtid,
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c 
b/src/backend/taler-merchant-httpd_track-transfer.c
index 6f4d49a..029eec5 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -267,6 +267,7 @@ check_transfer (void *cls,
  * @param execution_time time when the exchange claims to have performed the 
wire transfer
  * @param total_amount total amount of the wire transfer, or NULL if the 
exchange could
  *             not provide any @a wtid (set only if @a http_status is 
#MHD_HTTP_OK)
+ * @param wire_fee wire fee that was charged by the exchange
  * @param details_length length of the @a details array
  * @param details array with details about the combined transactions
  */
@@ -279,6 +280,7 @@ wire_transfer_cb (void *cls,
                   const struct GNUNET_HashCode *h_wire,
                   struct GNUNET_TIME_Absolute execution_time,
                   const struct TALER_Amount *total_amount,
+                  const struct TALER_Amount *wire_fee,
                   unsigned int details_length,
                   const struct TALER_TrackTransferDetails *details)
 {

-- 
To stop receiving notification emails like this one, please contact
address@hidden