commit 622a305ab973649cf202486974bed50fea061846
parent 9814f3c66d6e8f59252169ac025ad903f59db28d
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date: Wed, 3 Jan 2024 12:26:54 +0100
small fix
Diffstat:
2 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/src/donau/donau.conf b/src/donau/donau.conf
@@ -2,14 +2,6 @@
#
[donau]
-# Master public key used to sign the donau's various keys
-# This must be adjusted to your actual installation.
-# MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# Must be set to the threshold above which transactions
-# are flagged for AML review.
-# AML_THRESHOLD =
-
# How many digits does the currency use by default on displays.
# Hint provided to wallets. Should be 2 for EUR/USD/CHF,
# and 0 for JPY. Default is 2 as that is most common.
@@ -30,9 +22,6 @@ KYC_AML_TRIGGER = true
# in the database. Should be a high-entropy nonce.
ATTRIBUTE_ENCRYPTION_KEY = SET_ME_PLEASE
-# Set to NO to disable rewards.
-ENABLE_REWARDS = YES
-
# How long do we allow /keys to be cached at most? The actual
# limit is the minimum of this value and the first expected
# significant change in /keys based on the expiration times.
@@ -70,27 +59,9 @@ BASE_URL = http://localhost:8081/
# How long should the aggregator sleep if it has nothing to do?
AGGREGATOR_IDLE_SLEEP_INTERVAL = 60 s
-# What type of asset is the donau managing? Used to adjust
-# the user-interface of the wallet.
-# Possibilities include: "fiat", "regional" and "crypto".
-# In the future (and already permitted but not yet supported by wallets)
-# we also expect to have "stock" and "future" (and more).
-# Default is "fiat".
-ASSET_TYPE = "fiat"
-
# FIXME: document!
ROUTER_IDLE_SLEEP_INTERVAL = 60 s
-# How big is an individual shard to be processed
-# by taler-donau-expire (in time). It may take
-# this much time for an expired purse to be really
-# cleaned up and the coins refunded.
-EXPIRE_SHARD_SIZE = 1 h
-
-# How long should the transfer tool
-# sleep if it has nothing to do?
-TRANSFER_IDLE_SLEEP_INTERVAL = 60 s
-
# How long should the closer tool
# sleep if it has nothing to do?
CLOSER_IDLE_SLEEP_INTERVAL = 60 s
@@ -104,35 +75,4 @@ CLOSER_IDLE_SLEEP_INTERVAL = 60 s
#
# against the donau's database. Otherwise, the
# aggregation logic will break badly!
-AGGREGATOR_SHARD_SIZE = 2147483648
-
-# Values of 0 or above 2^31 disable sharding, which
-# is a sane default for most use-cases.
-# When changing this value, you MUST stop all
-# aggregators and manually run
-#
-# $ taler-donau-dbinit -s
-#
-# against the donau's database. Otherwise, the
-# aggregation logic will break badly!
ROUTER_SHARD_SIZE = 2147483648
-
-# How long should wirewatch sleep if it has nothing to do?
-# (Set very aggressively here for the demonstrators to be
-# super fast.)
-WIREWATCH_IDLE_SLEEP_INTERVAL = 1 s
-
-# how long are the signatures with the signkey valid?
-SIGNKEY_LEGAL_DURATION = 2 years
-
-# Directory with our terms of service.
-TERMS_DIR = $DATADIR/terms/
-
-# Etag / filename for the terms of service.
-TERMS_ETAG = donau-tos-v0
-
-# Directory with our privacy policy.
-PRIVACY_DIR = $DATADIR/terms/
-
-# Etag / filename for the privacy policy.
-PRIVACY_ETAG = donau-pp-v0
diff --git a/src/testing/donau-unified-setup.sh b/src/testing/donau-unified-setup.sh
@@ -631,7 +631,7 @@ do
fi
if [ "0" = "$D_DONE" ] && [ "1" = "$START_DONAU" ]
then
- echo -n "O"
+ echo -n "D"
wget \
--tries=1 \
--timeout=1 \