adapt merchant to taler-config splitHEADmaster

1 files changed, 13 insertions, 7 deletions

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