[taler-merchant] branch master updated: clean up dist rules

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new cf9a1478 clean up dist rules
cf9a1478 is described below

commit cf9a14780cbbd99b50c054579ff002d5e54eaee1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 24 20:13:11 2023 +0200

    clean up dist rules
---
 src/testing/Makefile.am                                        |  4 +---
 .../.config/taler/exchange/account-2.json                      |  4 ----
 .../.local/share/taler/exchange-offline/master.priv            |  1 -
 .../.local/share/taler/exchange/offline-keys/master.priv       |  1 -
 .../.local/share/taler/exchange-offline/master.priv            |  1 -
 src/testing/test_template.conf                                 | 10 +++-------
 6 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 311680e1..49fcc095 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -240,9 +240,7 @@ EXTRA_DIST = \
   test_merchant_api_twisted-rsa.conf \
   test_merchant_api_proxy_merchant.conf \
   test_merchant_api_proxy_exchange.conf \
-  test_merchant_api_home/.local/share/taler/exchange-offline/master.priv \
-  test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_merchant_api_home/.config/taler/exchange/account-2.json \
+  test_merchant_api_home/taler/exchange-offline/master.priv \
   test_merchant.priv \
   test_template.conf \
   $(check_SCRIPTS)
diff --git 
a/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json 
b/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json
deleted file mode 100644
index b84273e8..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "payto_uri": "payto://x-taler-bank/localhost/2",
-  "master_sig": 
"A296BYJDP182XS8GHB362ENK4JVPQYHJ34AMNC52YKSK78NH85NA3MWCPM7XAYXWSHK0X9SH46JN84T2AYGP0YAV0E9HQXAYZGABP0R"
-}
\ No newline at end of file
diff --git 
a/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
 
b/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
deleted file mode 100644
index c20942d6..00000000
--- 
a/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-��k;d�_U�}�A.w�"!G��v_m�"_��
\ No newline at end of file
diff --git 
a/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
 
b/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index c20942d6..00000000
--- 
a/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-��k;d�_U�}�A.w�"!G��v_m�"_��
\ No newline at end of file
diff --git 
a/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv 
b/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
deleted file mode 100644
index ff57701a..00000000
--- 
a/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-�� �N0ߌ�s= �=k��G�M��-�g#r�
\ No newline at end of file
diff --git a/src/testing/test_template.conf b/src/testing/test_template.conf
index a45f966f..d97fc707 100644
--- a/src/testing/test_template.conf
+++ b/src/testing/test_template.conf
@@ -1,9 +1,5 @@
 [PATHS]
-TALER_HOME = ${PWD}/test_reducer_home/
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-system-runtime/
+TALER_TEST_HOME = test_merchant_api_home/
 
 [taler]
 CURRENCY = TESTKUDOS
@@ -13,7 +9,7 @@ CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 AML_THRESHOLD = TESTKUDOS:1000000
 MAX_KEYS_CACHING = forever
 DB = postgres
-MASTER_PUBLIC_KEY = VH2C95R9J44JK7JC87GXBFFAEPGYBSRESH6Y6WG51HRB2ZV7KQW0
+MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 SERVE = tcp
 UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
 UNIXPATH_MODE = 660
@@ -96,7 +92,7 @@ WIRE_GATEWAY_URL = 
"http://localhost:8082/accounts/exchange/taler-wire-gateway/";
 [merchant-exchange-default]
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = TESTKUDOS
-MASTER_KEY = VH2C95R9J44JK7JC87GXBFFAEPGYBSRESH6Y6WG51HRB2ZV7KQW0
+MASTER_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 
 [payments-generator]
 currency = TESTKUDOS

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