[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 14/19: renaming (a little part of) /track/
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 14/19: renaming (a little part of) /track/transfer handler |
Date: |
Fri, 10 Feb 2017 14:23:05 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit 7216095aebda9e924229b1cb430889856a4b3666
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Feb 6 15:47:51 2017 +0100
renaming (a little part of) /track/transfer handler
---
RENAMING_NOTES.txt | 6 ++----
src/backend/taler-merchant-httpd_track-transfer.c | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/RENAMING_NOTES.txt b/RENAMING_NOTES.txt
index b7eb088..50697ef 100644
--- a/RENAMING_NOTES.txt
+++ b/RENAMING_NOTES.txt
@@ -1,9 +1,7 @@
Files to be cleaned from the 'h/H_contract' presence.
-- track-transaction
-- track-transfer
-- postgres plugin
-- db testcase
- merchant service include
- pay lib
+- track-lib: references to H_contract to be removed.
+ especially when the logic reads JSON responses.
- lib testcase
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c
b/src/backend/taler-merchant-httpd_track-transfer.c
index e6c08d6..40017c4 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -215,7 +215,7 @@ track_transfer_cleanup (struct TM_HandlerContext *hc)
*/
static void
check_transfer (void *cls,
- uint64_t transaction_id,
+ const char *transaction_id,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *amount_with_fee,
const struct TALER_Amount *deposit_fee,
@@ -237,14 +237,14 @@ check_transfer (void *cls,
rctx->check_transfer_result = GNUNET_SYSERR;
/* Build the `TrackTransferConflictDetails` */
rctx->response
- = TMH_RESPONSE_make_json_pack ("{s:I, s:s, s:o, s:I, s:o, s:o, s:I, s:o,
s:o}",
+ = TMH_RESPONSE_make_json_pack ("{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o,
s:o}",
"code", (json_int_t)
TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
"hint", "disagreement about deposit
valuation",
"exchange_deposit_proof", exchange_proof,
"conflict_offset", (json_int_t)
rctx->current_offset,
"exchange_transfer_proof",
rctx->original_response,
"coin_pub", GNUNET_JSON_from_data_auto
(coin_pub),
- "transaction_id", (json_int_t)
transaction_id,
+ "transaction_id", transaction_id,
"amount_with_fee", TALER_JSON_from_amount
(amount_with_fee),
"deposit_fee", TALER_JSON_from_amount
(deposit_fee));
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 <=
- [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, 2017/02/10
- [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