/track/*: #5284

4 files changed, 2 insertions, 30 deletions

diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index a1e55aaa..a10363cb 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -342,7 +342,6 @@ TALER_TESTING_cmd_history (const char *label,
  * @param label command label.
  * @param merchant_url base URL of the merchant serving the
  *        /track/transaction request.
- * @param ctx CURL context.
  * @param http_status expected HTTP response code.
  * @param pay_reference used to retrieve the order id to track.
  */
@@ -350,7 +349,6 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_merchant_track_transaction
   (const char *label,
    const char *merchant_url,
-   struct GNUNET_CURL_Context *ctx,
    unsigned int http_status,
    const char *pay_reference);
 
@@ -360,7 +358,6 @@ TALER_TESTING_cmd_merchant_track_transaction
  * @param label command label.
  * @param merchant_url base URL of the merchant serving the
  *        /track/transfer request.
- * @param ctx CURL context.
  * @param http_status expected HTTP response code.
  * @param check_bank_reference reference to a "check bank" CMD
  *        that will provide the WTID and exchange URL to issue
@@ -371,7 +368,6 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_merchant_track_transfer
   (const char *label,
    const char *merchant_url,
-   struct GNUNET_CURL_Context *ctx,
    unsigned int http_status,
    const char *check_bank_reference);
 
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 824749aa..d249a098 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -335,21 +335,18 @@ run (void *cls,
     TALER_TESTING_cmd_merchant_track_transaction
       ("track-transaction-1",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "deposit-simple"),
 
     TALER_TESTING_cmd_merchant_track_transfer
       ("track-transfer-1",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "check_bank_transfer-498c"),
 
     TALER_TESTING_cmd_merchant_track_transfer
       ("track-transfer-again",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "check_bank_transfer-498c"),
 
@@ -417,21 +414,18 @@ run (void *cls,
     TALER_TESTING_cmd_merchant_track_transfer
       ("track-transfer-2",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "check_bank_transfer-498c-2"),
 
     TALER_TESTING_cmd_merchant_track_transfer
       ("track-transfer-2-again",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "check_bank_transfer-498c-2"),
 
     TALER_TESTING_cmd_merchant_track_transaction
       ("track-transaction-2",
        merchant_url,
-       is->ctx,
        MHD_HTTP_OK,
        "deposit-simple-2"),
 
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
index 1553cab0..524c4762 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -611,7 +611,6 @@ run (void *cls,
     TALER_TESTING_cmd_merchant_track_transfer
       ("track-5383",
        twister_merchant_url,
-       is->ctx,
        MHD_HTTP_FAILED_DEPENDENCY,
        "check_aggregation_transfer-5383"),
 
@@ -739,7 +738,6 @@ run (void *cls,
     TALER_TESTING_cmd_merchant_track_transaction
       ("track-transaction-1",
        twister_merchant_url,
-       is->ctx,
        MHD_HTTP_FAILED_DEPENDENCY,
        "deposit-simple"),
 
diff --git a/src/lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c
index 6c3e3149..e8c80ff6 100644
--- a/src/lib/testing_api_cmd_track.c
+++ b/src/lib/testing_api_cmd_track.c
@@ -51,11 +51,6 @@ struct TrackTransactionState
   const char *merchant_url;
 
   /**
-   * CURL context.
-   */
-  struct GNUNET_CURL_Context *ctx;
-
-  /**
    * Expected HTTP response code.
    */
   unsigned int http_status;
@@ -112,11 +107,6 @@ struct TrackTransferState
   const char *merchant_url;
 
   /**
-   * CURL context.
-   */
-  struct GNUNET_CURL_Context *ctx;
-
-  /**
    * Expected HTTP response code.
    */
   unsigned int http_status;
@@ -347,7 +337,7 @@ track_transfer_run (void *cls,
   if (GNUNET_OK != TALER_TESTING_get_trait_url
       (check_bank_cmd, 0, &exchange_url))
     TALER_TESTING_FAIL (is);
-  tts->tth = TALER_MERCHANT_track_transfer (tts->ctx,
+  tts->tth = TALER_MERCHANT_track_transfer (is->ctx,
                                             tts->merchant_url,
                                             "default",
                                             "x-taler-bank",
@@ -387,7 +377,7 @@ track_transaction_run (void *cls,
     TALER_TESTING_FAIL (is);
 
   tts->tth = TALER_MERCHANT_track_transaction
-    (tts->ctx,
+    (is->ctx,
      tts->merchant_url,
      "default",
      order_id,
@@ -498,7 +488,6 @@ track_transaction_traits (void *cls,
  * @param label command label.
  * @param merchant_url base URL of the merchant serving the
  *        /track/transaction request.
- * @param ctx CURL context.
  * @param http_status expected HTTP response code.
  * @param pay_reference used to retrieve the order id to track.
  * @return the command.
@@ -507,7 +496,6 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_merchant_track_transaction
   (const char *label,
    const char *merchant_url,
-   struct GNUNET_CURL_Context *ctx,
    unsigned int http_status,
    const char *pay_reference)
 {
@@ -516,7 +504,6 @@ TALER_TESTING_cmd_merchant_track_transaction
 
   tts = GNUNET_new (struct TrackTransactionState);
   tts->merchant_url = merchant_url;
-  tts->ctx = ctx;
   tts->http_status = http_status;
   tts->pay_reference = pay_reference;
 
@@ -536,7 +523,6 @@ TALER_TESTING_cmd_merchant_track_transaction
  * @param label command label.
  * @param merchant_url base URL of the merchant serving the
  *        /track/transfer request.
- * @param ctx CURL context.
  * @param http_status expected HTTP response code.
  * @param check_bank_reference reference to a "check bank" CMD
  *        that will provide the WTID and exchange URL to issue
@@ -547,7 +533,6 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_merchant_track_transfer
   (const char *label,
    const char *merchant_url,
-   struct GNUNET_CURL_Context *ctx,
    unsigned int http_status,
    const char *check_bank_reference)
 {
@@ -556,7 +541,6 @@ TALER_TESTING_cmd_merchant_track_transfer
 
   tts = GNUNET_new (struct TrackTransferState);
   tts->merchant_url = merchant_url;
-  tts->ctx = ctx;
   tts->http_status = http_status;
   tts->check_bank_reference = check_bank_reference;