merchant

commit 00891e6f0e82e20c3af27405d684b29a80b21ac2
parent 6fd5d362dd28773576079cd2872dafdb07c11596
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 19 Jan 2020 00:15:51 +0100

config for test case

Diffstat:
M
src/lib/test_merchant_api.conf
 | 
26
++++++++++----------------
M
src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
 | 
5
++---
M
src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
 | 
3
+--

3 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
@@ -17,6 +17,9 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
 # What currency do we use?
 CURRENCY = EUR
 
+[bank]
+HTTP_PORT = 8082
+
 ##########################################
 # Configuration for the merchant backend #
 ##########################################
@@ -79,17 +82,13 @@ NAME = Test Null-Tipping Merchant
 # Account of the MERCHANT
 [account-merchant]
 # What is the merchant's bank account?
-URL = "payto://x-taler-bank/localhost:8082/3"
+URL = "payto://x-taler-bank/localhost/3"
 
 # This is the *salted* response we give out for /contract requests.
 # File is generated on first use, no need for merchants to generate
 # the salt!
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/account-3.json
 
-# Which wire plugin should we used to access the account?
-# (use to validate payto://-URL and for back office)
-PLUGIN = taler_bank
-
 # Authentication information for basic authentication
 TALER_BANK_AUTH_METHOD = "basic"
 USERNAME = user
@@ -125,8 +124,6 @@ ACTIVE_nulltip = YES
 # (by the merchant)
 [exchange-kudos]
 MASTER_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# FIXME: remove next line?
-CURRENCY = KUDOS
 BASE_URL = http://localhost:8081/
 
 # only fixes skips.
@@ -185,29 +182,26 @@ MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 # Base URL of the exchange.
 BASE_URL = "http://localhost:8081/"
 
+
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"
 
+
 [auditordb-postgres]
 CONFIG = postgres:///talercheck
 
+
 # Account of the EXCHANGE
 [account-exchange]
 # What is the exchange's bank account (with the "Taler Bank" demo system)?
-URL = "payto://x-taler-bank/localhost:8082/2"
+URL = "payto://x-taler-bank/localhost/2"
+
+METHOD = x-taler-bank
 
 # This is the response we give out for the /wire request.  It provides
 # wallets with the bank information for transfers to the exchange.
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/exchange/account-2.json
 
-# Which wire plugin should we used to access the account?
-PLUGIN = taler_bank
-
-# Authentication information for basic authentication
-TALER_BANK_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json b/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
@@ -1,5 +1,4 @@
 {
-  "url": "payto://x-taler-bank/localhost:8082/2",
-  "master_sig": "AM32QB4RYMWK548PE63PJXJMWSA001TFFWTZZPSSD8HQ8JE4D5V5X8WTSYSX59ANF4YRTRMF5Q4Q12CE2KTA8KQ03CM11YDTK75SJ20",
-  "master_pub": "T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG"
+  "url": "payto://x-taler-bank/localhost/2",
+  "master_sig": "A296BYJDP182XS8GHB362ENK4JVPQYHJ34AMNC52YKSK78NH85NA3MWCPM7XAYXWSHK0X9SH46JN84T2AYGP0YAV0E9HQXAYZGABP0R"
 }
 \ No newline at end of file
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json b/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
@@ -1 +1 @@
-{"salt":"NEHC5SP52WZRSZR8CTE3SV2JSZX2C1XFSA75YNRT6YJARRR2ERM32PMTHP16CT6TV7G2CX7T3J28YFP0PJP1PAMAQVT6J76RF3AE34R","url":"payto://x-taler-bank/localhost:8082/3"}
-\ No newline at end of file
+{"salt":"NEHC5SP52WZRSZR8CTE3SV2JSZX2C1XFSA75YNRT6YJARRR2ERM32PMTHP16CT6TV7G2CX7T3J28YFP0PJP1PAMAQVT6J76RF3AE34R","url":"payto://x-taler-bank/localhost/3"}