DCE: removing legacy code and APIs

4 files changed, 6 insertions, 231 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 7254c202..d4b899a1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -43,18 +43,11 @@ libtalermerchant_la_SOURCES = \
   merchant_api_post_reserves.c \
   merchant_api_post_transfers.c \
   merchant_api_get_tips.c \
- \
   merchant_api_tip_authorize.c \
   merchant_api_tip_pickup.c \
   merchant_api_tip_pickup2.c \
-  merchant_api_track_transaction.c \
-  merchant_api_wallet_get_order.c \
-  merchant_api_wallet_get_tip.c
-
-#  merchant_api_get_transfers.c
-#  merchant_api_get_order.c \
-#  merchant_api_get_order2.c \
-#  merchant_api_get_order3.c
+  merchant_api_wallet_get_tip.c \
+  merchant_api_wallet_get_order.c
 
 libtalermerchant_la_LIBADD = \
   -ltalerexchange \
diff --git a/src/lib/merchant_api_tip_pickup2.c b/src/lib/merchant_api_tip_pickup2.c
index a9c38114..5422a1b1 100644
--- a/src/lib/merchant_api_tip_pickup2.c
+++ b/src/lib/merchant_api_tip_pickup2.c
@@ -223,7 +223,7 @@ handle_tip_pickup_finished (void *cls,
 
 
 /**
- * Issue a /tip-pickup request to the backend.  Informs the backend
+ * Issue a /tips/$ID/tip-pickup request to the backend.  Informs the backend
  * that a customer wants to pick up a tip.
  *
  * @param ctx execution context
@@ -351,7 +351,7 @@ TALER_MERCHANT_tip_pickup2 (struct GNUNET_CURL_Context *ctx,
 
 
 /**
- * Cancel a /track/transaction request.  This function cannot be used
+ * Cancel a /tips/$TIP_ID/pickup request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
  * @param tpo handle to the tracking operation being cancelled
diff --git a/src/lib/merchant_api_track_transaction.c b/src/lib/merchant_api_track_transaction.c
deleted file mode 100644
index 7a091d1e..00000000
--- a/src/lib/merchant_api_track_transaction.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA
-
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU Lesser General Public License as published by the Free Software
-  Foundation; either version 2.1, or (at your option) any later version.
-
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License along with
-  TALER; see the file COPYING.LGPL.  If not, see
-  <http://www.gnu.org/licenses/>
-*/
-/**
- * @file lib/merchant_api_track_transaction.c
- * @brief Implementation of the /track/transaction request of the
- * merchant's HTTP API
- * @author Marcello Stanisci
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <curl/curl.h>
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_merchant_service.h"
-#include <taler/taler_json_lib.h>
-#include <taler/taler_signatures.h>
-
-
-/**
- * @brief A handle for tracking transactions.
- */
-struct TALER_MERCHANT_TrackTransactionHandle
-{
-
-  /**
-   * The url for this request.
-   */
-  char *url;
-
-  /**
-   * Handle for the request.
-   */
-  struct GNUNET_CURL_Job *job;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_MERCHANT_TrackTransactionCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Reference to the execution context.
-   */
-  struct GNUNET_CURL_Context *ctx;
-};
-
-
-/**
- * Function called when we're done processing the
- * HTTP /track/transaction request.
- *
- * @param cls the `struct TALER_MERCHANT_TrackTransactionHandle`
- * @param response_code HTTP response code, 0 on error
- * @param json response body, NULL if not in JSON
- */
-static void
-handle_track_transaction_finished (void *cls,
-                                   long response_code,
-                                   const void *response)
-{
-  struct TALER_MERCHANT_TrackTransactionHandle *tdo = cls;
-  const json_t *json = response;
-  struct TALER_MERCHANT_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
-  };
-
-  tdo->job = NULL;
-  switch (response_code)
-  {
-  case 0:
-    hr.ec = TALER_EC_INVALID_RESPONSE;
-    break;
-  case MHD_HTTP_OK:
-    /* FIXME: should we not have a timestamp here as well? */
-    tdo->cb (tdo->cb_cls,
-             &hr);
-    TALER_MERCHANT_track_transaction_cancel (tdo);
-    return;
-  case MHD_HTTP_ACCEPTED:
-    {
-      /* FIXME: Expect time stamp of when the transfer is supposed to happen
-         => Parse it? */
-    }
-    break;
-  case MHD_HTTP_FAILED_DEPENDENCY:
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Exchange gave inconsistent response\n");
-    TALER_MERCHANT_parse_error_details_ (json,
-                                         response_code,
-                                         &hr);
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    /* Nothing really to verify, this should never
-       happen, we should pass the JSON reply to the application */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Did not find any data\n");
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    break;
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    /* Server had an internal issue; we should retry, but this API
-       leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    break;
-  default:
-    /* unexpected response code */
-    GNUNET_break_op (0);
-    TALER_MERCHANT_parse_error_details_ (json,
-                                         response_code,
-                                         &hr);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d\n",
-                (unsigned int) response_code,
-                (int) hr.ec);
-    break;
-  }
-  tdo->cb (tdo->cb_cls,
-           &hr);
-  TALER_MERCHANT_track_transaction_cancel (tdo);
-}
-
-
-/**
- * Request backend to return transactions associated with a given wtid.
- *
- * @param ctx execution context
- * @param backend_url base URL of the backend
- * @param order_id order id pointing to the transaction being tracked
- * @param track_transaction_cb the callback to call when a reply for this request is available
- * @param track_transaction_cb_cls closure for @a track_transaction_cb
- * @return a handle for this request
- */
-struct TALER_MERCHANT_TrackTransactionHandle *
-TALER_MERCHANT_track_transaction (
-  struct GNUNET_CURL_Context *ctx,
-  const char *backend_url,
-  const char *order_id,
-  TALER_MERCHANT_TrackTransactionCallback track_transaction_cb,
-  void *track_transaction_cb_cls)
-{
-  struct TALER_MERCHANT_TrackTransactionHandle *tdo;
-  CURL *eh;
-
-  tdo = GNUNET_new (struct TALER_MERCHANT_TrackTransactionHandle);
-  tdo->ctx = ctx;
-  tdo->cb = track_transaction_cb;
-  tdo->cb_cls = track_transaction_cb_cls;
-  tdo->url = TALER_url_join (backend_url,
-                             "track/transaction",
-                             "order_id", order_id,
-                             NULL);
-  if (NULL == tdo->url)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not construct request URL.\n");
-    GNUNET_free (tdo);
-    return NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Requesting URL '%s'\n",
-              tdo->url);
-  eh = curl_easy_init ();
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_URL,
-                                   tdo->url));
-  tdo->job = GNUNET_CURL_job_add (ctx,
-                                  eh,
-                                  GNUNET_YES,
-                                  &handle_track_transaction_finished,
-                                  tdo);
-  return tdo;
-}
-
-
-/**
- * Cancel a /track/transaction request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param tdo handle to the tracking operation being cancelled
- */
-void
-TALER_MERCHANT_track_transaction_cancel (
-  struct TALER_MERCHANT_TrackTransactionHandle *tdo)
-{
-  if (NULL != tdo->job)
-  {
-    GNUNET_CURL_job_cancel (tdo->job);
-    tdo->job = NULL;
-  }
-  GNUNET_free (tdo->url);
-  GNUNET_free (tdo);
-}
-
-
-/* end of merchant_api_track_transaction.c */
diff --git a/src/lib/merchant_api_wallet_get_tip.c b/src/lib/merchant_api_wallet_get_tip.c
index 64a76f18..f0fae967 100644
--- a/src/lib/merchant_api_wallet_get_tip.c
+++ b/src/lib/merchant_api_wallet_get_tip.c
@@ -233,8 +233,8 @@ TALER_MERCHANT_wallet_tip_get (struct GNUNET_CURL_Context *ctx,
  * @param tqo handle to the operation being cancelled
  */
 void
-TALER_MERCHANT_wallet_tip_get_cancel (struct
-                                      TALER_MERCHANT_TipWalletGetHandle *tgh)
+TALER_MERCHANT_wallet_tip_get_cancel (
+  struct TALER_MERCHANT_TipWalletGetHandle *tgh)
 {
   if (NULL != tgh->job)
   {