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-lib/exchange_api_wire_deposits.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-lib/exchange_api_wire_deposits.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_wire_deposits.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c index bcb29e872..446ac0037 100644 --- a/src/exchange-lib/exchange_api_wire_deposits.c +++ b/src/exchange-lib/exchange_api_wire_deposits.c @@ -96,12 +96,12 @@ handle_wire_deposits_finished (void *cls, struct TALER_ExchangePublicKeyP exchange_pub; struct TALER_ExchangeSignatureP exchange_sig; struct GNUNET_JSON_Specification spec[] = { + TALER_JSON_spec_amount ("total", &total_amount), + GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub), GNUNET_JSON_spec_fixed_auto ("H_wire", &h_wire), - GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub), + GNUNET_JSON_spec_json ("deposits", &details_j), GNUNET_JSON_spec_fixed_auto ("exchange_sig", &exchange_sig), - GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub), - TALER_JSON_spec_amount ("total_amount", &total_amount), - GNUNET_JSON_spec_json ("details", &details_j), + GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub), GNUNET_JSON_spec_end() }; @@ -129,10 +129,10 @@ handle_wire_deposits_finished (void *cls, struct json_t *detail_j = json_array_get (details_j, i); struct GNUNET_JSON_Specification spec_detail[] = { GNUNET_JSON_spec_fixed_auto ("H_contract", &detail->h_contract), - TALER_JSON_spec_amount ("deposit_value", &detail->coin_value), - TALER_JSON_spec_amount ("deposit_fee", &detail->coin_fee), GNUNET_JSON_spec_uint64 ("transaction_id", &detail->transaction_id), GNUNET_JSON_spec_fixed_auto ("coin_pub", &detail->coin_pub), + TALER_JSON_spec_amount ("deposit_value", &detail->coin_value), + TALER_JSON_spec_amount ("deposit_fee", &detail->coin_fee), GNUNET_JSON_spec_end() }; |