diff options
Diffstat (limited to 'src/testing/test_merchant_api.c')
| -rw-r--r-- | src/testing/test_merchant_api.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index ea68a3eb..9892732d 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -232,8 +232,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "4", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_merchant_get_order ("get-order-4", merchant_url, @@ -304,8 +304,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "1", /* order ID */ - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, "EUR:5.0", "x-taler-bank", @@ -316,8 +316,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "1", /* order ID */ - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, "EUR:5.0", "x-taler-bank", @@ -328,8 +328,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "1x", /* order ID */ - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, "EUR:5.0", "x-taler-bank", @@ -355,8 +355,8 @@ run (void *cls, merchant_url, MHD_HTTP_CONFLICT, "1", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_poll_orders_conclude ("poll-orders-1-conclude", MHD_HTTP_OK, @@ -584,7 +584,7 @@ run (void *cls, 5, 0, json_object (), - GNUNET_TIME_relative_to_absolute ( + GNUNET_TIME_relative_to_timestamp ( GNUNET_TIME_UNIT_MINUTES), MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_lock_product ("lock-product-p3", @@ -597,8 +597,8 @@ run (void *cls, merchant_url, MHD_HTTP_NOT_FOUND, "order-p3", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, /* claim token */ "EUR:5.0", "unsupported-wire-method", @@ -609,8 +609,8 @@ run (void *cls, merchant_url, MHD_HTTP_NOT_FOUND, "order-p3", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, "EUR:5.0", "x-taler-bank", @@ -622,8 +622,8 @@ run (void *cls, merchant_url, MHD_HTTP_GONE, "order-p3", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, true, "EUR:5.0", "x-taler-bank", @@ -634,8 +634,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "order-p3", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, false, "EUR:5.0", "x-taler-bank", @@ -650,8 +650,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, NULL, - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_check_bank_empty ("check_bank_empty-2"), TALER_TESTING_cmd_end () @@ -662,8 +662,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "2", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_merchant_claim_order ("fetch-proposal-2", merchant_url, @@ -717,8 +717,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "1r", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_wallet_poll_order_start ("poll-order-wallet-refund-1-low", merchant_url, @@ -819,8 +819,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "1-unpaid", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), /* Try to increase an unpaid proposal. */ TALER_TESTING_cmd_merchant_order_refund ("refund-increase-unpaid-proposal", @@ -862,8 +862,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "unincreased-proposal", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:5.0"), TALER_TESTING_cmd_merchant_pay_order ("pay-unincreased-proposal", merchant_url, @@ -1182,8 +1182,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "10", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:10.0"), TALER_TESTING_cmd_merchant_pay_order ("pay-fail-partial-double-10", merchant_url, @@ -1236,8 +1236,8 @@ run (void *cls, merchant_url, MHD_HTTP_OK, "11", - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_TIME_UNIT_ZERO_TS, + GNUNET_TIME_UNIT_FOREVER_TS, "EUR:10.0"), TALER_TESTING_cmd_merchant_pay_order ("pay-fail-partial-double-11-good", merchant_url, @@ -1540,7 +1540,7 @@ run (void *cls, json_pack ("{s:s}", "street", "pstreet"), - GNUNET_TIME_relative_to_absolute ( + GNUNET_TIME_relative_to_timestamp ( GNUNET_TIME_UNIT_MINUTES), MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_get_product ("get-product-p2", @@ -1567,7 +1567,7 @@ run (void *cls, json_pack ("{s:s}", "street", "pstreet"), - GNUNET_TIME_relative_to_absolute ( + GNUNET_TIME_relative_to_timestamp ( GNUNET_TIME_UNIT_MINUTES), MHD_HTTP_NOT_FOUND), TALER_TESTING_cmd_merchant_delete_product ("get-products-empty", |