merchant

commit 5d2add39e05f8dc84c5df04c03d7bef5a9fd77ae
parent 73642a5d264f716de576996ec374f090aa8575b7
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 19 Jan 2020 16:10:06 +0100

adapt to twister changes

Diffstat:
M
src/lib/Makefile.am
 | 
1
-
M
src/lib/test_merchant_api_twisted.c
 | 
8
++++----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -90,7 +90,6 @@ check_PROGRAMS = \
   test_merchant_api
 
 if HAVE_TWISTER
-# See FIXME_MARCELLO -- had some issues (FTBFS, etc.)
 check_PROGRAMS += test_merchant_api_twisted
 endif
 
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
@@ -997,11 +997,11 @@ main (int argc,
                                 (CONFIG_FILE)))
     return 77;
 
-  if (NULL == (twister_exchange_url = TALER_TESTING_prepare_twister
+  if (NULL == (twister_exchange_url = TALER_TWISTER_prepare_twister
                                         (PROXY_EXCHANGE_CONFIG_FILE)))
     return 77;
 
-  if (NULL == (twister_merchant_url = TALER_TESTING_prepare_twister
+  if (NULL == (twister_merchant_url = TALER_TWISTER_prepare_twister
                                         (PROXY_MERCHANT_CONFIG_FILE)))
     return 77;
 
@@ -1028,11 +1028,11 @@ main (int argc,
       // 1 is fine; after all this is merchant test cases.
       return 1;
 
-    if (NULL == (twisterexchanged = TALER_TESTING_run_twister
+    if (NULL == (twisterexchanged = TALER_TWISTER_run_twister
                                       (PROXY_EXCHANGE_CONFIG_FILE)))
       return 77;
 
-    if (NULL == (twistermerchantd = TALER_TESTING_run_twister
+    if (NULL == (twistermerchantd = TALER_TWISTER_run_twister
                                       (PROXY_MERCHANT_CONFIG_FILE)))
       return 77;