exchange

Base system with REST service to issue digital coins, run by the payment service provider
Log | Files | Refs | Submodules | README | LICENSE

commit 719e034c7ad70b382e6bb8b9ca2ad5077d0db39b
parent e98d18e5469c5092a9f56abcaf5496c6fe1ee99d
Author: Florian Dold <dold@taler.net>
Date:   Tue, 17 Nov 2026 20:37:36 +0100

testing: reuse the prepared refresh on melt retries

Diffstat:
Msrc/testing/testing_api_cmd_refresh.c | 57+++++++++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c @@ -651,34 +651,19 @@ melt_reveal_cleanup (void *cls, } -/** - * Task scheduled to re-try #melt_run. - * - * @param cls a `struct RefreshMeltState` - */ static void -do_melt_retry (void *cls) -{ - struct MeltState *rms = cls; - - rms->retry_task = NULL; - TALER_TESTING_touch_cmd (rms->is); - melt_run (rms, - NULL, - rms->is); -} +melt_cb (struct MeltState *ms, + const struct TALER_EXCHANGE_PostMeltResponse *mr); /** * Create and start the POST /melt operation of @a ms. * * @param[in,out] ms melt command state, with @e melt_input set up - * @param cb callback for the result * @return #GNUNET_OK on success */ static enum GNUNET_GenericReturnValue -start_melt (struct MeltState *ms, - TALER_EXCHANGE_PostMeltCallback cb) +start_melt (struct MeltState *ms) { ms->mh = TALER_EXCHANGE_post_melt_create ( TALER_TESTING_interpreter_get_context (ms->is), @@ -690,13 +675,29 @@ start_melt (struct MeltState *ms, return GNUNET_SYSERR; GNUNET_assert (TALER_EC_NONE == TALER_EXCHANGE_post_melt_start (ms->mh, - cb, + &melt_cb, ms)); return GNUNET_OK; } /** + * Resubmit the prepared melt. The first request may have committed + * even if its response never reached us. + */ +static void +do_melt_retry (void *cls) +{ + struct MeltState *ms = cls; + + ms->retry_task = NULL; + TALER_TESTING_touch_cmd (ms->is); + if (GNUNET_OK != start_melt (ms)) + TALER_TESTING_interpreter_fail (ms->is); +} + + +/** * Callback for a " /melt" operation; checks if the HTTP * response code is okay and re-run the melt operation if the * CMD was set to do so. @@ -770,6 +771,14 @@ melt_cb (struct MeltState *ms, } if (MHD_HTTP_OK == hr->http_status) { + if ( (ms->noreveal_index < TALER_CNC_KAPPA) && + ( (ms->noreveal_index != mr->details.ok.noreveal_index) || + (0 != GNUNET_memcmp (&ms->rc, &mr->details.ok.rc)) ) ) + { + GNUNET_break (0); + TALER_TESTING_interpreter_fail (ms->is); + return; + } ms->noreveal_index = mr->details.ok.noreveal_index; ms->rc = mr->details.ok.rc; /* for the coin history check */ @@ -819,10 +828,8 @@ melt_cb (struct MeltState *ms, { TALER_LOG_DEBUG ("Doubling the melt (%s)\n", ms->cmd->label); - GNUNET_assert (GNUNET_OK == - start_melt (ms, - &melt_cb)); ms->double_melt = false; + ms->retry_task = GNUNET_SCHEDULER_add_now (&do_melt_retry, ms); return; } TALER_TESTING_interpreter_next (ms->is); @@ -860,7 +867,7 @@ melt_run (void *cls, num_fresh_coins++) ; rms->num_fresh_coins = num_fresh_coins; - /* Free old data structure in case this is a retry! */ + /* The interpreter can run the command again after a rewind. */ if (NULL != rms->fresh_pks) { for (unsigned int i = 0; i < rms->num_fresh_coins; i++) @@ -1018,9 +1025,7 @@ melt_run (void *cls, else rms->che.details.melt.no_hac = true; - if (GNUNET_OK != - start_melt (rms, - &melt_cb)) + if (GNUNET_OK != start_melt (rms)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (rms->is);