[GNUnet-SVN] [taler-merchant] branch master updated: Addressing #5366, the pay-gen side.

[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 b97d452  Addressing #5366, the pay-gen side.
b97d452 is described below

commit b97d452280eed24dc7035d4099ea785b21069d5d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 28 16:33:09 2018 +0200

    Addressing #5366, the pay-gen side.
---
 .../taler-merchant-generate-payments-alt.c         | 29 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/merchant-tools/taler-merchant-generate-payments-alt.c 
b/src/merchant-tools/taler-merchant-generate-payments-alt.c
index 4fd1545..ef884c5 100644
--- a/src/merchant-tools/taler-merchant-generate-payments-alt.c
+++ b/src/merchant-tools/taler-merchant-generate-payments-alt.c
@@ -114,6 +114,12 @@ static char *cfg_filename;
  */
 static char *bank_url;
 
+
+/**
+ * Alternative non default instance.
+ */
+static char *alt_instance;
+
 /**
  * Log file.
  */
@@ -169,9 +175,9 @@ static char *currency;
        {\"currency\":\"%s\",\
         \"value\":0,\
         \"fraction\":50000000},\
-       \"wire_transfer_delay\":\"\\/forever\\/\",\
-       \"refund_deadline\":\"\\/end of time\\/\",\
-       \"pay_deadline\":\"\\/end of time\\/\",\
+       \"wire_transfer_delay\":\"\\/Delay(30000)\\/\",\
+       \"refund_deadline\":\"\\/Date(22)\\/\",\
+       \"pay_deadline\":\"\\/Date(1)\\/\",\
        \"amount\":\
          {\"currency\":\"%s\",\
           \"value\":5,\
@@ -266,7 +272,7 @@ run (void *cls,
        is->ctx,
        MHD_HTTP_OK,
        order_worth_5_unaggregated,
-       NULL),
+       alt_instance),
 
     TALER_TESTING_cmd_pay
       ("deposit-unaggregated",
@@ -413,6 +419,15 @@ main (int argc,
        &merchant_url),
 
     GNUNET_GETOPT_option_string
+      ('i',
+       "alt-instance",
+       "AI",
+       "alternative (non default) instance,"
+       " used to provide fresh wire details to"
+       " make unaggregated transactions stay so.",
+       &alt_instance),
+
+    GNUNET_GETOPT_option_string
       ('b',
        "bank-url",
        "BU",
@@ -472,6 +487,12 @@ main (int argc,
   }
   GNUNET_CONFIGURATION_destroy (cfg);
 
+  if (NULL == alt_instance)
+  {
+    TALER_LOG_ERROR ("Option -i is mandatory!\n");
+    return MISSING_MERCHANT_URL;
+  }
+
   if (NULL == merchant_url)
   {
     TALER_LOG_ERROR ("Option -m is mandatory!\n");

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