[taler-merchant] branch master updated: currency is global in the config, don't require duplication

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 325ce8f  currency is global in the config, don't require duplication
325ce8f is described below

commit 325ce8fa6a33769493aa780859ba11ddb69db8e0
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jan 19 19:27:32 2020 +0100

    currency is global in the config, don't require duplication
---
 src/backend/taler-merchant-httpd_auditors.c  | 20 --------------------
 src/backend/taler-merchant-httpd_exchanges.c | 22 ----------------------
 2 files changed, 42 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_auditors.c 
b/src/backend/taler-merchant-httpd_auditors.c
index db26b8f..144db07 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -135,32 +135,12 @@ parse_auditors (void *cls,
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   char *pks;
-  char *currency;
   struct Auditor auditor;
 
   if (0 != strncasecmp (section,
                         "auditor-",
                         strlen ("auditor-")))
     return;
-  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,
diff --git a/src/backend/taler-merchant-httpd_exchanges.c 
b/src/backend/taler-merchant-httpd_exchanges.c
index 1680517..ac899c1 100644
--- 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 ==

-- 
To stop receiving notification emails like this one, please contact
address@hidden.