diff options
Diffstat (limited to 'src/testing/test_merchant_api_twisted.c')
| -rw-r--r-- | src/testing/test_merchant_api_twisted.c | 50 |
1 files changed, 16 insertions, 34 deletions
diff --git a/src/testing/test_merchant_api_twisted.c b/src/testing/test_merchant_api_twisted.c index 8f94ac17..baf025d3 100644 --- a/src/testing/test_merchant_api_twisted.c +++ b/src/testing/test_merchant_api_twisted.c @@ -222,15 +222,10 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_orders ("create-proposal-abort-1", twister_merchant_url, MHD_HTTP_OK, - "{\"max_fee\":\"EUR:0.5\",\ - \"order_id\":\"abort-one\",\ - \"refund_deadline\":{\"t_ms\":0},\ - \"pay_deadline\":{\"t_ms\":\"never\"},\ - \"fulfillment_url\": \"https://example.com/\",\ - \"amount\":\"EUR:3.0\",\ - \"summary\": \"merchant-lib testcase\",\ - \"products\": [ {\"description\":\"ice cream\",\ - \"value\":\"{EUR:3}\"} ] }"), + "abort-one", + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + "EUR:3.0"), /* Will only pay _half_ the supposed price, * so we'll then have the right to abort. */ TALER_TESTING_cmd_merchant_pay_order ("deposit-simple-for-abort", @@ -283,25 +278,17 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_orders ("create-proposal-double-spend", twister_merchant_url, MHD_HTTP_OK, - "{\"max_fee\":\"EUR:0.5\",\ - \"order_id\":\"DS-1\",\ - \"refund_deadline\":{\"t_ms\":0},\ - \"pay_deadline\":{\"t_ms\":\"never\"},\ - \"fulfillment_url\": \"https://example.com/\",\ - \"amount\":\"EUR:1.0\",\ - \"summary\": \"merchant-lib testcase\",\ - \"products\": [ {\"description\": \"will succeed\"}] }"), + "DS-1", + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + "EUR:1.0"), TALER_TESTING_cmd_merchant_post_orders ("create-proposal-double-spend-1", twister_merchant_url, MHD_HTTP_OK, - "{\"max_fee\":\"EUR:0.5\",\ - \"order_id\":\"DS-2\",\ - \"refund_deadline\":{\"t_ms\":0},\ - \"pay_deadline\":{\"t_ms\":\"never\"},\ - \"fulfillment_url\": \"https://example.com/\",\ - \"amount\":\"EUR:1.0\",\ - \"summary\": \"merchant-lib testcase\",\ - \"products\": [ {\"description\": \"will fail\"}] }"), + "DS-2", + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + "EUR:3.0"), TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-double-spend", "create-reserve-double-spend", @@ -367,15 +354,10 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_orders ("create-proposal-1", merchant_url, MHD_HTTP_OK, - "{\"max_fee\":\"EUR:0.5\",\ - \"order_id\":\"1\",\ - \"refund_deadline\": {\"t_ms\": 0},\ - \"pay_deadline\": {\"t_ms\": \"never\" },\ - \"amount\":\"EUR:5.0\",\ - \"summary\": \"merchant-lib testcase\",\ - \"fulfillment_url\": \"https://example.com/\",\ - \"products\": [ {\"description\":\"ice cream\",\ - \"value\":\"{EUR:5}\"} ] }"), + "1", + GNUNET_TIME_UNIT_ZERO_ABS, + GNUNET_TIME_UNIT_FOREVER_ABS, + "EUR:5.0"), TALER_TESTING_cmd_malform_response ("malform-exchange-reponse-1", PROXY_EXCHANGE_CONFIG_FILE), TALER_TESTING_cmd_merchant_pay_order ("deposit-simple", |