From c08aea9d342b80cfa8282b201afad76e814e8f90 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 18 Dec 2018 14:21:36 +0100 Subject: /history: #5284. --- src/include/taler_merchant_testing_lib.h | 4 ---- src/lib/test_merchant_api_new.c | 4 ---- src/lib/test_merchant_api_twisted.c | 2 -- src/lib/testing_api_cmd_history.c | 15 ++------------- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 80464432..84077000 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -316,7 +316,6 @@ TALER_TESTING_cmd_refund_increase * @param label command label. * @param merchant_url base URL of the merchant serving the * request. - * @param ctx CURL context. * @param http_status expected HTTP response code * @param time limit towards the past for the history * records we want returned. @@ -327,7 +326,6 @@ struct TALER_TESTING_Command TALER_TESTING_cmd_history_default_start (const char *label, const char *merchant_url, - struct GNUNET_CURL_Context *ctx, unsigned int http_status, struct GNUNET_TIME_Absolute time, unsigned int nresult, @@ -339,7 +337,6 @@ TALER_TESTING_cmd_history_default_start * @param label command label. * @param merchant_url base URL of the merchant serving the * request. - * @param ctx CURL context. * @param http_status expected HTTP response code * @param time limit towards the past for the history * records we want returned. @@ -350,7 +347,6 @@ TALER_TESTING_cmd_history_default_start struct TALER_TESTING_Command TALER_TESTING_cmd_history (const char *label, const char *merchant_url, - struct GNUNET_CURL_Context *ctx, unsigned int http_status, struct GNUNET_TIME_Absolute time, unsigned int nresult, diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c index 41d600c6..52252311 100644 --- a/src/lib/test_merchant_api_new.c +++ b/src/lib/test_merchant_api_new.c @@ -319,7 +319,6 @@ run (void *cls, TALER_TESTING_cmd_history ("history-0", merchant_url, - is->ctx, MHD_HTTP_OK, /** * all records to be returned; setting date as 0 lets the @@ -448,7 +447,6 @@ run (void *cls, TALER_TESTING_cmd_history ("history-1", merchant_url, - is->ctx, MHD_HTTP_OK, GNUNET_TIME_UNIT_ZERO_ABS, /** @@ -1050,7 +1048,6 @@ run (void *cls, TALER_TESTING_cmd_history ("history-2", merchant_url, - is->ctx, MHD_HTTP_OK, GNUNET_TIME_absolute_add (GNUNET_TIME_UNIT_ZERO_ABS, GNUNET_TIME_UNIT_MICROSECONDS), @@ -1075,7 +1072,6 @@ run (void *cls, TALER_TESTING_cmd_history_default_start ("history-default-start", merchant_url, - is->ctx, MHD_HTTP_OK, GNUNET_TIME_UNIT_ZERO_ABS, 5, /* Expected number of records */ diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c index 67692c5a..bb7b366e 100644 --- a/src/lib/test_merchant_api_twisted.c +++ b/src/lib/test_merchant_api_twisted.c @@ -450,7 +450,6 @@ run (void *cls, TALER_TESTING_cmd_history ("history-0", twister_merchant_url, - is->ctx, 0, GNUNET_TIME_UNIT_ZERO_ABS, 1, // nresult @@ -467,7 +466,6 @@ run (void *cls, TALER_TESTING_cmd_history ("history-1", twister_merchant_url, - is->ctx, 0, // also works with MHD_HTTP_GONE GNUNET_TIME_UNIT_ZERO_ABS, 1, // nresult diff --git a/src/lib/testing_api_cmd_history.c b/src/lib/testing_api_cmd_history.c index ac4039eb..99703ea3 100644 --- a/src/lib/testing_api_cmd_history.c +++ b/src/lib/testing_api_cmd_history.c @@ -52,11 +52,6 @@ struct HistoryState */ const char *merchant_url; - /** - * The CURL context. - */ - struct GNUNET_CURL_Context *ctx; - /** * The interpreter state. */ @@ -272,7 +267,7 @@ history_run (void *cls, { case GNUNET_YES: hs->ho = TALER_MERCHANT_history_default_start - (hs->ctx, + (is->ctx, hs->merchant_url, "default", hs->nrows, @@ -282,7 +277,7 @@ history_run (void *cls, break; case GNUNET_NO: - hs->ho = TALER_MERCHANT_history (hs->ctx, + hs->ho = TALER_MERCHANT_history (is->ctx, hs->merchant_url, "default", hs->start, @@ -322,7 +317,6 @@ history_run (void *cls, static struct TALER_TESTING_Command TALER_TESTING_cmd_history2 (const char *label, const char *merchant_url, - struct GNUNET_CURL_Context *ctx, unsigned int http_status, struct GNUNET_TIME_Absolute time, unsigned int nresult, @@ -340,7 +334,6 @@ TALER_TESTING_cmd_history2 (const char *label, hs->start = start; hs->nrows = nrows; hs->merchant_url = merchant_url; - hs->ctx = ctx; hs->use_default_start = use_default_start; cmd.cls = hs; @@ -368,7 +361,6 @@ struct TALER_TESTING_Command TALER_TESTING_cmd_history_default_start (const char *label, const char *merchant_url, - struct GNUNET_CURL_Context *ctx, unsigned int http_status, struct GNUNET_TIME_Absolute time, unsigned int nresult, @@ -376,7 +368,6 @@ TALER_TESTING_cmd_history_default_start { return TALER_TESTING_cmd_history2 (label, merchant_url, - ctx, http_status, time, nresult, @@ -403,7 +394,6 @@ TALER_TESTING_cmd_history_default_start struct TALER_TESTING_Command TALER_TESTING_cmd_history (const char *label, const char *merchant_url, - struct GNUNET_CURL_Context *ctx, unsigned int http_status, struct GNUNET_TIME_Absolute time, unsigned int nresult, @@ -412,7 +402,6 @@ TALER_TESTING_cmd_history (const char *label, { return TALER_TESTING_cmd_history2 (label, merchant_url, - ctx, http_status, time, nresult, -- cgit v1.2.3