aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-05-13 22:08:45 +0200
committerChristian Grothoff <christian@grothoff.org>2023-05-13 22:08:45 +0200
commit4e5a9906c2d206b32872cf934e26f3d56e2c5aaa (patch)
tree6d0ddc0205502861b41182f1e0ccf2f56b65d237
parent89ed38c03cb50e1ba4d947c3fa7627adf62ee500 (diff)
downloadexchange-4e5a9906c2d206b32872cf934e26f3d56e2c5aaa.tar.xz
more AML_THRESHOLD fixes
-rw-r--r--src/exchange/taler-exchange-aggregator.c6
-rw-r--r--src/exchange/taler-exchange-httpd.c14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index 38110a5e7..0073d85ec 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -303,17 +303,17 @@ parse_aggregator_config (void)
(TALER_amount_is_zero (&currency_round_unit)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Need non-zero amount in section `TALER' under `CURRENCY_ROUND_UNIT'\n");
+ "Need non-zero amount in section `taler' under `CURRENCY_ROUND_UNIT'\n");
return GNUNET_SYSERR;
}
if (GNUNET_OK !=
TALER_config_get_amount (cfg,
- "taler",
+ "exchange",
"AML_THRESHOLD",
&aml_threshold))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Need amount in section `TALER' under `AML_THRESHOLD'\n");
+ "Need amount in section `exchange' under `AML_THRESHOLD'\n");
return GNUNET_SYSERR;
}
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 5d3919a92..3a2c4c001 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1868,6 +1868,13 @@ exchange_serve_process_config (void)
"Need amount in section `exchange' under `AML_THRESHOLD'\n");
return GNUNET_SYSERR;
}
+ if (0 != strcmp (TEH_currency,
+ TEH_aml_threshold.currency))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Amount in section `exchange' under `AML_THRESHOLD' uses the wrong currency!\n");
+ return GNUNET_SYSERR;
+ }
TEH_enable_tipping
= GNUNET_CONFIGURATION_get_value_yesno (
TEH_cfg,
@@ -1879,13 +1886,6 @@ exchange_serve_process_config (void)
"Need YES or NO in section `exchange' under `ENABLE_TIPPING'\n");
return GNUNET_SYSERR;
}
- if (0 != strcmp (TEH_currency,
- TEH_aml_threshold.currency))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Amount in section `TALER' under `AML_THRESHOLD' uses the wrong currency!\n");
- return GNUNET_SYSERR;
- }
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
"exchange",