[taler-merchant] branch master updated: move common logic to parse currency into libtalerutil

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 0fb7b9b  move common logic to parse currency into libtalerutil
0fb7b9b is described below

commit 0fb7b9b4c2b8b1f83b2c2e7cb2eb0c3cbe9eb2e6
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Mar 15 20:09:32 2020 +0100

    move common logic to parse currency into libtalerutil
---
 src/backend/taler-merchant-httpd.c         | 11 +++--------
 src/backenddb/plugin_merchantdb_postgres.c |  9 ++-------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 7b2297a..6e87c6d 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1545,15 +1545,10 @@ run (void *cls,
   result = GNUNET_SYSERR;
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (config,
-                                             "taler",
-                                             "CURRENCY",
-                                             &TMH_currency))
+  if (GNUNET_OK !=
+      TALER_config_get_currency (config,
+                                 &TMH_currency))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler",
-                               "CURRENCY");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index bbc8013..6e57419 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -3502,14 +3502,9 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
     return NULL;
   }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "taler",
-                                             "CURRENCY",
-                                             &pg->currency))
+      TALER_config_get_currency (cfg,
+                                 &pg->currency))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler",
-                               "CURRENCY");
     GNUNET_PQ_disconnect (pg->conn);
     GNUNET_free (pg->sql_dir);
     GNUNET_free (pg);

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