diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-06-11 20:48:47 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-06-11 20:48:47 +0200 |
| commit | 52de2d37fa7e5f46ed52a6719b40d80d2349720f (patch) | |
| tree | 49cbfad9623c7ff6b1701a6a576e8fa54f5982c9 /src/backend | |
| parent | 16abbebef705c31af9731fff5cd619227e92b680 (diff) | |
| download | merchant-52de2d37fa7e5f46ed52a6719b40d80d2349720f.tar.gz merchant-52de2d37fa7e5f46ed52a6719b40d80d2349720f.tar.bz2 merchant-52de2d37fa7e5f46ed52a6719b40d80d2349720f.zip | |
fixing #4160
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/taler-merchant-httpd_responses.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_track-transaction.c | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_track-transfer.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd_responses.c b/src/backend/taler-merchant-httpd_responses.c index 31e0d6d6..bfc449cf 100644 --- a/src/backend/taler-merchant-httpd_responses.c +++ b/src/backend/taler-merchant-httpd_responses.c @@ -400,7 +400,7 @@ TMH_RESPONSE_make_track_transaction_ok (unsigned int num_transfers, } GNUNET_assert (0 == json_array_append_new (j_transfers, - json_pack ("{s:o, s:o}", + json_pack ("{s:o, s:o, s:o}", "wtid", GNUNET_JSON_from_data_auto (&transfer->wtid), "execution_time", GNUNET_JSON_from_time_abs (transfer->execution_time), "coins", j_coins))); diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c index 37c0a5f9..d2e95e51 100644 --- a/src/backend/taler-merchant-httpd_track-transaction.c +++ b/src/backend/taler-merchant-httpd_track-transaction.c @@ -356,6 +356,7 @@ wire_deposits_cb (void *cls, db->store_transfer_to_proof (db->cls, tctx->exchange_uri, &tctx->current_wtid, + tctx->current_execution_time, exchange_pub, json)) { @@ -692,6 +693,7 @@ transaction_cb (void *cls, * @param coin_pub public key of the coin * @param wtid identifier of the wire transfer in which the exchange * send us the money for the coin deposit + * @param execution_time when was the wire transfer executed? * @param exchange_proof proof from exchange about what the deposit was for * NULL if we have not asked for this signature */ @@ -700,6 +702,7 @@ transfer_cb (void *cls, uint64_t transaction_id, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_WireTransferIdentifierRawP *wtid, + struct GNUNET_TIME_Absolute execution_time, const json_t *exchange_proof) { struct TrackCoinContext *tcc = cls; @@ -708,6 +711,7 @@ transfer_cb (void *cls, &tcc->coin_pub, sizeof (struct TALER_CoinSpendPublicKeyP))); tcc->wtid = *wtid; + tcc->execution_time = execution_time; tcc->have_wtid = GNUNET_YES; } diff --git a/src/backend/taler-merchant-httpd_track-transfer.c b/src/backend/taler-merchant-httpd_track-transfer.c index 1e7ef255..5dcfca2f 100644 --- a/src/backend/taler-merchant-httpd_track-transfer.c +++ b/src/backend/taler-merchant-httpd_track-transfer.c @@ -277,6 +277,8 @@ wire_transfer_cb (void *cls, db->store_transfer_to_proof (db->cls, rctx->uri, &rctx->wtid, + GNUNET_TIME_UNIT_ZERO_ABS + /* FIXME: unknowable with current APIs */, exchange_pub, json)) { |