merchant

commit e61803d187c5ba66a45a0e13fb9584e124334d36
parent 28feb29d0544e033c91879f0e10bb20f49f2a5ca
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu,  7 Apr 2016 11:08:26 +0200

fixing #4374

Diffstat:
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
4
++--
M
src/tests/merchant.conf
 | 
11
++++++-----

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -42,7 +42,7 @@ struct PostgresClosure
 
 
 #define PQSQL_strerror(kind, cmd, res)                \
-  GNUNET_log_from (kind, "merchant-db",                     \
+  GNUNET_log_from (kind, "merchantdb-postgres",       \
                    "SQL %s failed at %s:%u with error: %s", \
                    cmd, __FILE__, __LINE__, PQresultErrorMessage (res));
 
@@ -231,7 +231,7 @@ postgres_check_payment(void *cls,
   res = GNUNET_PQ_exec_prepared (pg->conn,
                                  "check_payment",
                                  params);
-  
+
   status = PQresultStatus (res);
   if (PGRES_TUPLES_OK != status)
   {
diff --git a/src/tests/merchant.conf b/src/tests/merchant.conf
@@ -1,18 +1,19 @@
 [merchant]
 PORT = 9966
-HOSTNAME = localhost
-TRUSTED_EXCHANGES = taler
 KEYFILE = merchant.priv
+DB = postgres
 
 [exchange-taler]
 HOSTNAME = demo.taler.net
 PORT = 80
 PUBKEY = Q1WVGRGC1F4W7RYC6M23AEGFEXQEHQ730K3GG0B67VPHQSRR75H0
 
-[merchant-db]
-CONFIG = postgres:///taler
+[merchantdb-postgres]
+# FIXME: this should be -postgres, and where do we specify which
+# backend database is to be used?
+CONFIG = postgres:///talermerchant
 
-[wire-sepa]
+[merchant-wireformat]
 IBAN = DE67830654080004822650
 NAME = GNUNET E.V
 BIC = GENODEF1SRL