diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-04 16:49:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-04 16:49:48 +0100 |
commit | 50bdee0736a9552d61b315d3cb686c9849ed4d5e (patch) | |
tree | e741b4baf0f805666e890c0d3166bc7abd6a8eab /src/backend/taler-merchant-httpd_track-transaction.c | |
parent | 341bb90f91d4d1a09332b5596653767ce7138ebd (diff) | |
download | merchant-50bdee0736a9552d61b315d3cb686c9849ed4d5e.tar.gz merchant-50bdee0736a9552d61b315d3cb686c9849ed4d5e.tar.bz2 merchant-50bdee0736a9552d61b315d3cb686c9849ed4d5e.zip |
implementing #4929 (adjusting to exchange API changes)
Diffstat (limited to 'src/backend/taler-merchant-httpd_track-transaction.c')
-rw-r--r-- | src/backend/taler-merchant-httpd_track-transaction.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c index 17b45425..b0dffaff 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, |