diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-04 06:10:41 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-04 06:10:41 +0200 |
| commit | 455368147695d6f84bdfb814794483d4a0464e56 (patch) | |
| tree | a66b9e479ff1548884f611df653b0ed7a9cd0514 /src/exchange/taler-exchange-httpd_responses.c | |
| parent | 910e01d1c154390a7e724703bdd9a14046245d2c (diff) | |
| download | exchange-455368147695d6f84bdfb814794483d4a0464e56.tar.gz exchange-455368147695d6f84bdfb814794483d4a0464e56.tar.bz2 exchange-455368147695d6f84bdfb814794483d4a0464e56.zip | |
fix issues in tracking API and tracking API test, resolves #4399
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 7bac0d88c..c8a72f499 100644 --- a/src/exchange/taler-exchange-httpd_responses.c +++ b/src/exchange/taler-exchange-httpd_responses.c @@ -1184,14 +1184,14 @@ TMH_RESPONSE_reply_wire_deposit_details (struct MHD_Connection *connection, &dd, sizeof (struct TALER_WireDepositDetailP)); json_array_append (deposits, - json_pack ("{s:o, s:o, s:o, s:I, s:o}", - "deposit_value", TALER_JSON_from_amount (&wdd_pos->deposit_value), - "deposit_fee", TALER_JSON_from_amount (&wdd_pos->deposit_fee), + json_pack ("{s:o, s:I, s:o, s:o, s:o}", "H_contract", GNUNET_JSON_from_data (&wdd_pos->h_contract, sizeof (struct GNUNET_HashCode)), "transaction_id", (json_int_t) wdd_pos->transaction_id, "coin_pub", GNUNET_JSON_from_data (&wdd_pos->coin_pub, - sizeof (struct TALER_CoinSpendPublicKeyP)))); + sizeof (struct TALER_CoinSpendPublicKeyP)), + "deposit_value", TALER_JSON_from_amount (&wdd_pos->deposit_value), + "deposit_fee", TALER_JSON_from_amount (&wdd_pos->deposit_fee))); } wdp.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT); wdp.purpose.size = htonl (sizeof (struct TALER_WireDepositDataPS)); @@ -1206,11 +1206,11 @@ TMH_RESPONSE_reply_wire_deposit_details (struct MHD_Connection *connection, &sig); return TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_OK, - "{s:o, s:o, s:o, s:o}", + "{s:o, s:o, s:o, s:o, s:o, s:o}", "total", TALER_JSON_from_amount (total), "merchant_pub", GNUNET_JSON_from_data (merchant_pub, sizeof (struct TALER_MerchantPublicKeyP)), - "h_wire", GNUNET_JSON_from_data (h_wire, + "H_wire", GNUNET_JSON_from_data (h_wire, sizeof (struct GNUNET_HashCode)), "deposits", deposits, "exchange_sig", GNUNET_JSON_from_data (&sig, |