From 0c2851b88b804b4191d929a63b3746d9747fac26 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <stanisci.m@gmail.com>
Date: Mon, 7 May 2018 12:44:36 +0200
Subject: make test config files more autocomplete.

---
 src/exchange-lib/test_exchange_api.conf                | 16 ++++++++++++++++
 .../test_exchange_api_keys_cherry_picking.conf         | 17 +++++++++++++++++
 src/exchange-lib/testing_api_cmd_bank_check.c          |  6 +++++-
 src/exchange/test_taler_exchange_httpd.conf            | 18 ++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf
index f03b3e68e..8af93c183 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/src/exchange-lib/test_exchange_api.conf
@@ -9,6 +9,22 @@ TALER_TEST_HOME = test_exchange_api_home/
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 
+[exchange_keys]
+
+# how long is one signkey valid?
+signkey_duration = 4 weeks
+
+# how long are the signatures with the signkey valid?
+legal_duration = 2 years
+
+# how long do we generate denomination and signing keys
+# ahead of time?
+lookahead_sign = 32 weeks 1 day
+
+# how long do we provide to clients denomination and signing keys
+# ahead of time?
+lookahead_provide = 4 weeks 1 day
+
 [exchange]
 # HTTP port the exchange listens to
 PORT = 8081
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
index 7193bf11e..783ea6c28 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
@@ -8,6 +8,23 @@ TALER_TEST_HOME = test_exchange_api_home/
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 
+[exchange_keys]
+
+# how long is one signkey valid?
+signkey_duration = 4 weeks
+
+# how long are the signatures with the signkey valid?
+legal_duration = 2 years
+
+# how long do we generate denomination and signing keys
+# ahead of time?
+lookahead_sign = 32 weeks 1 day
+
+# how long do we provide to clients denomination and signing keys
+# ahead of time?
+lookahead_provide = 4 weeks 1 day
+
+
 [exchange]
 
 # HTTP port the exchange listens to
diff --git a/src/exchange-lib/testing_api_cmd_bank_check.c b/src/exchange-lib/testing_api_cmd_bank_check.c
index 380f5d61d..2b471eed7 100644
--- a/src/exchange-lib/testing_api_cmd_bank_check.c
+++ b/src/exchange-lib/testing_api_cmd_bank_check.c
@@ -98,6 +98,7 @@ check_bank_transfer_run (void *cls,
 
   if (NULL == bcs->deposit_reference)
   {
+    TALER_LOG_INFO ("Deposit reference NOT given\n");
     debit_account = &bcs->debit_account;
     credit_account = &bcs->credit_account;
     exchange_base_url = bcs->exchange_base_url;
@@ -120,9 +121,10 @@ check_bank_transfer_run (void *cls,
     const struct TALER_TESTING_Command *deposit_cmd;
     const struct TALER_Amount *amount_ptr;
 
-    TALER_LOG_INFO ("`%s' uses reference (%s)\n",
+    TALER_LOG_INFO ("`%s' uses reference (%s/%p)\n",
                     TALER_TESTING_interpreter_get_current_label
                       (is),
+                    bcs->deposit_reference,
                     bcs->deposit_reference);
     deposit_cmd = TALER_TESTING_interpreter_lookup_command
       (is, bcs->deposit_reference);
@@ -254,6 +256,8 @@ TALER_TESTING_cmd_check_bank_transfer
   bcs->debit_account = debit_account;
   bcs->credit_account = credit_account;
 
+  bcs->deposit_reference = NULL;
+
   cmd.label = label;
   cmd.cls = bcs;
   cmd.run = &check_bank_transfer_run;
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index 743dbfede..39ae75d06 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -2,6 +2,24 @@
 # Persistant data storage for the testcase
 TALER_TEST_HOME = test_taler_exchange_httpd_home/
 
+
+[exchange_keys]
+
+# how long is one signkey valid?
+signkey_duration = 4 weeks
+
+# how long are the signatures with the signkey valid?
+legal_duration = 2 years
+
+# how long do we generate denomination and signing keys
+# ahead of time?
+lookahead_sign = 32 weeks 1 day
+
+# how long do we provide to clients denomination and signing keys
+# ahead of time?
+lookahead_provide = 4 weeks 1 day
+
+
 [taler]
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
-- 
cgit v1.2.3