[taler-merchant] branch master updated: 'account-' to 'merchant-account-'

[gnunet]

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

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 7d5c60f  'account-' to 'merchant-account-'
7d5c60f is described below

commit 7d5c60ff5a9527c31c914d0bf03775abe2eac5f8
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jan 19 17:55:48 2020 +0100

    'account-' to 'merchant-account-'
---
 src/backend/merchant.conf          | 6 +++---
 src/backend/taler-merchant-httpd.c | 6 +++---
 src/lib/test_merchant_api.conf     | 7 +------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 4c5f0f8..fb82e64 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -61,10 +61,10 @@ CONFIG = postgres:///talermerchant
 [instance-default]
 KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
 
-# [account-merchant]
+# [merchant-account-merchant]
 
 # payto://-URL of the merchant's bank account. Required.
-# URL = payto://x-taler-bank/bank/42
+#PAYTO_URI = payto://x-taler-bank/bank/42
 
 # File where this account's salted wire address is provided.
 # File does not have to exist, will be generated from
@@ -75,7 +75,7 @@ KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
 # instance "default"?  Must be set to YES if ACTIVE_default is YES.
 # Note that "default" here must match the instance's section name.
 # The same account may be enabled/active in multiple instances.
-#ENABLE_default = YES
+#HONOR_default = YES
 
 # Should this address be used in offers we create right now for
 # instance "default"?
diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 40689e4..c477266 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -701,7 +701,7 @@ struct WireFormatIteratorContext
 
 
 /**
- * Callback that looks for 'account-*' sections,
+ * Callback that looks for 'merchant-account-*' sections,
  * and populates our wire method according to the data
  *
  * @param cls closure with a `struct WireFormatIteratorContext *`
@@ -723,8 +723,8 @@ wireformat_iterator_cb (void *cls,
   char *wire_file_mode;
 
   if (0 != strncasecmp (section,
-                        "account-",
-                        strlen ("account-")))
+                        "merchant-account-",
+                        strlen ("merchant-account-")))
     return;
   GNUNET_asprintf (&instance_option,
                    "HONOR_%s",
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
index 0f459c8..8a7de75 100644
--- a/src/lib/test_merchant_api.conf
+++ b/src/lib/test_merchant_api.conf
@@ -80,7 +80,7 @@ TIP_RESERVE_PRIV_FILENAME = 
${TALER_CONFIG_HOME}/merchant/reserve/nulltip.priv
 NAME = Test Null-Tipping Merchant
 
 # Account of the MERCHANT
-[account-merchant]
+[merchant-account-merchant]
 # What is the merchant's bank account?
 PAYTO_URI = "payto://x-taler-bank/localhost/3"
 
@@ -89,11 +89,6 @@ PAYTO_URI = "payto://x-taler-bank/localhost/3"
 # the salt!
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/account-3.json
 
-# Authentication information for basic authentication
-TALER_BANK_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
 # Accept payments to this account in instance-default
 HONOR_default = YES
 

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