From 1d5da1f7cf84871c318bc66252c719eff4ba8af2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 14 Oct 2020 23:03:31 +0200 Subject: minor fixes --- src/testing/testing_api_cmd_merchant_get_order.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c index 002442ac..b9ee0139 100644 --- a/src/testing/testing_api_cmd_merchant_get_order.c +++ b/src/testing/testing_api_cmd_merchant_get_order.c @@ -822,11 +822,10 @@ struct MerchantPollOrderStartState /** - * Task called when either the timeout for the /poll-payment - * command expired or we got a response. Checks if the - * result is what we expected. + * Task called when either the timeout for the GET /private/order/ command + * expired or we got a response. Checks if the result is what we expected. * - * @param cls a `struct PollPaymentConcludeState` + * @param cls a `struct MerchantPollOrderConcludeState` */ static void conclude_task (void *cls) @@ -889,27 +888,16 @@ merchant_poll_order_cb ( struct MerchantPollOrderStartState *pos = cls; pos->ogh = NULL; - if (MHD_HTTP_OK != hr->http_status) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u (%d) to command %s\n", - hr->http_status, - (int) hr->ec, - TALER_TESTING_interpreter_get_current_label (pos->is)); - TALER_TESTING_interpreter_fail (pos->is); - return; - } + pos->http_status = hr->http_status; switch (hr->http_status) { case MHD_HTTP_OK: - // FIXME: use gts->tip_reference here to - // check if the data returned matches that from the POST / PATCH + // FIXME: keep data from 'osr' here for checking? break; default: GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unhandled HTTP status.\n"); } - pos->http_status = hr->http_status; if (NULL != pos->cs) { GNUNET_SCHEDULER_cancel (pos->cs->task); @@ -1007,7 +995,7 @@ TALER_TESTING_cmd_poll_order_start (const char *label, /** - * Run the "GET order" CMD. + * Run the "GET order conclude" CMD. * * @param cls closure. * @param cmd command being run now. -- cgit v1.2.3