commit 96de7d08c4f72925f4deebad76d57cb9734535c4
parent b9919ed5e902dac03bf719f4d31dc822fc66b572
Author: Pius Loosli <loosp2@bfh.ch>
Date: Tue, 2 Jan 2024 14:58:46 +0100
[api] Remove unused config values from donau-httpd and test_donau_api.conf
Diffstat:
2 files changed, 4 insertions(+), 113 deletions(-)
diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c
@@ -49,7 +49,7 @@
* Above what request latency do we start to log?
*/
#define WARN_LATENCY GNUNET_TIME_relative_multiply ( \
- GNUNET_TIME_UNIT_MILLISECONDS, 500)
+ GNUNET_TIME_UNIT_MILLISECONDS, 500)
/**
* Are clients allowed to request /keys for times other than the
@@ -93,7 +93,7 @@ struct TALER_MasterPublicKeyP DH_master_public_key;
/**
* Key used to encrypt KYC attribute data in our database.
*/
-//struct TALER_AttributeEncryptionKeyP DH_attribute_key;
+// struct TALER_AttributeEncryptionKeyP DH_attribute_key;
/**
* Our DB plugin. (global)
@@ -134,7 +134,7 @@ char *DH_kyc_aml_trigger;
/**
* Option set to #GNUNET_YES if rewards are enabled.
*/
-//int DH_enable_rewards;
+// int DH_enable_rewards;
/**
* What is the largest amount we allow a peer to
@@ -810,20 +810,6 @@ donau_serve_process_config (void)
{
req_max = ULLONG_MAX;
}
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (DH_cfg,
- "donaudb",
- "IDLE_RESERVE_EXPIRATION_TIME",
- &DH_reserve_closing_delay))
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "donaudb",
- "IDLE_RESERVE_EXPIRATION_TIME");
- /* use default */
- DH_reserve_closing_delay
- = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_WEEKS,
- 4);
- }
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (DH_cfg,
@@ -837,17 +823,6 @@ donau_serve_process_config (void)
"valid relative time expected");
return GNUNET_SYSERR;
}
- // if (GNUNET_OK !=
- // GNUNET_CONFIGURATION_get_value_string (DH_cfg,
- // "donau",
- // "KYC_AML_TRIGGER",
- // &DH_kyc_aml_trigger))
- // {
- // GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- // "donau",
- // "KYC_AML_TRIGGER");
- // return GNUNET_SYSERR;
- // }
if (GNUNET_OK !=
TALER_config_get_currency (DH_cfg,
&DH_currency))
@@ -877,65 +852,6 @@ donau_serve_process_config (void)
DH_currency_fraction_digits = (unsigned int) cfd;
}
if (GNUNET_OK !=
- TALER_config_get_amount (DH_cfg,
- "donau",
- "AML_THRESHOLD",
- &DH_aml_threshold))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Need amount in section `donau' under `AML_THRESHOLD'\n");
- return GNUNET_SYSERR;
- }
- // if (GNUNET_OK !=
- // TALER_config_get_amount (DH_cfg,
- // "donau",
- // "STEFAN_ABS",
- // &DH_stefan_abs))
- // {
- // GNUNET_assert (GNUNET_OK ==
- // TALER_amount_set_zero (DH_currency,
- // &DH_stefan_abs));
- // }
- // if (GNUNET_OK !=
- // TALER_config_get_amount (DH_cfg,
- // "donau",
- // "STEFAN_LOG",
- // &DH_stefan_log))
- // {
- // GNUNET_assert (GNUNET_OK ==
- // TALER_amount_set_zero (DH_currency,
- // &DH_stefan_log));
- // }
- // if (GNUNET_OK !=
- // TALER_config_get_amount (DH_cfg,
- // "donau",
- // "STEFAN_LIN",
- // &DH_stefan_lin))
- // {
- // GNUNET_assert (GNUNET_OK ==
- // TALER_amount_set_zero (DH_currency,
- // &DH_stefan_lin));
- // }
-
- // if (0 != strcmp (DH_currency,
- // DH_aml_threshold.currency))
- // {
- // GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- // "Amount in section `donau' under `AML_THRESHOLD' uses the wrong currency!\n");
- // return GNUNET_SYSERR;
- // }
- // DH_enable_rewards
- // = GNUNET_CONFIGURATION_get_value_yesno (
- // DH_cfg,
- // "donau",
- // "ENABLE_REWARDS");
- // if (GNUNET_SYSERR == DH_enable_rewards)
- // {
- // GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- // "Need YES or NO in section `donau' under `ENABLE_REWARDS'\n");
- // return GNUNET_SYSERR;
- // }
- if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (DH_cfg,
"donau",
"BASE_URL",
diff --git a/src/testing/test_donau_api.conf b/src/testing/test_donau_api.conf
@@ -14,22 +14,18 @@ HTTP_PORT = 8082
[donau]
TERMS_ETAG = tos
PRIVACY_ETAG = 0
-AML_THRESHOLD = EUR:1000000
PORT = 8081
DB = postgres
BASE_URL = "http://localhost:8081/"
SERVE = tcp
-EXPIRE_SHARD_SIZE ="300 ms"
EXPIRE_IDLE_SLEEP_INTERVAL ="1 s"
MAX_KEYS_CACHING = forever
-KYC_AML_TRIGGER = false
-ENABLE_REWARDS = NO
[donaudb-postgres]
CONFIG = "postgres:///talercheck"
[donaudb]
-IDLE_RESERVE_EXPIRATION_TIME = 0 s
+# IDLE_RESERVE_EXPIRATION_TIME = 0 s
[taler-donau-secmod-cs]
LOOKAHEAD_SIGN = "24 days"
@@ -41,24 +37,3 @@ LOOKAHEAD_SIGN = "24 days"
LOOKAHEAD_SIGN = "24 days"
DURATION = "14 days"
-
-[donau-account-1]
-PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[donau-accountcredentials-1]
-WIRE_GATEWAY_AUTH_METHOD = none
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-
-[donau-account-2]
-PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[donau-accountcredentials-2]
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Donau
-PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-
