From 800279788f6a6c3ee0a4912ed6e0331017537298 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 16 Nov 2024 17:48:26 +0100 Subject: adapt merchant to taler-config split --- contrib/Makefile.am.in | 6 ++-- debian/etc/taler-merchant/conf.d/merchant.conf | 10 ++++++ .../taler-merchant/secrets/merchant-db.secret.conf | 8 +++++ debian/etc/taler-merchant/taler-merchant.conf | 26 ++++++++++++++ debian/etc/taler/conf.d/merchant.conf | 10 ------ debian/etc/taler/secrets/merchant-db.secret.conf | 8 ----- debian/taler-merchant.install | 14 ++++---- doc/Makefile.am | 19 ++++++----- doc/prebuilt | 2 +- src/backend/Makefile.am | 2 +- src/backend/merchant.conf | 3 ++ src/backend/taler-merchant-httpd.c | 10 +++++- .../taler-merchant-httpd_post-orders-ID-abort.c | 1 + .../taler-merchant-httpd_private-post-orders.c | 38 ++++++++++----------- src/backend/taler-merchant-httpd_spa.c | 2 +- src/backenddb/Makefile.am | 6 ++-- src/backenddb/merchantdb-postgres.conf | 4 +-- src/backenddb/test-merchantdb-postgres.conf | 2 +- src/merchant-tools/benchmark-common.conf | 5 ++- src/merchant-tools/taler-merchant-benchmark.c | 1 + src/testing/.gitignore | 4 +++ src/testing/test_kyc_api.conf | 19 +++++++---- src/testing/test_merchant_api.conf | 20 +++++++---- .../.config/taler/merchant/account-3.json | 1 - .../.config/taler/merchant/default.priv | 1 - .../.config/taler/merchant/dtip.priv | 1 - .../.config/taler/merchant/nulltip.priv | 2 -- .../.config/taler/merchant/reserve/dtip.priv | Bin 32 -> 0 bytes .../.config/taler/merchant/reserve/nulltip.priv | 1 - .../.config/taler/merchant/reserve/tip.priv | 1 - .../.config/taler/merchant/tip.priv | 1 - .../.config/taler/merchant/tor.priv | 1 - .../test_merchant_api_home/.config/taler/test.json | 8 ----- .../share/taler-auditor/offline-keys/auditor.priv | 1 + .../taler-exchange/exchange-offline/master.priv | 1 + .../share/taler/exchange-offline/master.priv | 1 - .../.local/share/taler/merchant/merchant.priv | 1 - .../taler/auditor/offline-keys/auditor.priv | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1696437704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1697042204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1697646704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1698251204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1698855704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1699460204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1700064704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1700669204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1701273704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1701878204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1702482704 | 2 -- .../exchange-secmod-cs/keys/coin_eur_1/1703087204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1703691704 | 2 -- .../exchange-secmod-cs/keys/coin_eur_1/1704296204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1704900704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1705505204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1706109704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1706714204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1707318704 | 2 -- .../exchange-secmod-cs/keys/coin_eur_1/1707923204 | 2 -- .../exchange-secmod-cs/keys/coin_eur_1/1708527704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1709132204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1709736704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1710341204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1710945704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1711550204 | 2 -- .../exchange-secmod-cs/keys/coin_eur_1/1712154704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1712759204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1713363704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_1/1713968204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1714572704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1715177204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1715781704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1716386204 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1716990704 | 1 - .../exchange-secmod-cs/keys/coin_eur_1/1717595204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1696437704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1697042204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1697646704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1698251204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1698855704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1699460204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1700064704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1700669204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1701273704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1701878204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1702482704 | 2 -- .../exchange-secmod-cs/keys/coin_eur_5/1703087204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1703691704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1704296204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1704900704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1705505204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1706109704 | 3 -- .../exchange-secmod-cs/keys/coin_eur_5/1706714204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1707318704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1707923204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1708527704 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1709132204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1709736704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1710341204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1710945704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1711550204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1712154704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1712759204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1713363704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1713968204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1714572704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1715177204 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1715781704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1716386204 | Bin 32 -> 0 bytes .../exchange-secmod-cs/keys/coin_eur_5/1716990704 | 1 - .../exchange-secmod-cs/keys/coin_eur_5/1717595204 | 2 -- .../keys/coin_eur_ct_1/1696437704 | 1 - .../keys/coin_eur_ct_1/1697042204 | 2 -- .../keys/coin_eur_ct_1/1697646704 | 1 - .../keys/coin_eur_ct_1/1698251204 | 1 - .../keys/coin_eur_ct_1/1698855704 | 1 - .../keys/coin_eur_ct_1/1699460204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_1/1700064704 | 1 - .../keys/coin_eur_ct_1/1700669204 | 1 - .../keys/coin_eur_ct_1/1701273704 | 1 - .../keys/coin_eur_ct_1/1701878204 | 1 - .../keys/coin_eur_ct_1/1702482704 | 1 - .../keys/coin_eur_ct_1/1703087204 | 1 - .../keys/coin_eur_ct_1/1703691704 | 1 - .../keys/coin_eur_ct_1/1704296204 | 1 - .../keys/coin_eur_ct_1/1704900704 | 1 - .../keys/coin_eur_ct_1/1705505204 | 1 - .../keys/coin_eur_ct_1/1706109704 | 1 - .../keys/coin_eur_ct_1/1706714204 | 1 - .../keys/coin_eur_ct_1/1707318704 | 1 - .../keys/coin_eur_ct_1/1707923204 | 1 - .../keys/coin_eur_ct_1/1709132204 | 1 - .../keys/coin_eur_ct_1/1709736704 | 1 - .../keys/coin_eur_ct_1/1710341204 | 1 - .../keys/coin_eur_ct_1/1710945704 | 1 - .../keys/coin_eur_ct_1/1711550204 | 1 - .../keys/coin_eur_ct_1/1712154704 | 1 - .../keys/coin_eur_ct_1/1712759204 | 1 - .../keys/coin_eur_ct_1/1713363704 | 1 - .../keys/coin_eur_ct_1/1713968204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_1/1714572704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_1/1715177204 | 1 - .../keys/coin_eur_ct_1/1715781704 | 2 -- .../keys/coin_eur_ct_1/1716386204 | 1 - .../keys/coin_eur_ct_1/1716990704 | 1 - .../keys/coin_eur_ct_1/1717595204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1696437704 | 1 - .../keys/coin_eur_ct_10/1697042204 | 1 - .../keys/coin_eur_ct_10/1697646704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1698251204 | 1 - .../keys/coin_eur_ct_10/1698855704 | 1 - .../keys/coin_eur_ct_10/1699460204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1700064704 | 1 - .../keys/coin_eur_ct_10/1700669204 | 1 - .../keys/coin_eur_ct_10/1701273704 | 1 - .../keys/coin_eur_ct_10/1701878204 | 1 - .../keys/coin_eur_ct_10/1702482704 | 1 - .../keys/coin_eur_ct_10/1703087204 | 1 - .../keys/coin_eur_ct_10/1703691704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1704296204 | 1 - .../keys/coin_eur_ct_10/1704900704 | 1 - .../keys/coin_eur_ct_10/1705505204 | 1 - .../keys/coin_eur_ct_10/1706109704 | 1 - .../keys/coin_eur_ct_10/1706714204 | 1 - .../keys/coin_eur_ct_10/1707318704 | 2 -- .../keys/coin_eur_ct_10/1707923204 | 1 - .../keys/coin_eur_ct_10/1708527704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1709132204 | 1 - .../keys/coin_eur_ct_10/1709736704 | 1 - .../keys/coin_eur_ct_10/1710341204 | 1 - .../keys/coin_eur_ct_10/1710945704 | 1 - .../keys/coin_eur_ct_10/1711550204 | 1 - .../keys/coin_eur_ct_10/1712154704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1712759204 | 1 - .../keys/coin_eur_ct_10/1713363704 | 1 - .../keys/coin_eur_ct_10/1713968204 | 1 - .../keys/coin_eur_ct_10/1714572704 | 1 - .../keys/coin_eur_ct_10/1715177204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1715781704 | 1 - .../keys/coin_eur_ct_10/1716386204 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1716990704 | Bin 32 -> 0 bytes .../keys/coin_eur_ct_10/1717595204 | 1 - .../taler/exchange-secmod-cs/secmod-private-key | Bin 32 -> 0 bytes .../taler/exchange-secmod-eddsa/secmod-private-key | 1 - .../taler/exchange-secmod-rsa/secmod-private-key | 1 - .../taler/taler/auditor/offline-keys/auditor.priv | 1 - .../taler/taler/crypto-eddsa/1626561343 | 1 - .../taler/taler/crypto-eddsa/1633818643 | 1 - .../taler/taler/crypto-eddsa/1641075943 | 1 - .../taler/taler/crypto-eddsa/1648333243 | 1 - .../taler/taler/crypto-eddsa/1655590543 | 1 - .../taler/taler/crypto-rsa/coin_eur_1/1626554443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1627158943 | Bin 767 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1627763443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1628367943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1628972443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1629576943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1630181443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1630785943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1631390443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1631994943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1632599443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1633203943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1633808443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1634412943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1635017443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1635621943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1636226443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1636830943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1637435443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1638039943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1638644443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1639248943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1639853443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1640457943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1641062443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1641666943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1642271443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1642875943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1643480443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1644084943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1644689443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1645293943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1645898443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1646502943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1647107443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1647711943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1648316443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1648920943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1649525443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1650129943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1650734443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1651338943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1651943443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1652547943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1653152443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1653756943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1654361443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1654965943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1655570443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1656174943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1656779443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1657383943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1657988443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_1/1658592943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1626554443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1627158943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1627763443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1628367943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1628972443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1629576943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1630181443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1630785943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1631390443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1631994943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1632599443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1633203943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1633808443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1634412943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1635017443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1635621943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1636226443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1636830943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1637435443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1638039943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1638644443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1639248943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1639853443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1640457943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1641062443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1641666943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1642271443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1642875943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1643480443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1644084943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1644689443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1645293943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1645898443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1646502943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1647107443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1647711943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1648316443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1648920943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1649525443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1650129943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1650734443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1651338943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1651943443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1652547943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1653152443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1653756943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1654361443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1654965943 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1655570443 | Bin 768 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1656174943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1656779443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1657383943 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1657988443 | Bin 769 -> 0 bytes .../taler/taler/crypto-rsa/coin_eur_5/1658592943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1626554443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1627158943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1627763443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1628367943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1628972443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1629576943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1630181443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1630785943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1631390443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1631994943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1632599443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1633203943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1633808443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1634412943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1635017443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1635621943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1636226443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1636830943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1637435443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1638039943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1638644443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1639248943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1639853443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1640457943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1641062443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1641666943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1642271443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1642875943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1643480443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1644084943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1644689443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1645293943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1645898443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1646502943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1647107443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1647711943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1648316443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1648920943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1649525443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1650129943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1650734443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1651338943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1651943443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1652547943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1653152443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1653756943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1654361443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1654965943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1655570443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1656174943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1656779443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1657383943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1657988443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_1/1658592943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1626554443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1627158943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1627763443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1628367943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1628972443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1629576943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1630181443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1630785943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1631390443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1631994943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1632599443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1633203943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1633808443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1634412943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1635017443 | Bin 767 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1635621943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1636226443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1636830943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1637435443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1638039943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1638644443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1639248943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1639853443 | Bin 767 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1640457943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1641062443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1641666943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1642271443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1642875943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1643480443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1644084943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1644689443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1645293943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1645898443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1646502943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1647107443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1647711943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1648316443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1648920943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1649525443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1650129943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1650734443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1651338943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1651943443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1652547943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1653152443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1653756943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1654361443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1654965943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1655570443 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1656174943 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1656779443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1657383943 | Bin 768 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1657988443 | Bin 769 -> 0 bytes .../taler/crypto-rsa/coin_eur_ct_10/1658592943 | Bin 768 -> 0 bytes .../taler/taler/exchange-offline/master.priv | 1 - .../taler/taler/exchange-offline/secm_tofus.pub | Bin 96 -> 0 bytes .../taler/exchange-secmod-eddsa/keys/1686160442 | 1 - .../taler/exchange-secmod-eddsa/keys/1693417742 | 1 - .../taler/exchange-secmod-eddsa/keys/1700675042 | 1 - .../taler/exchange-secmod-eddsa/keys/1707932342 | 1 - .../taler/exchange-secmod-eddsa/keys/1715189642 | 1 - .../taler/exchange-secmod-eddsa/secmod-private-key | 2 -- .../taler/taler/exchange/offline-keys/master.priv | 1 - .../taler/taler/exchange/wirefees/x-taler-bank.fee | Bin 800 -> 0 bytes .../taler/taler/merchant/merchant.priv | 1 - src/testing/test_template.conf | 12 +++---- src/util/Makefile.am | 2 +- src/util/merchant-paths.conf | 15 +++----- src/util/os_installation.c | 2 +- src/util/taler-merchant-config.c | 2 +- 422 files changed, 153 insertions(+), 269 deletions(-) create mode 100644 debian/etc/taler-merchant/conf.d/merchant.conf create mode 100644 debian/etc/taler-merchant/secrets/merchant-db.secret.conf create mode 100644 debian/etc/taler-merchant/taler-merchant.conf delete mode 100644 debian/etc/taler/conf.d/merchant.conf delete mode 100644 debian/etc/taler/secrets/merchant-db.secret.conf delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/default.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv delete mode 100644 src/testing/test_merchant_api_home/.config/taler/test.json create mode 100644 src/testing/test_merchant_api_home/.local/share/taler-auditor/offline-keys/auditor.priv create mode 100644 src/testing/test_merchant_api_home/.local/share/taler-exchange/exchange-offline/master.priv delete mode 100644 src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv delete mode 100644 src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv delete mode 100644 src/testing/test_merchant_api_home/taler/auditor/offline-keys/auditor.priv delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1696437704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710341204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710945704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1711550204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712154704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712759204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713363704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713968204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1714572704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715177204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715781704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716386204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716990704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1717595204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1696437704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697042204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697646704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698251204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698855704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1699460204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700064704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700669204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701273704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701878204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1702482704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703087204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703691704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704296204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706109704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706714204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707318704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707923204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1708527704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709132204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709736704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710341204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710945704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1711550204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712154704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712759204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713363704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713968204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1714572704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715177204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715781704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716386204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716990704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706109704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706714204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713968204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1714572704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715177204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715781704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716386204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716990704 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1717595204 delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-cs/secmod-private-key delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-eddsa/secmod-private-key delete mode 100644 src/testing/test_merchant_api_home/taler/exchange-secmod-rsa/secmod-private-key delete mode 100644 src/testing/test_merchant_api_home/taler/taler/auditor/offline-keys/auditor.priv delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1626561343 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1633818643 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1655590543 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1626554443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627158943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627763443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628367943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628972443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1629576943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630181443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630785943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631390443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631994943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1632599443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633203943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633808443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1634412943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635017443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635621943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636226443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636830943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1637435443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638039943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638644443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639248943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639853443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1640457943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641062443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641666943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642271443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642875943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1643480443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644084943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644689443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645293943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645898443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1646502943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647107443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647711943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648316443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648920943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1649525443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650129943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650734443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651338943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651943443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1652547943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653152443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653756943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654361443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654965943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1655570443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656174943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656779443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657383943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657988443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1658592943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1626554443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627158943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627763443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628367943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628972443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1629576943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630181443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630785943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631390443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631994943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1632599443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633203943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633808443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1634412943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635017443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635621943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636226443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636830943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1637435443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638039943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638644443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639248943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639853443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1640457943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641062443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641666943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642271443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642875943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1643480443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644084943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644689443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645293943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645898443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1646502943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647107443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647711943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648316443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648920943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1649525443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650129943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650734443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651338943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651943443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1652547943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653152443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653756943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654361443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654965943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1655570443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656174943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656779443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657383943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657988443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1658592943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1626554443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627158943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627763443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628367943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628972443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1629576943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630181443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630785943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631390443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631994943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1632599443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633203943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633808443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1634412943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635017443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635621943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636226443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636830943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1637435443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638039943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638644443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639248943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639853443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1640457943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641062443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641666943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642271443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642875943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1643480443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644084943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644689443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645293943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645898443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1646502943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647107443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647711943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648316443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648920943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1649525443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650129943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650734443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651338943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651943443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1652547943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653152443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653756943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654361443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654965943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1655570443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656174943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656779443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657383943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657988443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1658592943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1626554443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627158943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627763443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628367943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628972443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1629576943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630181443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630785943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631390443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631994943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1632599443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633203943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633808443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1634412943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635017443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635621943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636226443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636830943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1637435443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638039943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638644443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639248943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639853443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1640457943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641062443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641666943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642271443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642875943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1643480443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644084943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644689443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645293943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645898443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1646502943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647107443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647711943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648316443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648920943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1649525443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650129943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650734443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651338943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651943443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1652547943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653152443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653756943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654361443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654965943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1655570443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656174943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656779443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657383943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657988443 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1658592943 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-offline/master.priv delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-offline/secm_tofus.pub delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1686160442 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1693417742 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1700675042 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1707932342 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1715189642 delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/secmod-private-key delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange/offline-keys/master.priv delete mode 100644 src/testing/test_merchant_api_home/taler/taler/exchange/wirefees/x-taler-bank.fee delete mode 100644 src/testing/test_merchant_api_home/taler/taler/merchant/merchant.priv diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in index 9ae18eb3..fa57a851 100644 --- a/contrib/Makefile.am.in +++ b/contrib/Makefile.am.in @@ -1,8 +1,8 @@ # This file is in the public domain. -tmplpkgdatadir = $(prefix)/share/taler/merchant/templates/ -staticpkgdatadir = $(prefix)/share/taler/merchant/static/ -spapkgdatadir = $(prefix)/share/taler/merchant/spa/ +tmplpkgdatadir = $(prefix)/share/taler-merchant/templates/ +staticpkgdatadir = $(prefix)/share/taler-merchant/static/ +spapkgdatadir = $(prefix)/share/taler-merchant/spa/ bin_SCRIPTS = \ taler-merchant-dbconfig diff --git a/debian/etc/taler-merchant/conf.d/merchant.conf b/debian/etc/taler-merchant/conf.d/merchant.conf new file mode 100644 index 00000000..48516157 --- /dev/null +++ b/debian/etc/taler-merchant/conf.d/merchant.conf @@ -0,0 +1,10 @@ +# Read secret sections into configuration, but only +# if we have permission to do so. +@inline-secret@ merchantdb-postgres ../secrets/merchant-db.secret.conf + +[merchant] +DATABASE = postgres +SERVE = unix + +# Merchant-specific overrides, included last to take precedence. +@inline-matching@ ../merchant-overrides.conf diff --git a/debian/etc/taler-merchant/secrets/merchant-db.secret.conf b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf new file mode 100644 index 00000000..6cbbb24c --- /dev/null +++ b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf @@ -0,0 +1,8 @@ +[merchantdb-postgres] + +# Typically, there should only be a single line here, of the form: + +CONFIG=postgres:///taler-merchant + +# The details of the URI depend on where the database lives and how +# access control was configured. diff --git a/debian/etc/taler-merchant/taler-merchant.conf b/debian/etc/taler-merchant/taler-merchant.conf new file mode 100644 index 00000000..9eb70e2e --- /dev/null +++ b/debian/etc/taler-merchant/taler-merchant.conf @@ -0,0 +1,26 @@ +# Main entry point for the GNU Taler configuration. +# +# Structure: +# - taler-merchant.conf is the main configuration entry point +# used by all Taler merchant components (the file you are currently +# looking at. +# - overrides.conf contains configuration overrides that are +# set by some tools that help with the configuration, +# and should not be edited by humans. Comments in this file +# are not preserved. +# - conf.d/ contains configuration files for +# Taler components, which can be read by all +# users of the system and are included by the main +# configuration. +# - secrets/ contains configuration snippets +# with secrets for particular services. +# These files should have restrictive permissions +# so that only users of the relevant services +# can read it. All files in it should end with +# ".secret.conf". + +# Inline configurations from all Taler components. +@inline-matching@ conf.d/*.conf + +# Overrides from tools that help with configuration. +@inline@ overrides.conf diff --git a/debian/etc/taler/conf.d/merchant.conf b/debian/etc/taler/conf.d/merchant.conf deleted file mode 100644 index 48516157..00000000 --- a/debian/etc/taler/conf.d/merchant.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Read secret sections into configuration, but only -# if we have permission to do so. -@inline-secret@ merchantdb-postgres ../secrets/merchant-db.secret.conf - -[merchant] -DATABASE = postgres -SERVE = unix - -# Merchant-specific overrides, included last to take precedence. -@inline-matching@ ../merchant-overrides.conf diff --git a/debian/etc/taler/secrets/merchant-db.secret.conf b/debian/etc/taler/secrets/merchant-db.secret.conf deleted file mode 100644 index 6cbbb24c..00000000 --- a/debian/etc/taler/secrets/merchant-db.secret.conf +++ /dev/null @@ -1,8 +0,0 @@ -[merchantdb-postgres] - -# Typically, there should only be a single line here, of the form: - -CONFIG=postgres:///taler-merchant - -# The details of the URI depend on where the database lives and how -# access control was configured. diff --git a/debian/taler-merchant.install b/debian/taler-merchant.install index b1d93b17..03f5840f 100644 --- a/debian/taler-merchant.install +++ b/debian/taler-merchant.install @@ -1,11 +1,9 @@ -usr/bin/ -usr/lib/*/taler/*.so +usr/bin/taler-merchant-* +usr/lib/*/taler-merchant/*.so usr/lib/*/libtalermerchantdb.so.* -usr/share/man/man1/* -/usr/share/info/taler-merchant* -/usr/share/taler/merchant/* -/usr/share/taler/sql/merchant/* -/usr/share/taler/config.d/* +usr/share/man/man1/taler-merchant* +usr/share/man/man5/taler-merchant* +usr/share/info/taler-merchant* +usr/share/taler-merchant/* debian/etc/* /etc/ - diff --git a/doc/Makefile.am b/doc/Makefile.am index 979f320f..86b756a9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,16 +1,17 @@ SUBDIRS = . doxygen man_MANS = \ - prebuilt/man/taler-merchant-benchmark.1 \ - prebuilt/man/taler-merchant-dbconfig.1 \ - prebuilt/man/taler-merchant-dbinit.1 \ - prebuilt/man/taler-merchant-depositcheck.1 \ + prebuilt/man/taler-merchant-benchmark.1 \ + prebuilt/man/taler-merchant-config.1 \ + prebuilt/man/taler-merchant-dbconfig.1 \ + prebuilt/man/taler-merchant-dbinit.1 \ + prebuilt/man/taler-merchant-depositcheck.1 \ prebuilt/man/taler-merchant-exchangekeyupdate.1 \ - prebuilt/man/taler-merchant-httpd.1 \ - prebuilt/man/taler-merchant-kyccheck.1 \ - prebuilt/man/taler-merchant-passwd.1 \ - prebuilt/man/taler-merchant-reconciliation.1 \ - prebuilt/man/taler-merchant-webhook.1 \ + prebuilt/man/taler-merchant-httpd.1 \ + prebuilt/man/taler-merchant-kyccheck.1 \ + prebuilt/man/taler-merchant-passwd.1 \ + prebuilt/man/taler-merchant-reconciliation.1 \ + prebuilt/man/taler-merchant-webhook.1 \ prebuilt/man/taler-merchant-wirewatch.1 info_TEXINFOS = \ diff --git a/doc/prebuilt b/doc/prebuilt index dac14033..de586c11 160000 --- a/doc/prebuilt +++ b/doc/prebuilt @@ -1 +1 @@ -Subproject commit dac140335967c9c8409698186f0cba0635c7cd7f +Subproject commit de586c1110d18523dd762304c65e6f051690ba1a diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index d5ddda41..9b8a845e 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -6,7 +6,7 @@ if USE_COVERAGE XLIB = -lgcov endif -pkgcfgdir = $(prefix)/share/taler/config.d/ +pkgcfgdir = $(prefix)/share/taler-merchant/config.d/ pkgcfg_DATA = \ kudos.conf \ diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 44ec72d7..1231eddd 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -6,6 +6,9 @@ # General settings for the backend. [merchant] +# Default currency we use. +CURRENCY = KUDOS + # Use TCP or UNIX domain sockets? SERVE = tcp diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index f14c2c7e..34bed4ad 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -2263,6 +2263,7 @@ run (void *cls, if (GNUNET_SYSERR == TALER_config_get_currency (cfg, + "merchant", &TMH_currency)) { @@ -2317,7 +2318,14 @@ run (void *cls, "merchant", "FORCE_AUDIT")) TMH_force_audit = GNUNET_YES; - TALER_TEMPLATING_init ("merchant"); + if (GNUNET_OK != + TALER_TEMPLATING_init (TALER_EXCHANGE_project_data ())) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to setup templates\n"); + GNUNET_SCHEDULER_shutdown (); + return; + } if (GNUNET_OK != TMH_spa_init ()) { diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c index 80c6930b..19ee4cb7 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c @@ -884,6 +884,7 @@ parse_abort (struct MHD_Connection *connection, struct RefundDetails *rd = &ac->rd[coins_index]; const char *exchange_url; struct GNUNET_JSON_Specification ispec[] = { + /* FIXME: this is breaking multi-currency support! */ TALER_JSON_spec_amount ("contribution", TMH_currency, &rd->amount_with_fee), diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index 2b2931f1..a39e3202 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -886,36 +886,36 @@ execute_transaction (struct OrderContext *oc) } { - enum GNUNET_DB_QueryStatus qs; + enum GNUNET_DB_QueryStatus wqs; json_t *jhook; - jhook = GNUNET_JSON_PACK( - GNUNET_JSON_pack_string("order_id", - oc->parse_order.order_id), - GNUNET_JSON_pack_object_incref("contract", - oc->serialize_order.contract), - GNUNET_JSON_pack_string("instance_id", - oc->hc->instance->settings.id) - ); - GNUNET_assert(NULL != jhook); + jhook = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("order_id", + oc->parse_order.order_id), + GNUNET_JSON_pack_object_incref ("contract", + oc->serialize_order.contract), + GNUNET_JSON_pack_string ("instance_id", + oc->hc->instance->settings.id) + ); + GNUNET_assert (NULL != jhook); - qs = TMH_trigger_webhook(oc->hc->instance->settings.id, - "order_created", - jhook); + wqs = TMH_trigger_webhook (oc->hc->instance->settings.id, + "order_created", + jhook); - json_decref(jhook); + json_decref (jhook); - if (0 < qs) + if (0 < wqs) { TMH_db->rollback (TMH_db->cls); - if (GNUNET_DB_STATUS_SOFT_ERROR == qs) - return qs; - GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs); + if (GNUNET_DB_STATUS_SOFT_ERROR == wqs) + return wqs; + GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == wqs); reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, "failed to trigger webhooks"); - return qs; + return wqs; } } diff --git a/src/backend/taler-merchant-httpd_spa.c b/src/backend/taler-merchant-httpd_spa.c index 6992f519..c8ff4782 100644 --- a/src/backend/taler-merchant-httpd_spa.c +++ b/src/backend/taler-merchant-httpd_spa.c @@ -316,7 +316,7 @@ TMH_spa_init () return GNUNET_SYSERR; } GNUNET_asprintf (&dn, - "%smerchant/spa/", + "%s/spa/", path); GNUNET_free (path); } diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am index 8ade2260..926bbfb2 100644 --- a/src/backenddb/Makefile.am +++ b/src/backenddb/Makefile.am @@ -1,14 +1,14 @@ # This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include -plugindir = $(libdir)/taler +plugindir = $(libdir)/taler-merchant -pkgcfgdir = $(prefix)/share/taler/config.d/ +pkgcfgdir = $(prefix)/share/taler-merchant/config.d/ pkgcfg_DATA = \ merchantdb-postgres.conf -sqldir = $(prefix)/share/taler/sql/merchant/ +sqldir = $(prefix)/share/taler-merchant/sql/ sqlinputs = \ pg_*.sql \ diff --git a/src/backenddb/merchantdb-postgres.conf b/src/backenddb/merchantdb-postgres.conf index 33b4b838..34be3e7e 100644 --- a/src/backenddb/merchantdb-postgres.conf +++ b/src/backenddb/merchantdb-postgres.conf @@ -1,6 +1,6 @@ [merchantdb-postgres] -CONFIG = "postgres:///talermerchant" +CONFIG = "postgres:///taler-merchant" # Where are the SQL files to setup our tables? # Important: this MUST end with a "/"! -SQL_DIR = ${DATADIR}sql/merchant/ +SQL_DIR = ${DATADIR}sql/ diff --git a/src/backenddb/test-merchantdb-postgres.conf b/src/backenddb/test-merchantdb-postgres.conf index 5ddb86d8..f9c882fc 100644 --- a/src/backenddb/test-merchantdb-postgres.conf +++ b/src/backenddb/test-merchantdb-postgres.conf @@ -6,7 +6,7 @@ CONFIG = postgres:///talercheck # Where are the SQL files to setup our tables? # Important: this MUST end with a "/"! -SQL_DIR = ${DATADIR}sql/merchant/ +SQL_DIR = ${DATADIR}sql/ [taler] CURRENCY = "EUR" \ No newline at end of file diff --git a/src/merchant-tools/benchmark-common.conf b/src/merchant-tools/benchmark-common.conf index 66bf584c..ad4aaf46 100644 --- a/src/merchant-tools/benchmark-common.conf +++ b/src/merchant-tools/benchmark-common.conf @@ -2,10 +2,13 @@ [paths] TALER_TEST_HOME=exchange_benchmark_home/ -[taler] +[exchange] CURRENCY=EUR CURRENCY_ROUND_UNIT=EUR:0.01 +[merchant] +CURRENCY=EUR + [merchant-benchmark] MERCHANT_URL = "http://localhost:9966/" diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c index 63a7a7f6..48bf0d0b 100644 --- a/src/merchant-tools/taler-merchant-benchmark.c +++ b/src/merchant-tools/taler-merchant-benchmark.c @@ -567,6 +567,7 @@ main (int argc, } if (GNUNET_OK != TALER_config_get_currency (cfg, + "merchant", ¤cy)) { TALER_LOG_ERROR ("Failed to read currency from configuration\n"); diff --git a/src/testing/.gitignore b/src/testing/.gitignore index 07fd2be3..bd564cd8 100644 --- a/src/testing/.gitignore +++ b/src/testing/.gitignore @@ -16,3 +16,7 @@ test_kyc_api test_merchant_api_home/taler/exchange-secmod-* *.edited test_merchant_api_home/taler/exchange-offline/secm_tofus.pub +test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-cs/ +test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-eddsa/ +test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-rsa/ +test_merchant_api_home/.local/share/taler-exchange/exchange-offline/secm_tofus.pub diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf index ff3a80e0..c10fb4f0 100644 --- a/src/testing/test_kyc_api.conf +++ b/src/testing/test_kyc_api.conf @@ -3,10 +3,6 @@ [PATHS] TALER_TEST_HOME = test_merchant_api_home/ -[taler] -CURRENCY = EUR -CURRENCY_ROUND_UNIT = EUR:0.01 - [merchant-exchange-kudos] DISABLED = YES @@ -28,19 +24,28 @@ DB = postgres # This specifies which database the postgres backend uses. [merchantdb-postgres] CONFIG = postgres:///talercheck -SQL_DIR = $DATADIR/sql/merchant/ +SQL_DIR = ${DATADIR}sql/ [merchant-exchange-test] -MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0 +MASTER_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG EXCHANGE_BASE_URL = http://localhost:8081/ CURRENCY = EUR +[auditor] +BASE_URL = "http://localhost:8083/" +AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv +DB = postgres +PUBLIC_KEY = A29P1DRGXVTJZV1HFG251QPAW3ZTC681ZJWXB1T0RWGPE2HQSGZG +TALER_AUDITOR_SALT = test + [auditordb-postgres] CONFIG = postgres:///talercheck [exchange] +CURRENCY = EUR +CURRENCY_ROUND_UNIT = EUR:0.01 PORT = 8081 -MASTER_PUBLIC_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0 +MASTER_PUBLIC_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG BASE_URL = "http://localhost:8081/" STEFAN_ABS = "EUR:5" ENABLE_KYC = YES diff --git a/src/testing/test_merchant_api.conf b/src/testing/test_merchant_api.conf index 87dc6401..58245a4f 100644 --- a/src/testing/test_merchant_api.conf +++ b/src/testing/test_merchant_api.conf @@ -3,10 +3,6 @@ [PATHS] TALER_TEST_HOME = test_merchant_api_home/ -[taler] -CURRENCY = EUR -CURRENCY_ROUND_UNIT = EUR:0.01 - [merchant-exchange-kudos] DISABLED = YES @@ -35,29 +31,39 @@ PWD_HASH_CONFIG = { "cost": 4 } PWD_AUTH_COMPAT = yes [merchant] +CURRENCY = EUR PORT = 8080 SERVE = tcp DB = postgres [merchantdb-postgres] CONFIG = postgres:///talercheck -SQL_DIR = $DATADIR/sql/merchant/ +SQL_DIR = ${DATADIR}sql/ [merchant-exchange-test] -MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0 +MASTER_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG EXCHANGE_BASE_URL = http://localhost:8081/ CURRENCY = EUR [exchange] +CURRENCY = EUR +CURRENCY_ROUND_UNIT = EUR:0.01 AML_THRESHOLD = EUR:1000000 PORT = 8081 -MASTER_PUBLIC_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0 +MASTER_PUBLIC_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG BASE_URL = "http://localhost:8081/" STEFAN_ABS = "EUR:5" [exchangedb-postgres] CONFIG = "postgres:///talercheck" +[auditor] +BASE_URL = "http://localhost:8083/" +AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv +DB = postgres +PUBLIC_KEY = A29P1DRGXVTJZV1HFG251QPAW3ZTC681ZJWXB1T0RWGPE2HQSGZG +TALER_AUDITOR_SALT = test + [auditordb-postgres] CONFIG = postgres:///talercheck diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json b/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json deleted file mode 100644 index 70e8bbb6..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json +++ /dev/null @@ -1 +0,0 @@ -{"payto_uri":"payto://x-taler-bank/localhost/3","salt":"KHMDP5RV4K75TYZAAZEFSB33AQK5DECEDAQB3AYCXZHB50W83RC5C08H5CRNNG9BWQXN3RD52WCQ09A3MFJDJASGB3PRPA03V3TEGCR"} \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv deleted file mode 100644 index 8299ad28..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv +++ /dev/null @@ -1 +0,0 @@ -~~j&i4qlBM:ƾOߪ# \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv deleted file mode 100644 index ff3842bb..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv +++ /dev/null @@ -1 +0,0 @@ -47%Tҟ\v}"hP!. \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv deleted file mode 100644 index db695e5c..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv +++ /dev/null @@ -1,2 +0,0 @@ -by~]m~r1fcT04Q -ds \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv deleted file mode 100644 index c586db18..00000000 Binary files a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv and /dev/null differ diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv deleted file mode 100644 index edf062ea..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv +++ /dev/null @@ -1 +0,0 @@ -Bu#ĜW0*~$ROpk \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv deleted file mode 100644 index 5ee3bce0..00000000 --- a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv +++ /dev/null @@ -1 +0,0 @@ -Ve@cDӴ_!." \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204 deleted file mode 100644 index 895251e7..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204 +++ /dev/null @@ -1 +0,0 @@ -57洴TU^޹Q&k 'GRTJ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704 deleted file mode 100644 index bf62233c..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204 deleted file mode 100644 index 0ad216c4..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204 +++ /dev/null @@ -1 +0,0 @@ -^t92Lj7iS7D^t(| \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704 deleted file mode 100644 index 31e290ff..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704 +++ /dev/null @@ -1 +0,0 @@ -Fl6;Z̥hd>cȩ+q8i] \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204 deleted file mode 100644 index 60a6a9d8..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704 deleted file mode 100644 index bf23c192..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704 +++ /dev/null @@ -1 +0,0 @@ -vk=hL2PoK~҈ik8X \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204 deleted file mode 100644 index bb72cade..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204 +++ /dev/null @@ -1 +0,0 @@ -GȐMw7#9\r\#)(K \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704 deleted file mode 100644 index fe214623..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704 +++ /dev/null @@ -1 +0,0 @@ -As2I}yeЪc0- K \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204 deleted file mode 100644 index dc26e8b6..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204 +++ /dev/null @@ -1 +0,0 @@ -~eGZ; l¾~~KLm% \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704 deleted file mode 100644 index 45bf2bed..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704 +++ /dev/null @@ -1,2 +0,0 @@ -4|7&< -_})|5VY:P \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204 deleted file mode 100644 index da362cdf..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204 +++ /dev/null @@ -1 +0,0 @@ -A0>gc FUht.Q \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704 deleted file mode 100644 index ba11ebec..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704 +++ /dev/null @@ -1,2 +0,0 @@ -ʾ:C%yA -J5- \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204 deleted file mode 100644 index 727eff6b..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204 +++ /dev/null @@ -1 +0,0 @@ -{upSW/WpVfKj \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704 deleted file mode 100644 index 25552b45..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704 +++ /dev/null @@ -1 +0,0 @@ -KxƏaA 'D41B4O[ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204 deleted file mode 100644 index 7242fa0d..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704 deleted file mode 100644 index 34b500c6..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704 +++ /dev/null @@ -1 +0,0 @@ - D-dÿ!![yH$m7% \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204 deleted file mode 100644 index 3fe013b7..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204 +++ /dev/null @@ -1 +0,0 @@ -b$ߗq_~9og`;c \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704 deleted file mode 100644 index 5053597b..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704 +++ /dev/null @@ -1,2 +0,0 @@ -6_k}6"TiC͎f - \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204 deleted file mode 100644 index 5cad2bc1..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204 +++ /dev/null @@ -1,2 +0,0 @@ - -* [ (mabM^+x_MגҖD \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704 deleted file mode 100644 index d1ad1680..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204 deleted file mode 100644 index c79ca30e..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204 +++ /dev/null @@ -1 +0,0 @@ -Yx/*ǭMd2-gyjΐN \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704 deleted file mode 100644 index 94a9482c..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704 +++ /dev/null @@ -1 +0,0 @@ -pusFmmDrLš}οyKEv022PZ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704 deleted file mode 100644 index 01c429af..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704 +++ /dev/null @@ -1 +0,0 @@ -IERÅp!"5I p(C~ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204 deleted file mode 100644 index b8c127a6..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204 +++ /dev/null @@ -1 +0,0 @@ -HfY_]y% Y}DxCm$wGE \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204 deleted file mode 100644 index 1a5f9273..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204 +++ /dev/null @@ -1,2 +0,0 @@ -+_RmOְAJd&} -", \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704 deleted file mode 100644 index 2260d03f..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704 +++ /dev/null @@ -1 +0,0 @@ -u4Gxnv],uy H1rӸ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204 deleted file mode 100644 index 193e653d..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204 +++ /dev/null @@ -1,2 +0,0 @@ -]H< -".k43hWx \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704 deleted file mode 100644 index 47bc14d8..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704 +++ /dev/null @@ -1 +0,0 @@ -Äհ@[*U kr \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204 deleted file mode 100644 index ba2059c4..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204 +++ /dev/null @@ -1 +0,0 @@ -؅SGe݉G`\֜XYP/حPN \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704 deleted file mode 100644 index c41becef..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704 +++ /dev/null @@ -1 +0,0 @@ -Z<îf"!)%iܠât \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204 deleted file mode 100644 index ef4541c3..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704 deleted file mode 100644 index 4110af46..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704 +++ /dev/null @@ -1 +0,0 @@ -faN H'^>Atn+[#5Y \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204 deleted file mode 100644 index b6bd01a3..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204 +++ /dev/null @@ -1 +0,0 @@ -˛oOP6QDWq$k0J \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704 deleted file mode 100644 index 9785b04d..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704 +++ /dev/null @@ -1 +0,0 @@ -ⲭw/ɕVv%,i 6# \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204 deleted file mode 100644 index 45dd2690..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204 +++ /dev/null @@ -1 +0,0 @@ -=p;ƐT3M[x|m~O \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704 deleted file mode 100644 index 286d043e..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704 +++ /dev/null @@ -1 +0,0 @@ -t6Joq`KKd:%(S) \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204 deleted file mode 100644 index 9a49a0d7..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204 +++ /dev/null @@ -1 +0,0 @@ -M9; Yi&!BOź0,A˒ b \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704 deleted file mode 100644 index 7b831419..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704 +++ /dev/null @@ -1 +0,0 @@ -N،D־q>A-;irf \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204 deleted file mode 100644 index e107b922..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204 +++ /dev/null @@ -1 +0,0 @@ -maH0l% yX?Y6_8XG \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704 deleted file mode 100644 index 455ecdb7..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704 +++ /dev/null @@ -1 +0,0 @@ -_2y|Ӡo݋[ڣoVRm \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204 deleted file mode 100644 index b0afe0cd..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204 +++ /dev/null @@ -1 +0,0 @@ -ˈjɥm0Ygڳy  \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704 deleted file mode 100644 index 4ce6db5e..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704 +++ /dev/null @@ -1 +0,0 @@ -m {LO|SߌGT3e \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204 deleted file mode 100644 index d273e552..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204 +++ /dev/null @@ -1 +0,0 @@ -Th2{5ZzDS*)6a \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204 deleted file mode 100644 index 868af8ef..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204 +++ /dev/null @@ -1 +0,0 @@ -n/3W' ۗ=5mV[ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704 deleted file mode 100644 index 538ee496..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704 +++ /dev/null @@ -1 +0,0 @@ -HO˲%ྡc]X> \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204 deleted file mode 100644 index a24da62f..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204 +++ /dev/null @@ -1 +0,0 @@ -yzͥ HW@-&y./`- \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704 deleted file mode 100644 index b4ca3f1f..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704 +++ /dev/null @@ -1 +0,0 @@ -܀އ#׭x0ƚTcn٢-r \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204 deleted file mode 100644 index c57cde50..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204 +++ /dev/null @@ -1 +0,0 @@ -MdHn? 3ЏH/"Q \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704 deleted file mode 100644 index c085d0a8..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704 +++ /dev/null @@ -1 +0,0 @@ -79}3NvV4VM*džVZ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204 deleted file mode 100644 index a29b261b..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204 +++ /dev/null @@ -1 +0,0 @@ -xH0iKFoO?PІͤd08  \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704 deleted file mode 100644 index eb6972f8..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704 +++ /dev/null @@ -1 +0,0 @@ -4,@W!X~ulH۩T!ˡ? -ID diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204 deleted file mode 100644 index 7a016552..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204 +++ /dev/null @@ -1 +0,0 @@ -)F! @b L`O]FD,(> \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704 deleted file mode 100644 index 7cafdb67..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704 +++ /dev/null @@ -1 +0,0 @@ - ܻ(FN)1cn8TxU \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204 deleted file mode 100644 index c7772341..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704 deleted file mode 100644 index 3a48e83c..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704 +++ /dev/null @@ -1 +0,0 @@ - 1pJ9A[x7.kap \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204 deleted file mode 100644 index 02fcbef5..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204 +++ /dev/null @@ -1 +0,0 @@ -((F;3,ʇțWIhz!؇[ \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704 deleted file mode 100644 index 514a546f..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204 deleted file mode 100644 index b082e7da..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204 +++ /dev/null @@ -1 +0,0 @@ -Cx,KNƆkUYz9Ro+nf \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704 deleted file mode 100644 index 969cb8d8..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704 +++ /dev/null @@ -1 +0,0 @@ -MqB4鎥rPƇHgi \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204 deleted file mode 100644 index fcfb97a2..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704 deleted file mode 100644 index d7f0cffe..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704 +++ /dev/null @@ -1 +0,0 @@ -9RNHěL+7NLiL \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204 deleted file mode 100644 index 912e633f..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204 +++ /dev/null @@ -1 +0,0 @@ -A0$^뢈/uSE} \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704 deleted file mode 100644 index c2d88da1..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704 +++ /dev/null @@ -1 +0,0 @@ -(* UB㫼,X'"\J|k3 \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204 deleted file mode 100644 index 14281a72..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204 +++ /dev/null @@ -1 +0,0 @@ -sRz4Ÿsd_Jߣu \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704 deleted file mode 100644 index 3f1f19d8..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704 +++ /dev/null @@ -1 +0,0 @@ -Mne6{ᒘE1U VхP"?R \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204 deleted file mode 100644 index 4ce8f1ff..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204 +++ /dev/null @@ -1 +0,0 @@ -$[RnP7G) \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704 deleted file mode 100644 index 1971537b..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204 deleted file mode 100644 index 77c8c1d5..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204 +++ /dev/null @@ -1 +0,0 @@ -%yk/lw5^_و٭t`2{T8i \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704 deleted file mode 100644 index c946503d..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704 +++ /dev/null @@ -1 +0,0 @@ -MrqDqrEtjXN{ZT 4 diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204 deleted file mode 100644 index 86eea5e2..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204 +++ /dev/null @@ -1 +0,0 @@ -xCa^dO?[݌x1V \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704 deleted file mode 100644 index 1057eb4c..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704 +++ /dev/null @@ -1 +0,0 @@ -PEƞO5r0iHKb13 \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204 deleted file mode 100644 index 3cbb16ef..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204 +++ /dev/null @@ -1 +0,0 @@ -BǀE{+oPᕲ" \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704 deleted file mode 100644 index 7f4ce85b..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704 +++ /dev/null @@ -1,2 +0,0 @@ -=ʾE -VS9X{}ei\u \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204 deleted file mode 100644 index d44fbfb7..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204 +++ /dev/null @@ -1 +0,0 @@ -!2^.OI$^0XĴqn|4 \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704 deleted file mode 100644 index cba4467a..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204 deleted file mode 100644 index 528b7eee..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204 +++ /dev/null @@ -1 +0,0 @@ -CCeA MBd;/ n \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704 deleted file mode 100644 index a5e1d42a..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704 +++ /dev/null @@ -1 +0,0 @@ -o>IDŅbvJHNa7)1i \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204 deleted file mode 100644 index 47341063..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204 +++ /dev/null @@ -1 +0,0 @@ -Rۦ%D1gBYyp@㥎ix diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704 deleted file mode 100644 index ebbad9d4..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704 +++ /dev/null @@ -1 +0,0 @@ - (~cfaM MJjR  \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204 deleted file mode 100644 index db6a523e..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204 +++ /dev/null @@ -1 +0,0 @@ -!QV^p7"/v]ߤdūDr= \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704 deleted file mode 100644 index d281cbcc..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204 deleted file mode 100644 index 4cd2c6aa..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204 +++ /dev/null @@ -1 +0,0 @@ -ڊn<;q.N \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704 deleted file mode 100644 index dba39243..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704 +++ /dev/null @@ -1 +0,0 @@ -u>/{&AN|s3 CZ-  \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204 deleted file mode 100644 index 7cda9094..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204 +++ /dev/null @@ -1 +0,0 @@ -?7!CS%A ¦5C4 \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704 deleted file mode 100644 index 6fe94e82..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704 +++ /dev/null @@ -1 +0,0 @@ -ctBi6,uWC2nY] \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204 deleted file mode 100644 index 02d135b2..00000000 Binary files a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204 and /dev/null differ diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704 deleted file mode 100644 index b3015f6f..00000000 --- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704 +++ /dev/null @@ -1 +0,0 @@ -AvG! A \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943 deleted file mode 100644 index 6bff5766..00000000 --- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943 +++ /dev/null @@ -1 +0,0 @@ -7M"s`e|ݓN-k \ No newline at end of file diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243 deleted file mode 100644 index 1421144a..00000000 --- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243 +++ /dev/null @@ -1 +0,0 @@ -8:o` -ciKlçn 4