From 2e062eda18a8f096976c0dd81c8208c88061c214 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 24 Dec 2019 23:36:00 +0100 Subject: fix a few more Date() problems --- src/lib/test_merchant_api.c | 20 +++++++++---------- src/lib/test_merchant_api_twisted.c | 40 ++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index ec94287e..10471ce5 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -527,8 +527,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"1-unpaid\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -591,8 +591,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"unincreased-proposal\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -801,8 +801,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"1-tip\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -876,8 +876,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"10\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":10,\ @@ -955,8 +955,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"11\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":10,\ diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c index 25bd5705..462c33de 100644 --- a/src/lib/test_merchant_api_twisted.c +++ b/src/lib/test_merchant_api_twisted.c @@ -241,8 +241,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"5719TRIGGER\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -286,8 +286,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"fail-check-payment-1\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -387,8 +387,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"1\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -413,8 +413,8 @@ run (void *cls, \"fraction\":50000000},\ \"fulfillment_url\": \"https://example.com/\",\ \"order_id\":\"2\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -469,8 +469,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"5\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"amount\":\ {\"currency\":\"EUR\",\ \"value\":5,\ @@ -639,8 +639,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"5383\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -729,8 +729,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"11\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -842,8 +842,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"abort-one\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -928,8 +928,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"DS-1\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ @@ -947,8 +947,8 @@ run (void *cls, \"value\":0,\ \"fraction\":50000000},\ \"order_id\":\"DS-2\",\ - \"refund_deadline\":\"\\/Date(0)\\/\",\ - \"pay_deadline\":\"\\/Date(99999999999)\\/\",\ + \"refund_deadline\":{\"t_ms\":0},\ + \"pay_deadline\":{\"t_ms\":99999999999},\ \"fulfillment_url\": \"https://example.com/\",\ \"amount\":\ {\"currency\":\"EUR\",\ -- cgit v1.2.3