[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: split .conf files into rsa and c
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated: split .conf files into rsa and cs |
|
Date: |
Fri, 04 Feb 2022 19:24:42 +0100 |
This is an automated email from the git hooks/post-receive script.
lucien-heuzeveldt pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 7d2a1a59 split .conf files into rsa and cs
7d2a1a59 is described below
commit 7d2a1a596a8502dd040ed47eb0dd17bb0610cc08
Author: Lucien Heuzeveldt <lucienclaude.heuzeveldt@students.bfh.ch>
AuthorDate: Fri Feb 4 19:24:30 2022 +0100
split .conf files into rsa and cs
---
src/auditor/generate-auditor-basedb.conf | 66 -------------
...{bank-benchmark.conf => bank-benchmark-cs.conf} | 68 +------------
...bank-benchmark.conf => bank-benchmark-rsa.conf} | 55 -----------
.../{benchmark.conf => benchmark-cs.conf} | 68 +------------
.../{benchmark.conf => benchmark-rsa.conf} | 55 -----------
src/exchange/test_taler_exchange_httpd.conf | 38 ++++----
src/exchange/test_taler_exchange_unix.conf | 40 ++++----
.../test-taler-exchange-aggregator-postgres.conf | 11 ---
.../test-taler-exchange-wirewatch-postgres.conf | 11 ---
...t_auditor_api.conf => test_auditor_api-cs.conf} | 66 +------------
..._auditor_api.conf => test_auditor_api-rsa.conf} | 59 ------------
..._auditor_api.conf => test_exchange_api-cs.conf} | 105 ++++++++++-----------
src/testing/test_exchange_api.conf | 45 ---------
... test_exchange_api_keys_cherry_picking-cs.conf} | 20 ----
.../test_exchange_api_keys_cherry_picking.conf | 19 ----
15 files changed, 99 insertions(+), 627 deletions(-)
diff --git a/src/auditor/generate-auditor-basedb.conf
b/src/auditor/generate-auditor-basedb.conf
index 205a04a2..5540aa3b 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -217,72 +217,6 @@ fee_refund = TESTKUDOS:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_kudos_12]
-value = TESTKUDOS:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.02
-fee_deposit = TESTKUDOS:0.02
-fee_refresh = TESTKUDOS:0.03
-fee_refund = TESTKUDOS:0.01
-CIPHER = CS
-
-[coin_kudos_21]
-value = TESTKUDOS:2
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.03
-fee_refresh = TESTKUDOS:0.04
-fee_refund = TESTKUDOS:0.02
-CIPHER = CS
-
-[coin_kudos_41]
-value = TESTKUDOS:4
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.03
-fee_refresh = TESTKUDOS:0.04
-fee_refund = TESTKUDOS:0.02
-CIPHER = CS
-
-[coin_kudos_51]
-value = TESTKUDOS:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.01
-fee_deposit = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_refund = TESTKUDOS:0.01
-CIPHER = CS
-
-[coin_kudos_81]
-value = TESTKUDOS:8
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.05
-fee_deposit = TESTKUDOS:0.02
-fee_refresh = TESTKUDOS:0.03
-fee_refund = TESTKUDOS:0.04
-CIPHER = CS
-
-[coin_kudos_111]
-value = TESTKUDOS:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.01
-fee_deposit = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_refund = TESTKUDOS:0.01
-CIPHER = CS
-
[benchmark]
BANK_DETAILS = bank_details.json
MERCHANT_DETAILS = merchant_details.json
diff --git a/src/benchmark/bank-benchmark.conf
b/src/benchmark/bank-benchmark-cs.conf
similarity index 72%
copy from src/benchmark/bank-benchmark.conf
copy to src/benchmark/bank-benchmark-cs.conf
index c98b1374..d012f0fa 100644
--- a/src/benchmark/bank-benchmark.conf
+++ b/src/benchmark/bank-benchmark-cs.conf
@@ -81,8 +81,7 @@ fee_withdraw = EUR:0.00
fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_ct_10]
value = EUR:0.10
@@ -93,8 +92,7 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_1]
value = EUR:1
@@ -105,8 +103,7 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_5]
value = EUR:5
@@ -117,66 +114,9 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-
-[coin_eur_11]
+[coin_eur_10]
value = EUR:10
duration_withdraw = 7 days
duration_spend = 2 years
diff --git a/src/benchmark/bank-benchmark.conf
b/src/benchmark/bank-benchmark-rsa.conf
similarity index 75%
rename from src/benchmark/bank-benchmark.conf
rename to src/benchmark/bank-benchmark-rsa.conf
index c98b1374..f2f4dee5 100644
--- a/src/benchmark/bank-benchmark.conf
+++ b/src/benchmark/bank-benchmark-rsa.conf
@@ -131,58 +131,3 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 2048
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark-cs.conf
similarity index 71%
copy from src/benchmark/benchmark.conf
copy to src/benchmark/benchmark-cs.conf
index 375665a0..d0d14b8d 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark-cs.conf
@@ -79,8 +79,7 @@ fee_withdraw = EUR:0.00
fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_ct_10]
value = EUR:0.10
@@ -91,8 +90,7 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_1]
value = EUR:1
@@ -103,8 +101,7 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_5]
value = EUR:5
@@ -115,8 +112,7 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
+CIPHER = CS
[coin_eur_10]
value = EUR:10
@@ -127,60 +123,4 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark-rsa.conf
similarity index 74%
rename from src/benchmark/benchmark.conf
rename to src/benchmark/benchmark-rsa.conf
index 375665a0..7b5b0d1f 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark-rsa.conf
@@ -129,58 +129,3 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 2048
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
diff --git a/src/exchange/test_taler_exchange_httpd.conf
b/src/exchange/test_taler_exchange_httpd.conf
index 25938679..9bd4851f 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -70,7 +70,7 @@ PASSWORD = x
WIRE_GATEWAY_URL = "http://localhost:8082/3/";
# Coins for the tests.
-[coin_eur_ct_1]
+[coin_eur_ct_1_rsa]
value = EUR:0.01
duration_withdraw = 7 days
duration_spend = 2 years
@@ -82,20 +82,19 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_10]
-value = EUR:0.10
+[coin_eur_ct_1_cs]
+value = EUR:0.01
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+CIPHER = CS
-[coin_eur_1]
-value = EUR:1
+[coin_eur_ct_10_rsa]
+value = EUR:0.10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -106,19 +105,19 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_2]
-value = EUR:0.01
+[coin_eur_ct_10_cs]
+value = EUR:0.10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = CS
-[coin_eur_ct_11]
-value = EUR:0.10
+[coin_eur_1_rsa]
+value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -126,9 +125,10 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = CS
+CIPHER = RSA
+rsa_keysize = 1024
-[coin_eur_2]
+[coin_eur_1_cs]
value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
diff --git a/src/exchange/test_taler_exchange_unix.conf
b/src/exchange/test_taler_exchange_unix.conf
index 24e1a0fa..e96bfba3 100644
--- a/src/exchange/test_taler_exchange_unix.conf
+++ b/src/exchange/test_taler_exchange_unix.conf
@@ -70,7 +70,7 @@ TALER_BANK_AUTH_METHOD = NONE
# Coins for the tests.
-[coin_eur_ct_1]
+[coin_eur_ct_1_rsa]
value = EUR:0.01
duration_withdraw = 7 days
duration_spend = 2 years
@@ -82,20 +82,19 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_10]
-value = EUR:0.10
+[coin_eur_ct_1_cs]
+value = EUR:0.01
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+CIPHER = CS
-[coin_eur_1]
-value = EUR:1
+[coin_eur_ct_10_rsa]
+value = EUR:0.10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -106,19 +105,19 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_2]
-value = EUR:0.01
+[coin_eur_ct_10_cs]
+value = EUR:0.10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = CS
-[coin_eur_ct_11]
-value = EUR:0.10
+[coin_eur_1_rsa]
+value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -126,9 +125,10 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = CS
+CIPHER = RSA
+rsa_keysize = 1024
-[coin_eur_2]
+[coin_eur_1_cs]
value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
@@ -137,4 +137,4 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
+CIPHER = CS
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf
b/src/testing/test-taler-exchange-aggregator-postgres.conf
index 965f05b0..dfa017d0 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -94,14 +94,3 @@ fee_refresh = EUR:0.01
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf
b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index 60d973c1..fda1acd7 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -83,14 +83,3 @@ fee_refresh = EUR:0.01
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-
-[coin_eur_ct_11]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
diff --git a/src/testing/test_auditor_api.conf
b/src/testing/test_auditor_api-cs.conf
similarity index 71%
copy from src/testing/test_auditor_api.conf
copy to src/testing/test_auditor_api-cs.conf
index 8e3cd28d..fbd84461 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api-cs.conf
@@ -6,10 +6,6 @@
TALER_TEST_HOME = test_exchange_api_home/
TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
[taler-exchange-secmod-cs]
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
@@ -97,18 +93,6 @@ fee_withdraw = EUR:0.00
fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
CIPHER = CS
[coin_eur_ct_10]
@@ -120,18 +104,6 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
[coin_eur_1]
@@ -143,18 +115,6 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
[coin_eur_5]
@@ -166,18 +126,6 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
[coin_eur_10]
@@ -189,16 +137,4 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
+CIPHER = CS
diff --git a/src/testing/test_auditor_api.conf
b/src/testing/test_auditor_api-rsa.conf
similarity index 73%
copy from src/testing/test_auditor_api.conf
copy to src/testing/test_auditor_api-rsa.conf
index 8e3cd28d..95eb47b3 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api-rsa.conf
@@ -10,10 +10,6 @@ TALER_RUNTIME_DIR =
${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
-[taler-exchange-secmod-cs]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
[taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
@@ -100,17 +96,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_ct_10]
value = EUR:0.10
duration_withdraw = 7 days
@@ -123,17 +108,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_1]
value = EUR:1
duration_withdraw = 7 days
@@ -146,17 +120,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_5]
value = EUR:5
duration_withdraw = 7 days
@@ -169,17 +132,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_10]
value = EUR:10
duration_withdraw = 7 days
@@ -191,14 +143,3 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
diff --git a/src/testing/test_auditor_api.conf
b/src/testing/test_exchange_api-cs.conf
similarity index 85%
rename from src/testing/test_auditor_api.conf
rename to src/testing/test_exchange_api-cs.conf
index 8e3cd28d..3fbf4c3c 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_exchange_api-cs.conf
@@ -1,6 +1,6 @@
-
# This file is in the public domain.
#
+
[PATHS]
# Persistent data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/
@@ -10,17 +10,12 @@ TALER_RUNTIME_DIR =
${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
-[taler-exchange-secmod-cs]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
[taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple
DURATION = 14 days
-
[taler]
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
@@ -32,10 +27,11 @@ BASE_URL = "http://localhost:8083/";
# HTTP port the auditor listens to
PORT = 8083
-TINY_AMOUNT = EUR:0.01
-
[exchange]
+TERMS_ETAG = 0
+PRIVACY_ETAG = 0
+
# HTTP port the exchange listens to
PORT = 8081
@@ -61,14 +57,10 @@ CONFIG = "postgres:///talercheck"
[exchange-account-1]
# What is the URL of our account?
PAYTO_URI = "payto://x-taler-bank/localhost/42"
+# ENABLE_CREDIT = YES
[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/42/";
-
-[bank]
-HTTP_PORT = 8082
-
-# ENABLE_CREDIT = YES
+WIRE_GATEWAY_URL = "http://localhost:9081/42/";
[exchange-account-2]
# What is the bank account (with the "Taler Bank" demo system)?
@@ -76,15 +68,20 @@ PAYTO_URI = "payto://x-taler-bank/localhost/2"
ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
-# Authentication information for basic authentication
[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/";
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:9081/2/";
+[bank]
+HTTP_PORT = 9081
+# Enabled extensions
+[exchange-extension-age_restriction]
+ENABLED = YES
+# default age groups:
+#AGE_GROUPS = "8:10:12:14:16:18:21"
# Sections starting with "coin_" specify which denominations
# the exchange should support (and their respective fee structure)
@@ -97,18 +94,6 @@ fee_withdraw = EUR:0.00
fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
CIPHER = CS
[coin_eur_ct_10]
@@ -120,11 +105,10 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+CIPHER = CS
-[coin_eur_ct_11]
-value = EUR:0.10
+[coin_eur_1]
+value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -134,8 +118,8 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = CS
-[coin_eur_1]
-value = EUR:1
+[coin_eur_5]
+value = EUR:5
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -143,11 +127,10 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+CIPHER = CS
-[coin_eur_2]
-value = EUR:1
+[coin_eur_10]
+value = EUR:10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -157,8 +140,20 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = CS
-[coin_eur_5]
-value = EUR:5
+[coin_eur_ct_1_age_restricted]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+age_restricted = true
+CIPHER = CS
+
+[coin_eur_ct_10_age_restricted]
+value = EUR:0.10
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -166,11 +161,11 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+age_restricted = true
+CIPHER = CS
-[coin_eur_6]
-value = EUR:5
+[coin_eur_1_age_restricted]
+value = EUR:1
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -178,10 +173,11 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
+age_restricted = true
CIPHER = CS
-[coin_eur_10]
-value = EUR:10
+[coin_eur_5_age_restricted]
+value = EUR:5
duration_withdraw = 7 days
duration_spend = 2 years
duration_legal = 3 years
@@ -189,10 +185,10 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+age_restricted = true
+CIPHER = CS
-[coin_eur_11]
+[coin_eur_10_age_restricted]
value = EUR:10
duration_withdraw = 7 days
duration_spend = 2 years
@@ -201,4 +197,5 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
+age_restricted = true
+CIPHER = CS
diff --git a/src/testing/test_exchange_api.conf
b/src/testing/test_exchange_api.conf
index 4f9f24f3..cffe3b87 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -97,17 +97,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_ct_10]
value = EUR:0.10
duration_withdraw = 7 days
@@ -120,17 +109,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_1]
value = EUR:1
duration_withdraw = 7 days
@@ -143,17 +121,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_5]
value = EUR:5
duration_withdraw = 7 days
@@ -166,17 +133,6 @@ fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
[coin_eur_10]
value = EUR:10
duration_withdraw = 7 days
@@ -241,7 +197,6 @@ rsa_keysize = 1024
age_restricted = true
CIPHER = RSA
-
[coin_eur_10_age_restricted]
value = EUR:10
duration_withdraw = 7 days
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf
b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
similarity index 85%
copy from src/testing/test_exchange_api_keys_cherry_picking.conf
copy to src/testing/test_exchange_api_keys_cherry_picking-cs.conf
index f4edaf42..8967d6c0 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
@@ -18,10 +18,6 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
[taler-exchange-secmod-cs]
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
@@ -81,10 +77,6 @@ PASSWORD = pass
[bank]
HTTP_PORT=8082
-[taler-exchange-secmod-rsa]
-OVERLAP_DURATION = 1 s
-LOOKAHEAD_SIGN = 20 s
-
[taler-exchange-secmod-cs]
OVERLAP_DURATION = 1 s
LOOKAHEAD_SIGN = 20 s
@@ -103,16 +95,4 @@ fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 5 s
-duration_spend = 6 s
-duration_legal = 7 s
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
CIPHER = CS
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf
b/src/testing/test_exchange_api_keys_cherry_picking.conf
index f4edaf42..e616738f 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -22,10 +22,6 @@ CURRENCY = EUR
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
-[taler-exchange-secmod-cs]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
[taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days
@@ -85,10 +81,6 @@ HTTP_PORT=8082
OVERLAP_DURATION = 1 s
LOOKAHEAD_SIGN = 20 s
-[taler-exchange-secmod-cs]
-OVERLAP_DURATION = 1 s
-LOOKAHEAD_SIGN = 20 s
-
[taler-exchange-secmod-eddsa]
OVERLAP_DURATION = 1 s
DURATION = 30 s
@@ -105,14 +97,3 @@ fee_refresh = EUR:0.03
fee_refund = EUR:0.01
CIPHER = RSA
rsa_keysize = 1024
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 5 s
-duration_spend = 6 s
-duration_legal = 7 s
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: split .conf files into rsa and cs,
gnunet <=