diff options
| author | Jeff Burdges <burdges@gnunet.org> | 2016-05-04 23:30:36 +0200 |
|---|---|---|
| committer | Jeff Burdges <burdges@gnunet.org> | 2016-05-04 23:30:36 +0200 |
| commit | 48863ce93578ea656fe5342f0f4da1bd2bab8139 (patch) | |
| tree | ed896b67c4464d406c0bd9235123e404ae7bf8cd /src/exchange-lib/exchange_api_wire_deposits.c | |
| parent | 4141467d47a276365cbb9629b66c84b2c4e74dd4 (diff) | |
| parent | ad6a40aaa580551b2861d51740a427af05d9f165 (diff) | |
| download | exchange-48863ce93578ea656fe5342f0f4da1bd2bab8139.tar.gz exchange-48863ce93578ea656fe5342f0f4da1bd2bab8139.tar.bz2 exchange-48863ce93578ea656fe5342f0f4da1bd2bab8139.zip | |
Merge branch 'master' of git.taler.net:/var/git/exchange
Diffstat (limited to 'src/exchange-lib/exchange_api_wire_deposits.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_wire_deposits.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c index bcb29e872..0601f9b4a 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() }; @@ -217,7 +217,7 @@ handle_wire_deposits_finished (void *cls, /* unexpected response code */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unexpected response code %u\n", - response_code); + (unsigned int) response_code); GNUNET_break (0); response_code = 0; break; |