diff options
| -rw-r--r-- | src/backend/merchant.conf | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 5 | ||||
| -rw-r--r-- | src/lib/test_merchant_api.conf | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 71ca5c74..0560111b 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -33,5 +33,5 @@ CONFIG = postgres:///talermerchant [merchant-instance-default] KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv -[default-wireformat] +[merchant-instance-wireformat-default] TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 07d71627..b5b289da 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -434,7 +434,8 @@ instances_iterator_cb (void *cls, iic = cls; substr = strstr (section, "merchant-instance-"); - if (NULL == substr) + if ((NULL == substr) + || (NULL != strstr (section, "merchant-instance-wireformat-"))) return; if (substr != section) @@ -491,7 +492,7 @@ instances_iterator_cb (void *cls, iic->default_instance = GNUNET_YES; GNUNET_asprintf (&instance_wiresection, - "%s-wireformat", + "merchant-instance-wireformat-%s", mi->id); mi->j_wire = iic->plugin->get_wire_details (iic->plugin->cls, diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf index 999b312a..80f49b3d 100644 --- a/src/lib/test_merchant_api.conf +++ b/src/lib/test_merchant_api.conf @@ -46,13 +46,13 @@ MASTER_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG [merchant-instance-default] KEYFILE = test_merchant.priv -[default-wireformat] +[merchant-instance-wireformat-default] TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json [merchant-instance-tor] KEYFILE = tor_merchant.priv -[tor-wireformat] +[merchant-instance-wireformat-tor] TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json # Auditors must be in sections "auditor-", the rest of the section |