[taler-merchant] branch master updated (2e062ed -> 47ab473)

[gnunet]

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

grothoff pushed a change to branch master
in repository merchant.

    from 2e062ed  fix a few more Date() problems
     new c984dde  more date() fixes
     new 47ab473  unit fixes for timestamp

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/lib/test_merchant_api_twisted.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/test_merchant_api_twisted.c 
b/src/lib/test_merchant_api_twisted.c
index 462c33d..d6277dc 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -577,9 +577,9 @@ run (void *cls,
           {\"currency\":\"EUR\",\
            \"value\":0,\
            \"fraction\":50000000},\
-        \"refund_deadline\":\"\\/Date(2)\\/\",\
-        \"pay_deadline\":\"\\/Date(1)\\/\",\
-        \"wire_transfer_deadline\":\"\\/Date(2366841600)\\/\",\
+        \"refund_deadline\":{\"t_ms\":2000},\
+        \"pay_deadline\":{\"t_ms\":1000},\
+        \"wire_transfer_deadline\":{\"t_ms\":2366841600000},\
         \"amount\":\
           {\"currency\":\"EUR\",\
            \"value\":5,\

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