From 4fac247bc7187cd611daad87563396c06a8295e4 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 19 Jan 2020 20:57:32 +0100
Subject: use TALER_config_get_amount() consistently, require currency rounding
 option to exist instead of defaulting

---
 src/auditor/taler-auditor.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'src/auditor/taler-auditor.c')

diff --git a/src/auditor/taler-auditor.c b/src/auditor/taler-auditor.c
index 6752b34ab..d2bd8de6d 100644
--- a/src/auditor/taler-auditor.c
+++ b/src/auditor/taler-auditor.c
@@ -5258,28 +5258,14 @@ run (void *cls,
     return;
   }
   {
-    char *rounding_str;
     if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (cfg,
-                                               "taler",
-                                               "CURRENCY_ROUND_UNIT",
-                                               &rounding_str))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "No [taler]/CURRENCY_ROUND_UNIT specified, defaulting to '0.01'.\n");
-      GNUNET_assert (GNUNET_OK ==
-                     TALER_amount_get_zero (currency,
-                                            &currency_round_unit));
-      currency_round_unit.fraction = TALER_AMOUNT_FRAC_BASE / 100;
-    }
-    else if (GNUNET_OK !=
-             TALER_string_to_amount (rounding_str,
-                                     &currency_round_unit))
+        TALER_config_get_amount (cfg,
+                                 "taler",
+                                 "CURRENCY_ROUND_UNIT",
+                                 &currency_round_unit))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Invalid amount `%s' specified in `TALER' under `CURRENCY_ROUND_UNIT'\n",
-                  rounding_str);
-      GNUNET_free (rounding_str);
+                  "Invalid or missing amount in `TALER' under `CURRENCY_ROUND_UNIT'\n");
       global_ret = 1;
       return;
     }
-- 
cgit v1.2.3