gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant] branch master updated (467b2f8 -> 8b102ee)


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant] branch master updated (467b2f8 -> 8b102ee)
Date: Sun, 05 Mar 2017 18:18:30 +0100

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

grothoff pushed a change to branch master
in repository merchant.

    from 467b2f8  fix memory leaks (struct MerchantInstance not cleaned up 
properly)
     new b613bac  fix misc memory leaks
     new 8b102ee  adjust test to consider new wire transfer fee

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/taler-merchant-httpd.c          |  6 +-
 src/backend/taler-merchant-httpd_history.c  | 38 +++++++----
 src/backend/taler-merchant-httpd_pay.c      | 97 ++++++++++++++++-------------
 src/backend/taler-merchant-httpd_proposal.c | 19 +++---
 src/lib/test_merchant_api.c                 | 56 ++++++++++-------
 5 files changed, 124 insertions(+), 92 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 759719e..f13b891 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -254,6 +254,7 @@ hashmap_free (void *cls,
   struct MerchantInstance *mi = value;
 
   json_decref (mi->j_wire);
+  GNUNET_free (mi->id);
   GNUNET_free (mi->keyfile);
   GNUNET_free (mi);
   return GNUNET_YES;
@@ -501,11 +502,6 @@ instances_iterator_cb (void *cls,
                                       &mi->pubkey.eddsa_pub);
   GNUNET_free (pk);
 
-  /**
-   * FIXME: 'token' must NOT be freed, as it is handled by the
-   * gnunet_configuration facility. OTOH mi->id does need to be freed,
-   * because it is a duplicate.
-   */
   mi->id = GNUNET_strdup (token + 1);
   if (0 == strcmp ("default", mi->id))
     iic->default_instance = GNUNET_YES;
diff --git a/src/backend/taler-merchant-httpd_history.c 
b/src/backend/taler-merchant-httpd_history.c
index 73aab87..2e530e9 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -78,11 +78,11 @@ pd_cb (void *cls,
                 current,
                 start,
                 delta);
-    GNUNET_break (NULL != (entry = json_pack ("{s:s, s:O, s:s, s:s}",
+    GNUNET_break (NULL != (entry = json_pack ("{s:s, s:O, s:O, s:O}",
                                               "order_id", order_id,
                                               "amount", amount,
-                                              "timestamp", json_string_value 
(timestamp),
-                                              "instance", json_string_value 
(instance))));
+                                              "timestamp", timestamp,
+                                              "instance", instance)));
 
     GNUNET_break (0 == json_array_append_new (response,
                                               entry));
@@ -128,17 +128,22 @@ MH_handler_history (struct TMH_RequestHandler *rh,
   if (NULL != str)
   {
     if (1 != sscanf (str, "%llu", &seconds))
-    return TMH_RESPONSE_reply_arg_invalid (connection,
-                                          TALER_EC_PARAMETER_MALFORMED,
-                                           "date");
+    {
+      json_decref (response);
+      return TMH_RESPONSE_reply_arg_invalid (connection,
+                                             TALER_EC_PARAMETER_MALFORMED,
+                                             "date");
+    }
   }
 
   date.abs_value_us = seconds * 1000LL * 1000LL;
   if (date.abs_value_us / 1000LL / 1000LL != seconds)
+  {
+    json_decref (response);
     return TMH_RESPONSE_reply_bad_request (connection,
                                            TALER_EC_HISTORY_TIMESTAMP_OVERFLOW,
                                            "Timestamp overflowed");
-
+  }
 
 
   mi = TMH_lookup_instance ("default");
@@ -149,10 +154,12 @@ MH_handler_history (struct TMH_RequestHandler *rh,
     mi = TMH_lookup_instance (str);
 
   if (NULL == mi)
+  {
+    json_decref (response);
     return TMH_RESPONSE_reply_not_found (connection,
                                          TALER_EC_HISTORY_INSTANCE_UNKNOWN,
                                          "instance");
-
+  }
   start = 0;
   delta = 20;
 
@@ -163,9 +170,12 @@ MH_handler_history (struct TMH_RequestHandler *rh,
   {
     if ((1 != sscanf (str, "%d", &start)) ||
         start < 0)
+    {
+      json_decref (response);
       return TMH_RESPONSE_reply_arg_invalid (connection,
                                              TALER_EC_PARAMETER_MALFORMED,
                                              "start");
+    }
   }
 
   str = MHD_lookup_connection_value (connection,
@@ -191,17 +201,21 @@ MH_handler_history (struct TMH_RequestHandler *rh,
                                         response);
   current = 0;
   if (GNUNET_SYSERR == ret)
+  {
+    json_decref (response);
     return TMH_RESPONSE_reply_internal_error (connection,
                                              TALER_EC_HISTORY_DB_FETCH_ERROR,
                                              "db error to get history");
-
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "history data: %s\n",
               json_dumps (response, JSON_INDENT (1)));
 
-  return TMH_RESPONSE_reply_json (connection,
-                                  response,
-                                  MHD_HTTP_OK);
+  ret = TMH_RESPONSE_reply_json (connection,
+                                 response,
+                                 MHD_HTTP_OK);
+  json_decref (response);
+  return ret;
 }
 
 /* end of taler-merchant-httpd_history.c */
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index 2d86a12..91860ca 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -347,10 +347,11 @@ sign_success_response (struct PayContext *pc)
                             &mr.purpose,
                            &sig);
 
-  return TMH_RESPONSE_make_json_pack ("{s:O, s:s, s:o}",
-                                      "proposal_data", pc->proposal_data,
+  return TMH_RESPONSE_make_json_pack ("{s:O, s:o, s:o}",
+                                      "proposal_data",
+                                      pc->proposal_data,
                                       "sig",
-                                      json_string_value 
(GNUNET_JSON_from_data_auto (&sig)),
+                                      GNUNET_JSON_from_data_auto (&sig),
                                       "h_proposal_data",
                                       GNUNET_JSON_from_data 
(&pc->h_proposal_data,
                                                              sizeof (struct 
GNUNET_HashCode)));
@@ -451,9 +452,9 @@ deposit_cb (void *cls,
 
   if (0 != pc->pending)
     return; /* still more to do */
-
-
-  resume_pay_with_response (pc, MHD_HTTP_OK, sign_success_response (pc));
+  resume_pay_with_response (pc,
+                            MHD_HTTP_OK,
+                            sign_success_response (pc));
 }
 
 
@@ -914,7 +915,9 @@ transaction_double_check (void *cls,
  * @return #GNUNET_YES on success
  */
 static int
-parse_pay (struct MHD_Connection *connection, json_t *root, struct PayContext 
*pc)
+parse_pay (struct MHD_Connection *connection,
+           const json_t *root,
+           struct PayContext *pc)
 {
   json_t *coins;
   json_t *coin;
@@ -940,19 +943,17 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     GNUNET_break (0);
     return res;
   }
-
   res = db->find_proposal_data (db->cls,
                                 &pc->proposal_data,
                                 order_id,
                                 &merchant_pub);
-
-
   if (GNUNET_OK != res)
   {
-
-    if (MHD_YES != TMH_RESPONSE_reply_not_found (connection,
-                                                 
TALER_EC_PAY_DB_STORE_PAY_ERROR,
-                                                 "Proposal not found"))
+    GNUNET_JSON_parse_free (spec);
+    if (MHD_YES !=
+        TMH_RESPONSE_reply_not_found (connection,
+                                      TALER_EC_PAY_DB_STORE_PAY_ERROR,
+                                      "Proposal not found"))
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -960,12 +961,15 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     return GNUNET_NO;
   }
 
-
-  if (GNUNET_OK != TALER_JSON_hash (pc->proposal_data, &pc->h_proposal_data))
+  if (GNUNET_OK !=
+      TALER_JSON_hash (pc->proposal_data,
+                       &pc->h_proposal_data))
   {
-    if (MHD_YES != TMH_RESPONSE_reply_internal_error (connection,
-                                                      TALER_EC_NONE,
-                                                      "Can not hash proposal"))
+    GNUNET_JSON_parse_free (spec);
+    if (MHD_YES !=
+        TMH_RESPONSE_reply_internal_error (connection,
+                                           TALER_EC_NONE,
+                                           "Can not hash proposal"))
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -973,15 +977,18 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     return GNUNET_NO;
   }
 
-
-  merchant = json_object_get (pc->proposal_data, "merchant");
+  merchant = json_object_get (pc->proposal_data,
+                              "merchant");
   if (NULL == merchant)
   {
-    // invalid contract:
+    GNUNET_JSON_parse_free (spec);
+    /* invalid contract */
     GNUNET_break (0);
-    if (MHD_YES != TMH_RESPONSE_reply_internal_error (connection,
-                                                      TALER_EC_NONE,
-                                                      "No merchant field in 
contract"))
+    // FIXME: define proper EC for this!
+    if (MHD_YES !=
+        TMH_RESPONSE_reply_internal_error (connection,
+                                           TALER_EC_NONE,
+                                           "No merchant field in contract"))
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;
@@ -994,6 +1001,7 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Not able to find the specified instance\n");
+    GNUNET_JSON_parse_free (spec);
     if (MHD_NO == TMH_RESPONSE_reply_not_found (connection,
                                                 TALER_EC_PAY_INSTANCE_UNKNOWN,
                                                 "Unknown instance given"))
@@ -1013,8 +1021,6 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Parsed JSON for /pay.\n");
 
-
-
   {
     struct GNUNET_JSON_Specification espec[] = {
       GNUNET_JSON_spec_absolute_time ("refund_deadline",
@@ -1040,7 +1046,9 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
 
-    pc->wire_transfer_deadline = GNUNET_TIME_absolute_add (pc->timestamp, 
wire_transfer_delay);
+    pc->wire_transfer_deadline
+      = GNUNET_TIME_absolute_add (pc->timestamp,
+                                  wire_transfer_delay);
 
     if (pc->wire_transfer_deadline.abs_value_us < 
pc->refund_deadline.abs_value_us)
     {
@@ -1052,7 +1060,8 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     }
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "parsed timestamps\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "parsed timestamps\n");
 
 
   pc->coins_cnt = json_array_size (coins);
@@ -1086,7 +1095,6 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     if (GNUNET_YES != res)
     {
       GNUNET_JSON_parse_free (spec);
-      json_decref (root);
       GNUNET_break (0);
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
@@ -1106,12 +1114,10 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
     dc->pc = pc;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "parsed coins\n");
-
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "parsed coins\n");
   pc->pending = pc->coins_cnt;
-
   GNUNET_JSON_parse_free (spec);
-
   return GNUNET_OK;
 }
 
@@ -1121,14 +1127,16 @@ parse_pay (struct MHD_Connection *connection, json_t 
*root, struct PayContext *p
  */
 static int
 handler_pay_json (struct MHD_Connection *connection,
-                  json_t *root,
+                  const json_t *root,
                   struct PayContext *pc)
 {
   int ret;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "about to parse '/pay' body\n");
-
-  ret = parse_pay (connection, root, pc);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "about to parse '/pay' body\n");
+  ret = parse_pay (connection,
+                   root,
+                   pc);
   if (GNUNET_OK != ret)
     return ret;
 
@@ -1229,7 +1237,7 @@ handler_pay_json (struct MHD_Connection *connection,
                                         &pc->mi->pubkey,
                                          &transaction_double_check,
                                          NULL))
-    GNUNET_break (0);                                         
+    GNUNET_break (0);
   }
 
   MHD_suspend_connection (connection);
@@ -1301,11 +1309,8 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
     res = MHD_queue_response (connection,
                              pc->response_code,
                              pc->response);
-    if (NULL != pc->response)
-    {
-      MHD_destroy_response (pc->response);
-      pc->response = NULL;
-    }
+    MHD_destroy_response (pc->response);
+    pc->response = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Queueing response (%u) for /pay (%s).\n",
                (unsigned int) pc->response_code,
@@ -1332,7 +1337,9 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
   if ((GNUNET_NO == res) || (NULL == root))
     return MHD_YES; /* the POST's body has to be further fetched */
 
-  res = handler_pay_json (connection, root, pc);
+  res = handler_pay_json (connection,
+                          root,
+                          pc);
   json_decref (root);
   if (GNUNET_SYSERR == res)
     return MHD_NO;
diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index ac71653..09b221e 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -127,8 +127,9 @@ get_instance (struct json_t *json);
  * @param order to process
  * @return MHD result code
  */
-int
-proposal_put (struct MHD_Connection *connection, json_t *order)
+static int
+proposal_put (struct MHD_Connection *connection,
+              json_t *order)
 {
   int res;
   struct MerchantInstance *mi;
@@ -171,7 +172,7 @@ proposal_put (struct MHD_Connection *connection, json_t 
*order)
 
     off = strftime (buf, sizeof (buf), "%H:%M:%S", tm_info);
     snprintf (buf + off, sizeof (buf) - off,
-              "-%llX", 
+              "-%llX",
               (long long unsigned) GNUNET_CRYPTO_random_u64 
(GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX));
     json_object_set (order, "order_id", json_string (buf));
   }
@@ -210,7 +211,7 @@ proposal_put (struct MHD_Connection *connection, json_t 
*order)
                                              TALER_EC_NONE,
                                              "Impossible to parse the order");
   }
-    
+
 
   /* check contract is well-formed */
   if (GNUNET_OK != check_products (products))
@@ -225,7 +226,7 @@ proposal_put (struct MHD_Connection *connection, json_t 
*order)
   if (NULL == mi)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Not able to find the specified instance\n"); 
+                "Not able to find the specified instance\n");
     return TMH_RESPONSE_reply_not_found (connection,
                                         TALER_EC_CONTRACT_INSTANCE_UNKNOWN,
                                         "Unknown instance given");
@@ -272,7 +273,7 @@ proposal_put (struct MHD_Connection *connection, json_t 
*order)
                                               TALER_EC_PROPOSAL_STORE_DB_ERROR,
                                               "db error: could not store this 
proposal's data into db");
   }
-  
+
 
   res = TMH_RESPONSE_reply_json_pack (connection,
                                       MHD_HTTP_OK,
@@ -396,7 +397,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
                                 order_id,
                                 &mi->pubkey);
   if (GNUNET_NO == res)
-    return TMH_RESPONSE_reply_not_found (connection, 
+    return TMH_RESPONSE_reply_not_found (connection,
                                          TALER_EC_PROPOSAL_LOOKUP_NOT_FOUND,
                                          "unknown transaction id");
 
@@ -405,10 +406,10 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
                                               
TALER_EC_PROPOSAL_LOOKUP_DB_ERROR,
                                               "An error occurred while 
retrieving proposal data from db");
 
-  
+
   return TMH_RESPONSE_reply_json (connection,
                                   proposal_data,
-                                  MHD_HTTP_OK); 
+                                  MHD_HTTP_OK);
 
 
 }
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 1ce4cea..ac8a24b 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -565,6 +565,11 @@ struct Command
       char *expected_transfer_ref;
 
       /**
+       * Wire fee we expect to pay for this transaction.
+       */
+      const char *wire_fee;
+
+      /**
        * Handle to a /track/transaction operation
        */
       struct TALER_MERCHANT_TrackTransactionHandle *tth;
@@ -1315,7 +1320,7 @@ proposal_lookup_cb (void *cls,
 {
   struct InterpreterState *is = cls;
   struct Command *cmd = &is->commands[is->ip];
-  
+
   cmd->details.proposal_lookup.plo = NULL;
 
   if (cmd->expected_response_code != http_status)
@@ -1363,6 +1368,7 @@ track_transaction_cb (void *cls,
     {
       const struct Command *ref;
       struct TALER_Amount ea;
+      struct TALER_Amount wire_fee;
       struct TALER_Amount coin_contribution;
 
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1401,9 +1407,16 @@ track_transaction_cb (void *cls,
                      TALER_string_to_amount 
(ref->details.check_bank_transfer.amount,
                                              &ea));
       GNUNET_assert (GNUNET_OK ==
+                     TALER_string_to_amount 
(cmd->details.track_transaction.wire_fee,
+                                             &wire_fee));
+      GNUNET_assert (GNUNET_OK ==
                      TALER_amount_subtract (&coin_contribution,
                                             
&transfers[0].coins[0].amount_with_fee,
                                             
&transfers[0].coins[0].deposit_fee));
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_amount_subtract (&coin_contribution,
+                                            &coin_contribution,
+                                            &wire_fee));
       if (0 !=
           TALER_amount_cmp (&ea,
                             &coin_contribution))
@@ -1524,7 +1537,7 @@ interpreter_run (void *cls)
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Switching instance: '%s'\n",
                   instance);
-  
+
       is->task = GNUNET_SCHEDULER_add_now (interpreter_run,
                                            is);
       return;
@@ -1532,11 +1545,11 @@ interpreter_run (void *cls)
     case OC_PROPOSAL_LOOKUP:
     {
       const char *order_id;
-  
+
       GNUNET_assert (NULL != cmd->details.proposal_lookup.proposal_reference);
       ref = find_command (is, cmd->details.proposal_lookup.proposal_reference);
       GNUNET_assert (NULL != ref);
-  
+
       order_id =
         json_string_value (json_object_get 
(ref->details.proposal.proposal_data,
                                             "order_id"));
@@ -1549,7 +1562,7 @@ interpreter_run (void *cls)
                                                          proposal_lookup_cb,
                                                          is)));
     }
-  
+
     return;
 
   case OC_ADMIN_ADD_INCOMING:
@@ -2373,7 +2386,7 @@ run (void *cls)
 
     /* Proposal lookup */
     {
-      .oc = OC_PROPOSAL_LOOKUP, 
+      .oc = OC_PROPOSAL_LOOKUP,
       .label = "fetch-proposal-2",
       .expected_response_code = MHD_HTTP_OK,
       .details.proposal_lookup.proposal_reference = "create-proposal-2" },
@@ -2389,8 +2402,8 @@ run (void *cls)
 
     /* Obtain WTID of the transfer */
     { .oc = OC_CHECK_BANK_TRANSFER,
-      .label = "check_bank_transfer-499c",
-      .details.check_bank_transfer.amount = "EUR:4.99",
+      .label = "check_bank_transfer-498c",
+      .details.check_bank_transfer.amount = "EUR:4.98",
       .details.check_bank_transfer.account_debit = 2, /* exchange-outgoing */
       .details.check_bank_transfer.account_credit = 62 /* merchant */
     },
@@ -2402,21 +2415,22 @@ run (void *cls)
     { .oc = OC_TRACK_TRANSACTION,
       .label = "track-transaction-1",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transaction.expected_transfer_ref = 
"check_bank_transfer-499c",
-      .details.track_transaction.pay_ref = "deposit-simple"  
+      .details.track_transaction.expected_transfer_ref = 
"check_bank_transfer-498c",
+      .details.track_transaction.pay_ref = "deposit-simple",
+      .details.track_transaction.wire_fee = "EUR:0.01",
     },
 
     /* Trace the WTID back to the original transaction */
     { .oc = OC_TRACK_TRANSFER,
       .label = "track-transfer-1",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transfer.check_bank_ref = "check_bank_transfer-499c",
+      .details.track_transfer.check_bank_ref = "check_bank_transfer-498c",
       .details.track_transfer.expected_pay_ref = "deposit-simple"
     },
     { .oc = OC_TRACK_TRANSFER,
       .label = "track-transfer-1-again",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transfer.check_bank_ref = "check_bank_transfer-499c",
+      .details.track_transfer.check_bank_ref = "check_bank_transfer-498c",
       .details.track_transfer.expected_pay_ref = "deposit-simple"
     },
 
@@ -2435,8 +2449,8 @@ run (void *cls)
 
     /* Obtain WTID of the transfer */
     { .oc = OC_CHECK_BANK_TRANSFER,
-      .label = "check_bank_transfer-499c-2",
-      .details.check_bank_transfer.amount = "EUR:4.99",
+      .label = "check_bank_transfer-498c-2",
+      .details.check_bank_transfer.amount = "EUR:4.98",
       .details.check_bank_transfer.account_debit = 2, /* exchange-outgoing */
       .details.check_bank_transfer.account_credit = 62 /* merchant */
     },
@@ -2449,21 +2463,22 @@ run (void *cls)
     { .oc = OC_TRACK_TRANSFER,
       .label = "track-transfer-2",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transfer.check_bank_ref = "check_bank_transfer-499c-2",
+      .details.track_transfer.check_bank_ref = "check_bank_transfer-498c-2",
       .details.track_transfer.expected_pay_ref = "deposit-simple-2"
     },
     { .oc = OC_TRACK_TRANSFER,
       .label = "track-transfer-2-again",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transfer.check_bank_ref = "check_bank_transfer-499c-2",
+      .details.track_transfer.check_bank_ref = "check_bank_transfer-498c-2",
       .details.track_transfer.expected_pay_ref = "deposit-simple-2"
     },
 
     { .oc = OC_TRACK_TRANSACTION,
       .label = "track-transaction-2",
       .expected_response_code = MHD_HTTP_OK,
-      .details.track_transaction.expected_transfer_ref = 
"check_bank_transfer-499c-2",
-      .details.track_transaction.pay_ref = "deposit-simple-2"  
+      .details.track_transaction.expected_transfer_ref = 
"check_bank_transfer-498c-2",
+      .details.track_transaction.wire_fee = "EUR:0.01",
+      .details.track_transaction.pay_ref = "deposit-simple-2"
     },
 
     { .oc = OC_HISTORY,
@@ -2477,7 +2492,7 @@ run (void *cls)
       .label = "history-2",
       .expected_response_code = MHD_HTTP_OK,
       /*no records to be returned, as limit is in the future*/
-      .details.history.date.abs_value_us = 43 * 1000LL * 1000LL, 
+      .details.history.date.abs_value_us = 43 * 1000LL * 1000LL,
       .details.history.nresult = 0
     },
 
@@ -2636,8 +2651,7 @@ main (int argc,
   merchantd = GNUNET_OS_start_process (GNUNET_NO,
                                        GNUNET_OS_INHERIT_STD_ALL,
                                        NULL, NULL, NULL,
-                                       "valgrind",
-                                       "valgrind",
+                                       "taler-merchant-httpd",
                                        "taler-merchant-httpd",
                                        "-c", "test_merchant_api.conf",
                                        "-L", "DEBUG",

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]