From 8f52ed6000b129ee0c9366b7d66e0d8237828924 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 23 Jun 2020 20:25:58 +0200 Subject: DCE: removing legacy code and APIs --- src/include/taler_merchant_service.h | 85 ------------ src/include/taler_merchant_testing_lib.h | 15 --- src/lib/Makefile.am | 11 +- src/lib/merchant_api_tip_pickup2.c | 4 +- src/lib/merchant_api_track_transaction.c | 218 ------------------------------- src/lib/merchant_api_wallet_get_tip.c | 4 +- src/testing/Makefile.am | 2 +- 7 files changed, 7 insertions(+), 332 deletions(-) delete mode 100644 src/lib/merchant_api_track_transaction.c (limited to 'src') diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 44da221d..42cecb9d 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -3171,89 +3171,4 @@ TALER_MERCHANT_tip_pickup2_cancel ( struct TALER_MERCHANT_TipPickup2Handle *tp); -/* ********************** /tip-query ************************* */ - - -/* ********************** GET /private/reserves ************************* */ - - -/* ********************* /track/transaction (UNSPEC!) *********************** */ - -/** - * @brief Handle to a /track/transaction operation at a merchant's backend. - */ -struct TALER_MERCHANT_TrackTransactionHandle; - -/** - * Information about a coin aggregated in a wire transfer for a - * /track/transaction response. - */ -struct TALER_MERCHANT_CoinWireTransfer -{ - - /** - * Public key of the coin. - */ - struct TALER_CoinSpendPublicKeyP coin_pub; - - /** - * Value of the coin including deposit fee. - */ - struct TALER_Amount amount_with_fee; - - /** - * Deposit fee for the coin. - */ - struct TALER_Amount deposit_fee; - -}; - - -/** - * Callbacks of this type are used to work the result of submitting a - * /track/transaction request to a merchant - * - * @param cls closure - * @param http_status HTTP status code we got, 0 on exchange protocol violation - * @param ec taler-specific error code - * @param json original json reply from the backend - * @param num_transfers number of wire transfers the exchange used for the transaction - * @param transfers details about each transfer and which coins are aggregated in it -*/ -typedef void -(*TALER_MERCHANT_TrackTransactionCallback) ( - void *cls, - const struct TALER_MERCHANT_HttpResponse *hr); - - -/** - * Request backend to return deposits associated with a given wtid. - * - * @param ctx execution context - * @param backend_url base URL of the backend - * @param order_id which order should we trace - * @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); - - -/** - * Cancel a /track/transaction request. This function cannot be used - * on a request handle if a response is already served for it. - * - * @param tdo the tracking request to cancel - */ -void -TALER_MERCHANT_track_transaction_cancel ( - struct TALER_MERCHANT_TrackTransactionHandle *tdo); - - #endif /* _TALER_MERCHANT_SERVICE_H */ diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 352f39c3..787075b5 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -1194,21 +1194,6 @@ TALER_TESTING_cmd_history (const char *label, unsigned long long start, long long nrows); -/** - * Define a "track transaction" CMD. - * - * @param label command label. - * @param merchant_url base URL of the merchant serving the - * /track/transaction request. - * @param http_status expected HTTP response code. - * @param pay_reference used to retrieve the order id to track. - */ -struct TALER_TESTING_Command -TALER_TESTING_cmd_merchant_track_transaction (const char *label, - const char *merchant_url, - unsigned int http_status, - const char *pay_reference); - /** * Define a "track transfer" CMD. * 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 - -*/ -/** - * @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 -#include -#include /* just for HTTP status codes */ -#include -#include -#include "taler_merchant_service.h" -#include -#include - - -/** - * @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) { diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 228113df..1c9fcb26 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -46,7 +46,6 @@ libtalermerchanttesting_la_SOURCES = \ testing_api_cmd_rewind.c \ testing_api_cmd_tip_authorize.c \ testing_api_cmd_tip_pickup.c \ - testing_api_cmd_track_transaction.c \ testing_api_cmd_wallet_get_order.c \ testing_api_cmd_wallet_get_tip.c \ testing_api_helpers.c \ @@ -60,6 +59,7 @@ libtalermerchanttesting_la_SOURCES = \ # testing_api_cmd_check_payment.c \ # testing_api_cmd_poll_payment.c \ # testing_api_cmd_refund_lookup.c +# testing_api_cmd_track_transaction.c libtalermerchanttesting_la_LIBADD = \ $(top_srcdir)/src/lib/libtalermerchant.la \ -- cgit v1.2.3