[GNUnet-SVN] [taler-merchant] branch master updated (4b47e46 -> 50583b7)

[gnunet]

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

dold pushed a change to branch master
in repository merchant.

    from 4b47e46  subtract refund after checking for fee coverage
     new c908949  gitignore
     new 50583b7  wrap array in JSON object

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:
 .gitignore                                 | 1 +
 src/backend/taler-merchant-httpd_history.c | 7 ++++---
 src/lib/testing_api_cmd_history.c          | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 936fed3..3662173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ INSTALL
 GPATH
 GRTAGS
 GTAGS
+tags
 *.swp
 src/backend/taler-merchant-httpd
 src/merchant-tools/taler-merchant-dbinit
diff --git a/src/backend/taler-merchant-httpd_history.c 
b/src/backend/taler-merchant-httpd_history.c
index 73236cb..c9674e8 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -291,9 +291,10 @@ MH_handler_history (struct TMH_RequestHandler *rh,
                                              TALER_EC_HISTORY_DB_FETCH_ERROR,
                                              "db error to get history");
   }
-  ret = TMH_RESPONSE_reply_json (connection,
-                                 response,
-                                 MHD_HTTP_OK);
+  ret = TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_OK,
+                                      "{ s:o }",
+                                      "history",
+                                      response);
   LOG_INFO ("/history, http code: %d\n",
             MHD_HTTP_OK);
   json_decref (response);
diff --git a/src/lib/testing_api_cmd_history.c 
b/src/lib/testing_api_cmd_history.c
index 68c1e25..c979268 100644
--- a/src/lib/testing_api_cmd_history.c
+++ b/src/lib/testing_api_cmd_history.c
@@ -164,10 +164,10 @@ history_cb (void *cls,
   unsigned int nresult;
   struct GNUNET_TIME_Absolute last_timestamp;
   struct GNUNET_TIME_Absolute entry_timestamp;
+  json_t *arr;
 
   hs->ho = NULL;
 
-
   if (hs->http_status != http_status)
       TALER_TESTING_FAIL (hs->is);
 
@@ -179,7 +179,8 @@ history_cb (void *cls,
     return;
   }
 
-  nresult = json_array_size (json);
+  arr = json_object_get (json, "history");
+  nresult = json_array_size (arr);
   if (hs->nresult != nresult)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -196,7 +197,7 @@ history_cb (void *cls,
   {
     json_t *entry;
     size_t index;
-    json_array_foreach (json, index, entry)
+    json_array_foreach (arr, index, entry)
     {
       json_t *timestamp;
 

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