[taler-merchant] branch master updated (f639334 -> 00891e6)

[gnunet]

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

dold pushed a change to branch master
in repository merchant.

    from f639334  make test_merchant_api build again
     new 6fd5d36  remove ancient config setting
     new 00891e6  config for test case

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/lib/test_merchant_api.conf                     | 29 ++++++++--------------
 .../.config/taler/exchange/account-2.json          |  5 ++--
 .../.config/taler/merchant/account-3.json          |  2 +-
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
index a7e253c..da97090 100644
--- a/src/lib/test_merchant_api.conf
+++ b/src/lib/test_merchant_api.conf
@@ -17,13 +17,13 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
 # What currency do we use?
 CURRENCY = EUR
 
+[bank]
+HTTP_PORT = 8082
+
 ##########################################
 # Configuration for the merchant backend #
 ##########################################
 
-[test]
-INSTANCES = default tor
-
 [merchant]
 
 # Which port do we run the backend on? (HTTP server)
@@ -82,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
@@ -128,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.
@@ -188,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
index 858eca9..81db023 100644
--- 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
index 2b8a81d..9e5c1a9 100644
--- 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"}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.