From d79df04ba7ea596c308d8d0803d6b5948d7e1252 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 27 Feb 2022 14:17:49 +0100
Subject: -fix tests, clean up code

---
 src/cli/test_anastasis_reducer_backup_enter_user_attributes.sh | 10 ----------
 src/cli/test_anastasis_reducer_enter_secret.sh                 |  1 +
 .../test_anastasis_reducer_recovery_enter_user_attributes.sh   |  1 +
 src/cli/test_reducer_free.conf                                 |  8 ++++++++
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/cli')

diff --git a/src/cli/test_anastasis_reducer_backup_enter_user_attributes.sh b/src/cli/test_anastasis_reducer_backup_enter_user_attributes.sh
index b8662e8..8a04b0a 100755
--- a/src/cli/test_anastasis_reducer_backup_enter_user_attributes.sh
+++ b/src/cli/test_anastasis_reducer_backup_enter_user_attributes.sh
@@ -126,16 +126,6 @@ fi
 
 echo "OK"
 
-echo -n "Test user attributes collection in a recovery state ..."
-anastasis-reducer -a \
-  '{"identity_attributes": {
-    "full_name": "Max Musterman",
-    "sq_number": "4",
-    "birthdate": "2000-01-01"}}' \
-  enter_user_attributes resources/02-recovery.json $TFILE 2> /dev/null && exit_fail "Expected recovery to fail due to lacking policy data"
-
-echo "OK"
-
 rm -f $TFILE
 
 exit 0
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh b/src/cli/test_anastasis_reducer_enter_secret.sh
index 8fb8b60..fd244e2 100755
--- a/src/cli/test_anastasis_reducer_enter_secret.sh
+++ b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -152,6 +152,7 @@ echo -n "Launching taler services ..."
 taler-bank-manage-testing $CONF postgres:///$TALER_DB serve > taler-bank.log 2> taler-bank.err &
 taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
 taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
+taler-exchange-secmod-cs -c $CONF 2> taler-exchange-secmod-cs.log &
 taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
 taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
 taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
diff --git a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
index 43c6a4e..41099bc 100755
--- a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
+++ b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh
@@ -149,6 +149,7 @@ echo -n "Launching taler services ..."
 taler-bank-manage-testing $CONF postgres:///$TALER_DB serve > taler-bank.log 2> taler-bank.err &
 taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
 taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
+taler-exchange-secmod-cs -c $CONF 2> taler-exchange-secmod-cs.log &
 taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
 taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
 taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
diff --git a/src/cli/test_reducer_free.conf b/src/cli/test_reducer_free.conf
index be4fbb6..1c7da88 100644
--- a/src/cli/test_reducer_free.conf
+++ b/src/cli/test_reducer_free.conf
@@ -123,6 +123,7 @@ fee_deposit = TESTKUDOS:0.01
 fee_refresh = TESTKUDOS:0.01
 fee_refund = TESTKUDOS:0.01
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_ct_10]
 value = TESTKUDOS:0.10
@@ -134,6 +135,7 @@ fee_deposit = TESTKUDOS:0.01
 fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.01
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_1]
 value = TESTKUDOS:1
@@ -145,6 +147,7 @@ fee_deposit = TESTKUDOS:0.02
 fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.01
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_2]
 value = TESTKUDOS:2
@@ -156,6 +159,7 @@ fee_deposit = TESTKUDOS:0.03
 fee_refresh = TESTKUDOS:0.04
 fee_refund = TESTKUDOS:0.02
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_4]
 value = TESTKUDOS:4
@@ -167,6 +171,7 @@ fee_deposit = TESTKUDOS:0.03
 fee_refresh = TESTKUDOS:0.04
 fee_refund = TESTKUDOS:0.02
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_5]
 value = TESTKUDOS:5
@@ -178,6 +183,7 @@ fee_deposit = TESTKUDOS:0.01
 fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.01
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_8]
 value = TESTKUDOS:8
@@ -189,6 +195,7 @@ fee_deposit = TESTKUDOS:0.02
 fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.04
 rsa_keysize = 1024
+CIPHER = RSA
 
 [coin_kudos_10]
 value = TESTKUDOS:10
@@ -200,3 +207,4 @@ fee_deposit = TESTKUDOS:0.01
 fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.01
 rsa_keysize = 1024
+CIPHER = RSA
-- 
cgit v1.2.3