merchant

commit 325ce8fa6a33769493aa780859ba11ddb69db8e0
parent e5ef509b5301b1a67d0d7892ba8f60b62780de00
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 19 Jan 2020 19:27:32 +0100

currency is global in the config, don't require duplication

Diffstat:
M
src/backend/taler-merchant-httpd_auditors.c
 | 
20
--------------------
M
src/backend/taler-merchant-httpd_exchanges.c
 | 
22
----------------------

2 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_auditors.c b/src/backend/taler-merchant-httpd_auditors.c
@@ -135,7 +135,6 @@ parse_auditors (void *cls,
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   char *pks;
-  char *currency;
   struct Auditor auditor;
 
   if (0 != strncasecmp (section,
@@ -145,25 +144,6 @@ parse_auditors (void *cls,
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              section,
-                                             "CURRENCY",
-                                             &currency))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               section,
-                               "CURRENCY");
-    return;
-  }
-  if (0 != strcasecmp (currency,
-                       TMH_currency))
-  {
-    /* trusted exchange, but for a different currency; ignore */
-    GNUNET_free (currency);
-    return;
-  }
-  GNUNET_free (currency);
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             section,
                                              "NAME",
                                              &auditor.name))
   {
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
@@ -960,7 +960,6 @@ accept_exchanges (void *cls,
                   const char *section)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  char *currency;
   char *url;
   char *mks;
   struct Exchange *exchange;
@@ -980,27 +979,6 @@ accept_exchanges (void *cls,
                                "BASE_URL");
     return;
   }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             section,
-                                             "CURRENCY",
-                                             &currency))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               section,
-                               "CURRENCY");
-    GNUNET_free (url);
-    return;
-  }
-  if (0 != strcasecmp (currency,
-                       TMH_currency))
-  {
-    /* trusted exchange, but for a different currency; ignore */
-    GNUNET_free (url);
-    GNUNET_free (currency);
-    return;
-  }
-  GNUNET_free (currency);
   exchange = GNUNET_new (struct Exchange);
   exchange->url = url;
   if (GNUNET_OK ==