anastasis

commit 2234a9975d52ba40d02193bb0dc827d69d00548c
parent 0d9ff5f731aad0606c4d4dcb5e512b84c44c77e7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 30 Jul 2021 21:22:06 +0200

-adapt to changes in taler-exchange configuration structure

Diffstat:
M
src/cli/test_anastasis_reducer_enter_secret.sh
 | 
2
+-
M
src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
 | 
2
+-
M
src/testing/test_anastasis_api.conf
 | 
14
+++++++++-----

3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -102,7 +102,7 @@ DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
 rm -rf $DATA_DIR
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=`taler-config -f -c $CONF -s "EXCHANGE-OFFLINE" -o "MASTER_PRIV_FILE"`
 MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
 mkdir -p $MASTER_PRIV_DIR
 gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
diff --git a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
@@ -101,7 +101,7 @@ DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
 rm -rf $DATA_DIR
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=`taler-config -f -c $CONF -s "EXCHANGE-OFFLINE" -o "MASTER_PRIV_FILE"`
 MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
 mkdir -p $MASTER_PRIV_DIR
 gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
diff --git a/src/testing/test_anastasis_api.conf b/src/testing/test_anastasis_api.conf
@@ -183,11 +183,6 @@ MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 BASE_URL = "http://localhost:8081/"
 #BASE_URL = https://exchange.test.taler.net/
 
-KEYDIR = ${TALER_DATA_HOME}/exchange/live-keys/
-
-REVOCATION_DIR = ${TALER_DATA_HOME}/exchange/revocations/
-
-
 # Network configuration for the normal API/service HTTP server
 # serve via tcp socket (on PORT)
 SERVE = tcp
@@ -201,6 +196,15 @@ MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
 SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/secm_tofus.pub
 
 
+[taler-exchange-secmod-eddsa]
+# Where do we store the generated private keys.
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/keys
+
+[taler-exchange-secmod-rsa]
+# Where do we store the generated private keys.
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/keys
+
+
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"