summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-02-06 15:47:51 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-02-06 15:47:51 +0100
commit7216095aebda9e924229b1cb430889856a4b3666 (patch)
tree26c2e89f94b476a71b306101b4f755155d7cd9ab /src
parent3051f7f06358f5f25dcd35588f663672b266e0a5 (diff)
downloadmerchant-7216095aebda9e924229b1cb430889856a4b3666.tar.gz
merchant-7216095aebda9e924229b1cb430889856a4b3666.tar.bz2
merchant-7216095aebda9e924229b1cb430889856a4b3666.zip
renaming (a little part of) /track/transfer handler
Diffstat (limited to 'src')
-rw-r--r--src/backend/taler-merchant-httpd_track-transfer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c b/src/backend/taler-merchant-httpd_track-transfer.c
index e6c08d64..40017c41 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;