From c182b960f818d8cda52f9cc2eebee820cabf9dc3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 14 Dec 2017 13:42:07 +0100 Subject: [PATCH] remove _admin APIs from libtalerexchange --- src/exchange-lib/Makefile.am | 3 +- src/include/taler_exchange_service.h | 69 ---------------------------- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/src/exchange-lib/Makefile.am b/src/exchange-lib/Makefile.am index f92ea630f..8aad8c9df 100644 --- a/src/exchange-lib/Makefile.am +++ b/src/exchange-lib/Makefile.am @@ -10,13 +10,12 @@ lib_LTLIBRARIES = \ libtalerexchange.la libtalerexchange_la_LDFLAGS = \ - -version-info 3:0:0 \ + -version-info 4:0:0 \ -no-undefined libtalerexchange_la_SOURCES = \ exchange_api_common.c \ exchange_api_handle.c exchange_api_handle.h \ - exchange_api_admin.c \ exchange_api_deposit.c \ exchange_api_payback.c \ exchange_api_refresh.c \ diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 7e9ad914d..da39a179f 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1306,75 +1306,6 @@ void TALER_EXCHANGE_refresh_link_cancel (struct TALER_EXCHANGE_RefreshLinkHandle *rlh); -/* ********************* /admin/add/incoming *********************** */ - - -/** - * @brief A /admin/add/incoming Handle - */ -struct TALER_EXCHANGE_AdminAddIncomingHandle; - - -/** - * Callbacks of this type are used to serve the result of submitting - * information about an incoming transaction to a exchange. - * - * @param cls closure - * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request - * 0 if the exchange's reply is bogus (fails to follow the protocol) - * @param ec taler-specific error code, #TALER_EC_NONE on success - * @param full_response full response from the exchange (for logging, in case of errors) - */ -typedef void -(*TALER_EXCHANGE_AdminAddIncomingResultCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const json_t *full_response); - - -/** - * Notify the exchange that we have received an incoming transaction - * which fills a reserve. Note that this API is an administrative - * API and thus not accessible to typical exchange clients, but only - * to the operators of the exchange. - * - * @param exchange the exchange handle; the exchange must be ready to operate - * @param admin_url URL of the administrative interface of the exchange - * @param reserve_pub public key of the reserve - * @param amount amount that was deposited - * @param execution_date when did we receive the amount - * @param sender_account_details account information of the sender of the money; - * the receiver is always the exchange. - * @param transfer_details details that uniquely identify the transfer; - * used to check for duplicate operations by the exchange - * @param res_cb the callback to call when the final result for this request is available - * @param res_cb_cls closure for the above callback - * @return NULL - * if the inputs are invalid (i.e. invalid amount). - * In this case, the callback is not called. - */ -struct TALER_EXCHANGE_AdminAddIncomingHandle * -TALER_EXCHANGE_admin_add_incoming (struct TALER_EXCHANGE_Handle *exchange, - const char *admin_url, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *amount, - struct GNUNET_TIME_Absolute execution_date, - const json_t *sender_account_details, - const json_t *transfer_details, - TALER_EXCHANGE_AdminAddIncomingResultCallback res_cb, - void *res_cb_cls); - - -/** - * Cancel an add incoming. This function cannot be used on a request - * handle if a response is already served for it. - * - * @param aai the admin add incoming request handle - */ -void -TALER_EXCHANGE_admin_add_incoming_cancel (struct TALER_EXCHANGE_AdminAddIncomingHandle *aai); - - /* ********************* /track/transfer *********************** */ /**