[taler-anastasis] branch master updated: activating implementation of #6175

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 5cd06f9  activating implementation of #6175
5cd06f9 is described below

commit 5cd06f9d8d810996b80c0c671ceb0f25062bd155
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Dec 14 15:42:58 2020 +0100

    activating implementation of #6175
---
 src/lib/test_anastasis.c        | 27 +++++++++++++++++++--------
 src/lib/test_anastasis_api.c    | 26 +++++++++++++++++++-------
 src/lib/test_anastasis_api.conf | 10 ++++++----
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/lib/test_anastasis.c b/src/lib/test_anastasis.c
index c1534b0..b93d0cf 100644
--- a/src/lib/test_anastasis.c
+++ b/src/lib/test_anastasis.c
@@ -151,13 +151,6 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command pay[] = {
-    TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
-                                               merchant_url,
-                                               "default",
-                                               merchant_payto,
-                                               "EUR",
-                                               MHD_HTTP_NO_CONTENT),
-
     /**
      * Move money to the exchange's bank account.
      */
@@ -347,7 +340,25 @@ run (void *cls,
   };
 
   struct TALER_TESTING_Command commands[] = {
-
+    /* general setup */
+    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
+                                   MHD_HTTP_NO_CONTENT,
+                                   false),
+    TALER_TESTING_cmd_wire_add ("add-wire-account",
+                                "payto://x-taler-bank/localhost/2",
+                                MHD_HTTP_NO_CONTENT,
+                                false),
+    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
+                                              CONFIG_FILE),
+    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
+                                                1,
+                                                232 /* FIXME: wrong number... 
*/),
+    TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
+                                               merchant_url,
+                                               "default",
+                                               merchant_payto,
+                                               "EUR",
+                                               MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_batch ("pay",
                              pay),
 
diff --git a/src/lib/test_anastasis_api.c b/src/lib/test_anastasis_api.c
index 7bf8599..5866c5b 100644
--- a/src/lib/test_anastasis_api.c
+++ b/src/lib/test_anastasis_api.c
@@ -157,12 +157,6 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command pay[] = {
-    TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
-                                               merchant_url,
-                                               "default",
-                                               merchant_payto,
-                                               "EUR",
-                                               MHD_HTTP_NO_CONTENT),
     /**
      * Move money to the exchange's bank account.
      */
@@ -336,7 +330,25 @@ run (void *cls,
   };
 
   struct TALER_TESTING_Command commands[] = {
-
+    /* general setup */
+    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
+                                   MHD_HTTP_NO_CONTENT,
+                                   false),
+    TALER_TESTING_cmd_wire_add ("add-wire-account",
+                                "payto://x-taler-bank/localhost/2",
+                                MHD_HTTP_NO_CONTENT,
+                                false),
+    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
+                                              CONFIG_FILE),
+    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
+                                                1,
+                                                232 /* FIXME: wrong number... 
*/),
+    TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
+                                               merchant_url,
+                                               "default",
+                                               merchant_payto,
+                                               "EUR",
+                                               MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_batch ("pay",
                              pay),
 
diff --git a/src/lib/test_anastasis_api.conf b/src/lib/test_anastasis_api.conf
index 21ea1a1..5395f47 100644
--- a/src/lib/test_anastasis_api.conf
+++ b/src/lib/test_anastasis_api.conf
@@ -199,6 +199,9 @@ DB = postgres
 # HTTP port the exchange listens to
 PORT = 8081
 
+# how long are the signatures with the signkey valid?
+SIGNKEY_LEGAL_DURATION = 2 years
+
 # Our public key
 MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 
@@ -225,16 +228,15 @@ REVOCATION_DIR = ${TALER_DATA_HOME}/exchange/revocations/
 SERVE = tcp
 
 
+##############################################################
+
 [exchange-offline]
 
 # Where do we store the offline master private key of the exchange?
 MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
 
 # Where do we store the TOFU key material?
-SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
-
-# END
-##############################################################
+SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/secm_tofus.pub
 
 
 [exchangedb-postgres]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.