diff options
| author | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-15 19:26:40 -0400 |
|---|---|---|
| committer | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-15 19:26:40 -0400 |
| commit | 1d22e4f8b263446f24fbdb3d2b92f7c1f2939f48 (patch) | |
| tree | 2f2a8495e4b9cd06122eb482e17ba1a1539670eb /src/lib | |
| parent | af158318c6923a51ec8a75bbf2f857ce60cec139 (diff) | |
test for GET /private/reserves
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/merchant_api_get_reserves.c | 14 | ||||
| -rw-r--r-- | src/lib/merchant_api_get_tips.c | 2 | ||||
| -rw-r--r-- | src/lib/merchant_api_wallet_get_order.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/merchant_api_get_reserves.c b/src/lib/merchant_api_get_reserves.c index 017dcd9c..f524514a 100644 --- a/src/lib/merchant_api_get_reserves.c +++ b/src/lib/merchant_api_get_reserves.c @@ -132,6 +132,12 @@ handle_reserves_get_finished (void *cls, json_array_foreach (reserves, i, reserve) { struct TALER_MERCHANT_ReserveSummary *rd = &rds[i]; struct GNUNET_JSON_Specification ispec[] = { + GNUNET_JSON_spec_fixed_auto ("reserve_pub", + &rd->reserve_pub), + GNUNET_JSON_spec_absolute_time ("creation_time", + &rd->creation_time), + GNUNET_JSON_spec_absolute_time ("expiration_time", + &rd->expiration_time), TALER_JSON_spec_amount ("merchant_initial_amount", &rd->merchant_initial_amount), TALER_JSON_spec_amount ("exchange_initial_amount", @@ -140,12 +146,6 @@ handle_reserves_get_finished (void *cls, &rd->pickup_amount), TALER_JSON_spec_amount ("committed_amount", &rd->committed_amount), - GNUNET_JSON_spec_fixed_auto ("reserve_pub", - &rd->reserve_pub), - GNUNET_JSON_spec_absolute_time ("creation_time", - &rd->creation_time), - GNUNET_JSON_spec_absolute_time ("expiration_time", - &rd->expiration_time), GNUNET_JSON_spec_bool ("active", &rd->active), GNUNET_JSON_spec_end () @@ -246,7 +246,7 @@ TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx, after_s = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string ( after)); rgh->url = TALER_url_join (backend_url, - "reserves", + "private/reserves", "active", active_s, "failures", diff --git a/src/lib/merchant_api_get_tips.c b/src/lib/merchant_api_get_tips.c index d15ed820..ee0ad1bf 100644 --- a/src/lib/merchant_api_get_tips.c +++ b/src/lib/merchant_api_get_tips.c @@ -220,7 +220,7 @@ TALER_MERCHANT_tips_get ( { return TALER_MERCHANT_tips_get2 (ctx, backend_url, - false, + TALER_EXCHANGE_YNA_NO, -20, UINT64_MAX, cb, diff --git a/src/lib/merchant_api_wallet_get_order.c b/src/lib/merchant_api_wallet_get_order.c index cdf3db03..799e57f5 100644 --- a/src/lib/merchant_api_wallet_get_order.c +++ b/src/lib/merchant_api_wallet_get_order.c @@ -494,7 +494,7 @@ TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx, * @param owgh handle to the request to be canceled */ void -TALER_MERCHANT_wallet_get_order_cancel ( +TALER_MERCHANT_wallet_order_get_cancel ( struct TALER_MERCHANT_OrderWalletGetHandle *owgh) { if (NULL != owgh->job) |