[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 15/19: Renaming in /track/transaction hand
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 15/19: Renaming in /track/transaction handler. |
Date: |
Fri, 10 Feb 2017 14:23:06 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit 17e344a8aea027132631d8a423391fb9f77da2dc
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Feb 6 16:42:16 2017 +0100
Renaming in /track/transaction handler.
---
src/backend/taler-merchant-httpd_pay.c | 2 +-
src/backend/taler-merchant-httpd_track-transaction.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_pay.c
b/src/backend/taler-merchant-httpd_pay.c
index 8406ee9..9dec5e0 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -709,7 +709,7 @@ process_pay_with_exchange (void *cls,
&dc->ub_sig,
&dc->denom,
pc->timestamp,
- pc->transaction_id,
+ 0, /*FIXME: tid*/
&pc->mi->pubkey,
pc->refund_deadline,
&dc->coin_sig,
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c
b/src/backend/taler-merchant-httpd_track-transaction.c
index 976cbb5..aeb2563 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -349,14 +349,14 @@ wire_deposits_cb (void *cls,
const struct TALER_Amount *total_amount,
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,
@@ -564,7 +564,7 @@ trace_coins (struct TrackTransactionContext *tctx)
&tctx->mi->privkey,
&tctx->h_wire,
&tcc->coin_pub,
- tctx->transaction_id,
+ 0, /*FIXME: tid*/
&wtid_cb,
tcc);
return;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-merchant] branch master updated (832838e -> 60c5ee7), gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 01/19: First steps in renaming, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 06/19: Removing h_contract from /pay handler., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 11/19: Updating notes., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 09/19: Typo, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 02/19: Renaming proposal data db operations, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 04/19: First run about renaming in lib's testcase., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 18/19: Fix backenddb, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 14/19: renaming (a little part of) /track/transfer handler, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 07/19: Removing _map.c from repo, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 15/19: Renaming in /track/transaction handler.,
gnunet <=
- [GNUnet-SVN] [taler-merchant] 08/19: Garbage removal, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 10/19: Renaming the DB and /history., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 03/19: Removing obsolete /map requests and renaming contract->proposal/order, within lib., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 13/19: Renaming /track/transaction handler to the point where it depends on a few exchange-lib's renamings., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 16/19: Huge renaming about removing transaction_id use, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 05/19: renaming: proposal logic ported, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 17/19: More fixes on renaming, mostly in db., gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 12/19: Fix backenddb tests after renaming, gnunet, 2017/02/10
- [GNUnet-SVN] [taler-merchant] 19/19: Fixing testcases according to the renaming occurred in the protocol. Please note, comments do NOT match code, /proposal uses the POST method, and tracking API are NOT tested yet., gnunet, 2017/02/10