diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-06-09 23:35:35 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-06-09 23:35:35 +0200 |
| commit | 9f23e213cfb9260a5dd037779c12f95668145a1b (patch) | |
| tree | e75ee0d85f4280b8421317f7d2a7ca91e03c5139 /src/exchange/taler-exchange-httpd_responses.c | |
| parent | fc07c4c1591d8c10db4f747e157ebda96d3d6ba8 (diff) | |
| parent | 42e2d51e53729fb8ae62beffda034391d03b8850 (diff) | |
Merge branch 'master' of ssh://taler.net/var/git/exchange
Diffstat (limited to 'src/exchange/taler-exchange-httpd_responses.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_responses.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c index d6d3d3f9..91e37209 100644 --- a/src/exchange/taler-exchange-httpd_responses.c +++ b/src/exchange/taler-exchange-httpd_responses.c @@ -1146,7 +1146,7 @@ TMH_RESPONSE_reply_refresh_link_success (struct MHD_Connection *connection, * @return MHD result code */ int -TMH_RESPONSE_reply_deposit_unknown (struct MHD_Connection *connection) +TMH_RESPONSE_reply_transaction_unknown (struct MHD_Connection *connection) { return TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_NOT_FOUND, @@ -1164,7 +1164,7 @@ TMH_RESPONSE_reply_deposit_unknown (struct MHD_Connection *connection) * @return MHD result code */ int -TMH_RESPONSE_reply_deposit_pending (struct MHD_Connection *connection, +TMH_RESPONSE_reply_transfer_pending (struct MHD_Connection *connection, struct GNUNET_TIME_Absolute planned_exec_time) { return TMH_RESPONSE_reply_json_pack (connection, @@ -1190,7 +1190,7 @@ TMH_RESPONSE_reply_deposit_pending (struct MHD_Connection *connection, * @return MHD result code */ int -TMH_RESPONSE_reply_deposit_wtid (struct MHD_Connection *connection, +TMH_RESPONSE_reply_track_transaction (struct MHD_Connection *connection, const struct GNUNET_HashCode *h_contract, const struct GNUNET_HashCode *h_wire, const struct TALER_CoinSpendPublicKeyP *coin_pub, @@ -1239,13 +1239,13 @@ TMH_RESPONSE_reply_deposit_wtid (struct MHD_Connection *connection, * @return MHD result code */ int -TMH_RESPONSE_reply_wire_deposit_details (struct MHD_Connection *connection, +TMH_RESPONSE_reply_track_transfer_details (struct MHD_Connection *connection, const struct TALER_Amount *total, const struct TALER_MerchantPublicKeyP *merchant_pub, const struct GNUNET_HashCode *h_wire, - const struct TMH_WireDepositDetail *wdd_head) + const struct TMH_TrackTransferDetail *wdd_head) { - const struct TMH_WireDepositDetail *wdd_pos; + const struct TMH_TrackTransferDetail *wdd_pos; json_t *deposits; struct TALER_WireDepositDetailP dd; struct GNUNET_HashContext *hash_context; |