From 59a5b1ceb8fac923eab7461115f492cafd2d0152 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 17 Mar 2020 22:13:15 +0100
Subject: a first, untested stab at #6123, committing intermediate result that
 passes (existing) tests

---
 src/testing/test-taler-exchange-wirewatch-postgres.conf | 1 -
 src/testing/test_auditor_api.conf                       | 5 -----
 src/testing/test_exchange_api.conf                      | 5 -----
 src/testing/test_exchange_api_keys_cherry_picking.conf  | 4 +++-
 src/testing/test_exchange_api_twisted.conf              | 5 -----
 5 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'src/testing')

diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index 61029e3f2..67696e583 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -93,7 +93,6 @@ CLOSING-FEE-2027 = EUR:0.01
 # refuses to start.
 [coin_eur_ct_1]
 value = EUR:0.01
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf
index b448b12a5..c43e1ad49 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api.conf
@@ -146,7 +146,6 @@ CLOSING-FEE-2027 = EUR:0.01
 # the exchange should support (and their respective fee structure)
 [coin_eur_ct_1]
 value = EUR:0.01
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -158,7 +157,6 @@ rsa_keysize = 1024
 
 [coin_eur_ct_10]
 value = EUR:0.10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -170,7 +168,6 @@ rsa_keysize = 1024
 
 [coin_eur_1]
 value = EUR:1
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -182,7 +179,6 @@ rsa_keysize = 1024
 
 [coin_eur_5]
 value = EUR:5
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -194,7 +190,6 @@ rsa_keysize = 1024
 
 [coin_eur_10]
 value = EUR:10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 7454934a8..1b16444ff 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -148,7 +148,6 @@ CLOSING-FEE-2027 = EUR:0.01
 # the exchange should support (and their respective fee structure)
 [coin_eur_ct_1]
 value = EUR:0.01
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -160,7 +159,6 @@ rsa_keysize = 1024
 
 [coin_eur_ct_10]
 value = EUR:0.10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -172,7 +170,6 @@ rsa_keysize = 1024
 
 [coin_eur_1]
 value = EUR:1
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -184,7 +181,6 @@ rsa_keysize = 1024
 
 [coin_eur_5]
 value = EUR:5
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -196,7 +192,6 @@ rsa_keysize = 1024
 
 [coin_eur_10]
 value = EUR:10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
index 0416c8eec..b67440d68 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -167,9 +167,11 @@ CLOSING-FEE-2024 = EUR:0.01
 CLOSING-FEE-2025 = EUR:0.01
 CLOSING-FEE-2026 = EUR:0.01
 
+[exchangedb]
+duration_overlap = 1 s
+
 [coin_eur_1]
 value = EUR:1
-duration_overlap = 1 s
 duration_withdraw = 80 s
 duration_spend = 80 s
 duration_legal = 60 s
diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf
index 8abe13273..f93fe912a 100644
--- a/src/testing/test_exchange_api_twisted.conf
+++ b/src/testing/test_exchange_api_twisted.conf
@@ -135,7 +135,6 @@ CLOSING-FEE-2027 = EUR:0.01
 
 [coin_eur_ct_1]
 value = EUR:0.01
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -147,7 +146,6 @@ rsa_keysize = 1024
 
 [coin_eur_ct_10]
 value = EUR:0.10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -159,7 +157,6 @@ rsa_keysize = 1024
 
 [coin_eur_1]
 value = EUR:1
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -171,7 +168,6 @@ rsa_keysize = 1024
 
 [coin_eur_5]
 value = EUR:5
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
@@ -183,7 +179,6 @@ rsa_keysize = 1024
 
 [coin_eur_10]
 value = EUR:10
-duration_overlap = 5 minutes
 duration_withdraw = 7 days
 duration_spend = 2 years
 duration_legal = 3 years
-- 
cgit v1.2.3