From ac5635776e1c94d6220758a1714371563462518f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 3 Mar 2020 15:44:11 +0100 Subject: [PATCH] remove /config from API, as that is not part of the wire gateway specification --- src/bank-lib/fakebank.c | 60 +++++++---------------------------------- 1 file changed, 10 insertions(+), 50 deletions(-) diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c index 614b083aa..74d6b9a6f 100644 --- a/src/bank-lib/fakebank.c +++ b/src/bank-lib/fakebank.c @@ -26,24 +26,6 @@ #include "taler_bank_service.h" #include "taler_mhd_lib.h" -/** - * Taler protocol version in the format CURRENT:REVISION:AGE - * as used by GNU libtool. See - * https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - * - * Please be very careful when updating and follow - * https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info - * precisely. Note that this version has NOTHING to do with the - * release version, and the format is NOT the same that semantic - * versioning uses either. - * - * When changing this version, you likely want to also update - * #BANK_PROTOCOL_CURRENT and #BANK_PROTOCOL_AGE in - * bank_api_config.c! - */ -#define BANK_PROTOCOL_VERSION "0:0:0" - - /** * Maximum POST request size (for /admin/add-incoming) */ @@ -267,6 +249,8 @@ TALER_FAKEBANK_check_debit (struct TALER_FAKEBANK_Handle *h, const char *exchange_base_url, struct TALER_WireTransferIdentifierRawP *wtid) { + GNUNET_assert (0 == strcasecmp (want_amount->currency, + h->currency)); for (struct Transaction *t = h->transactions_head; NULL != t; t = t->next) { if ( (0 == strcasecmp (want_debit, @@ -317,6 +301,8 @@ TALER_FAKEBANK_check_credit (struct TALER_FAKEBANK_Handle *h, const char *want_credit, const struct TALER_ReservePublicKeyP *reserve_pub) { + GNUNET_assert (0 == strcasecmp (want_amount->currency, + h->currency)); for (struct Transaction *t = h->transactions_head; NULL != t; t = t->next) { if ( (0 == strcasecmp (want_debit, @@ -374,6 +360,8 @@ TALER_FAKEBANK_make_transfer (struct TALER_FAKEBANK_Handle *h, { struct Transaction *t; + GNUNET_assert (0 == strcasecmp (amount->currency, + h->currency)); GNUNET_break (0 != strncasecmp ("payto://", debit_account, strlen ("payto://"))); @@ -454,6 +442,8 @@ TALER_FAKEBANK_make_admin_transfer (struct TALER_FAKEBANK_Handle *h, { struct Transaction *t; + GNUNET_assert (0 == strcasecmp (amount->currency, + h->currency)); GNUNET_assert (NULL != debit_account); GNUNET_assert (NULL != credit_account); GNUNET_break (0 != strncasecmp ("payto://", @@ -832,29 +822,6 @@ handle_home_page (struct TALER_FAKEBANK_Handle *h, } -/** - * Handle incoming HTTP request for /config - * - * @param h the fakebank handle - * @param connection the connection - * @param con_cls place to store state, not used - * @return MHD result code - */ -static int -handle_config (struct TALER_FAKEBANK_Handle *h, - struct MHD_Connection *connection, - void **con_cls) -{ - return TALER_MHD_reply_json_pack (connection, - MHD_HTTP_OK, - "{s:s, s:s}", - "currency", - h->currency, - "version" - BANK_PROTOCOL_VERSION); -} - - /** * This is the "base" structure for both the /history and the * /history-range API calls. @@ -1249,13 +1216,6 @@ serve (struct TALER_FAKEBANK_Handle *h, return handle_home_page (h, connection, con_cls); - if ( (0 == strcmp (url, - "/config")) && - (0 == strcasecmp (method, - MHD_HTTP_METHOD_GET)) ) - return handle_config (h, - connection, - con_cls); if ( (0 == strcmp (url, "/admin/add-incoming")) && (0 == strcasecmp (method, @@ -1515,8 +1475,8 @@ TALER_FAKEBANK_start (uint16_t port, &handle_mhd_request, h, MHD_OPTION_NOTIFY_COMPLETED, &handle_mhd_completion_callback, h, - MHD_OPTION_LISTEN_BACKLOG_SIZE, (unsigned - int) 1024, + MHD_OPTION_LISTEN_BACKLOG_SIZE, + (unsigned int) 1024, MHD_OPTION_END); if (NULL == h->mhd_bank) {