diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2023-10-15 23:30:51 +0200 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2023-10-15 23:30:51 +0200 |
| commit | 917dd4d70ff2f38d475146b387e649a669996f10 (patch) | |
| tree | 2550f23c5d9418bdaae7c5b7b328d9e5c60e226b /src/testing | |
| parent | c72cf2ce10017dccc342c4ea86ac2b006aa54149 (diff) | |
| download | exchange-917dd4d70ff2f38d475146b387e649a669996f10.tar.xz | |
avoid extra transaction to fetch balance if reserve is out of funds, remove legacy /withdraw endpoint
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/testing_api_cmd_withdraw.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c index c45e29ff9..8a88f60f7 100644 --- a/src/testing/testing_api_cmd_withdraw.c +++ b/src/testing/testing_api_cmd_withdraw.c @@ -158,7 +158,7 @@ struct WithdrawState /** * Withdraw handle (while operation is running). */ - struct TALER_EXCHANGE_WithdrawHandle *wsh; + struct TALER_EXCHANGE_BatchWithdrawHandle *wsh; /** * Task scheduled to try later. @@ -242,7 +242,7 @@ do_retry (void *cls) */ static void reserve_withdraw_cb (void *cls, - const struct TALER_EXCHANGE_WithdrawResponse *wr) + const struct TALER_EXCHANGE_BatchWithdrawResponse *wr) { struct WithdrawState *ws = cls; struct TALER_TESTING_Interpreter *is = ws->is; @@ -292,11 +292,12 @@ reserve_withdraw_cb (void *cls, switch (wr->hr.http_status) { case MHD_HTTP_OK: + GNUNET_assert (1 == wr->details.ok.num_coins); TALER_denom_sig_deep_copy (&ws->sig, - &wr->details.ok.sig); - ws->coin_priv = wr->details.ok.coin_priv; - ws->bks = wr->details.ok.bks; - ws->exchange_vals = wr->details.ok.exchange_vals; + &wr->details.ok.coins[0].sig); + ws->coin_priv = wr->details.ok.coins[0].coin_priv; + ws->bks = wr->details.ok.coins[0].bks; + ws->exchange_vals = wr->details.ok.coins[0].exchange_vals; if (0 != ws->total_backoff.rel_value_us) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, @@ -442,11 +443,13 @@ withdraw_run (void *cls, .ps = &ws->ps, .ach = 0 < ws->age ? &ws->h_age_commitment : NULL }; - ws->wsh = TALER_EXCHANGE_withdraw ( + + ws->wsh = TALER_EXCHANGE_batch_withdraw ( TALER_TESTING_interpreter_get_context (is), TALER_TESTING_get_exchange_url (is), TALER_TESTING_get_keys (is), rp, + 1, &wci, &reserve_withdraw_cb, ws); @@ -477,7 +480,7 @@ withdraw_cleanup (void *cls, { TALER_TESTING_command_incomplete (ws->is, cmd->label); - TALER_EXCHANGE_withdraw_cancel (ws->wsh); + TALER_EXCHANGE_batch_withdraw_cancel (ws->wsh); ws->wsh = NULL; } if (NULL != ws->retry_task) |