merchant

commit 4fc18cc03d4a018b515d0e868eab929f67fcc413
parent 96939050ef7d6afe8f0d6ff5b68dbdd940c1c85e
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Fri,  4 May 2018 09:18:34 +0200

Reverting last change.

Unpractical because the codebases involved
are *two*: merchant and exchange, and it is
just not practical to recompile the exchange
every time we need to generate payments.

Diffstat:
M
src/lib/Makefile.am
 | 
1
-
M
src/lib/testing_api_helpers.c
 | 
15
++++-----------

2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -127,7 +127,6 @@ test_merchant_api_new_LDADD = \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
-test_merchant_api_new_CFLAGS = -DCUSTOM_CONFIG -DPURGE_DATABASE
 
 test_merchant_api_SOURCES = \
   test_merchant_api.c
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
@@ -74,9 +74,7 @@ TALER_TESTING_run_merchant (const char *config_filename)
                                NULL, NULL, NULL,
                                "taler-merchant-httpd",
                                "taler-merchant-httpd",
-                               #ifdef CUSTOM_CONFIG
                                "-c", config_filename,
-                               #endif
                                NULL);
   if (NULL == merchant_proc)
     MERCHANT_FAIL ();
@@ -128,6 +126,9 @@ TALER_TESTING_prepare_merchant (const char *config_filename)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
   unsigned long long port;
+  struct GNUNET_OS_Process *dbinit_proc;
+  enum GNUNET_OS_ProcessStatusType type;
+  unsigned long code;
   char *base_url;
 
   cfg = GNUNET_CONFIGURATION_create ();
@@ -160,11 +161,6 @@ TALER_TESTING_prepare_merchant (const char *config_filename)
     MERCHANT_FAIL ();
   }
 
-  #ifdef PURGE_DATABASE
-  struct GNUNET_OS_Process *dbinit_proc;
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-
   /* DB preparation */
   if (NULL == (dbinit_proc = GNUNET_OS_start_process
     (GNUNET_NO,
@@ -172,9 +168,7 @@ TALER_TESTING_prepare_merchant (const char *config_filename)
      NULL, NULL, NULL,
      "taler-merchant-dbinit",
      "taler-merchant-dbinit",
-     #ifdef CUSTOM_CONFIG
      "-c", config_filename,
-     #endif
      "-r",
      NULL)))
   {
@@ -207,9 +201,8 @@ TALER_TESTING_prepare_merchant (const char *config_filename)
              " `taler-merchant-dbinit'!\n");
     MERCHANT_FAIL ();
   }
-
   GNUNET_OS_process_destroy (dbinit_proc);
-  #endif
+
 
 
   GNUNET_asprintf (&base_url,