[GNUnet-SVN] [taler-merchant] branch master updated: Conditional compilation of twisted-chunk.

[gnunet]

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

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new ec0c992  Conditional compilation of twisted-chunk.
ec0c992 is described below

commit ec0c992568f518249aa21c04a650e1785b90994e
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 28 13:23:34 2018 +0200

    Conditional compilation of twisted-chunk.
---
 configure.ac                           | 16 +++++-----------
 src/backend/taler-merchant-httpd_pay.c |  2 +-
 src/lib/test_merchant_api_new.c        |  5 ++++-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d57949..6e29710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,17 +233,11 @@ AS_CASE([$with_twister],
         [LDFLAGS="-L$with_twister/lib $LDFLAGS"
          CPPFLAGS="-I$with_twister/include $CPPFLAGS"])
 
-# This tries to include the twister even though
-# no --with-twister option was given.  Shall it
-# be included only if the user explicitly gave
-# such option?
-AC_CHECK_LIB(talertwistertesting,TALER_TESTING_run_twister,
-  [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1],,
-                   [#ifdef HAVE_GNUNET_PLATFORM_H
-                      #include <gnunet/platform.h>
-                    #endif
-                    ])]
-  ,,[-ltalerexchange -ltalerbank])
+AC_CHECK_HEADERS([taler/taler_twister_testing_lib.h],
+ [AC_CHECK_LIB([talertwistertesting], [TALER_TESTING_run_twister], 
twistertesting=1)],
+   [], [#ifdef HAVE_GNUNET_PLATFORM_H
+        #include <gnunet/platform.h>
+       #endif])
 AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1)
 
 # gcov compilation
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index bd9cb76..6b0a64a 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -1455,10 +1455,10 @@ parse_pay (struct MHD_Connection *connection,
 
     /* Use the value from config as default.  */
     used_wire_transfer_delay = wire_transfer_delay;
+
     if (NULL != json_object_get (pc->contract_terms,
                                  "wire_transfer_delay"))
     {
-
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Frontend specified wire transfer delay\n");
       
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 9912b19..898106f 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -342,6 +342,7 @@ run (void *cls,
    */
   struct TALER_TESTING_Command unaggregation[] = {
 
+  #if HAVE_TALER_TALER_TWISTER_TESTING_LIB_H
     CMD_TRANSFER_TO_EXCHANGE
       ("create-reserve-unaggregation",
        "EUR:5.01"),
@@ -374,7 +375,7 @@ run (void *cls,
            \"fraction\":50000000},\
         \"refund_deadline\":\"\\/Date(2)\\/\",\
         \"pay_deadline\":\"\\/Date(1)\\/\",\
-        \"wire_transfer_delay\":\"\\/Delay(3)\\/\",\
+        \"wire_transfer_delay\":\"\\/Delay(30000)\\/\",\
         \"amount\":\
           {\"currency\":\"EUR\",\
            \"value\":5,\
@@ -402,6 +403,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty
       ("check_bank_unaggregated"),
 
+    #endif /* end of, HAVE_TWISTER */
+
     TALER_TESTING_cmd_end ()
   };
 

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