From db669ee495a29384c6d592cb1080db58e832a649 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jan 2020 23:49:37 +0100 Subject: payback -> recoup stranglers --- src/lib/test_exchange_api.c | 108 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'src/lib/test_exchange_api.c') diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c index d7db2ef9c..67aeebccd 100644 --- a/src/lib/test_exchange_api.c +++ b/src/lib/test_exchange_api.c @@ -553,58 +553,58 @@ run (void *cls, TALER_TESTING_cmd_end () }; - struct TALER_TESTING_Command payback[] = { + struct TALER_TESTING_Command recoup[] = { /** * Fill reserve with EUR:5.01, as withdraw fee is 1 ct per * config. */ - CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-1", + CMD_TRANSFER_TO_EXCHANGE ("recoup-create-reserve-1", "EUR:5.01"), - TALER_TESTING_cmd_check_bank_admin_transfer ("payback-create-reserve-1", + TALER_TESTING_cmd_check_bank_admin_transfer ("recoup-create-reserve-1", "EUR:5.01", bc.user42_payto, bc.exchange_payto, - "payback-create-reserve-1"), + "recoup-create-reserve-1"), /** * Run wire-watch to trigger the reserve creation. */ CMD_EXEC_WIREWATCH ("wirewatch-4"), /* Withdraw a 5 EUR coin, at fee of 1 ct */ - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-1", - "payback-create-reserve-1", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-1", + "recoup-create-reserve-1", "EUR:5", MHD_HTTP_OK), /* Make coin invalid */ TALER_TESTING_cmd_revoke ("revoke-0-EUR:5", MHD_HTTP_OK, - "payback-withdraw-coin-1", + "recoup-withdraw-coin-1", CONFIG_FILE), /* Refund coin to bank account */ - TALER_TESTING_cmd_payback ("payback-1", - MHD_HTTP_OK, - "payback-withdraw-coin-1", - "EUR:5", - NULL), + TALER_TESTING_cmd_recoup ("recoup-1", + MHD_HTTP_OK, + "recoup-withdraw-coin-1", + "EUR:5", + NULL), /* Check the money is back with the reserve */ - TALER_TESTING_cmd_status ("payback-reserve-status-1", - "payback-create-reserve-1", + TALER_TESTING_cmd_status ("recoup-reserve-status-1", + "recoup-create-reserve-1", "EUR:5.0", MHD_HTTP_OK), /* Re-withdraw from this reserve */ - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2", - "payback-create-reserve-1", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-2", + "recoup-create-reserve-1", "EUR:1", MHD_HTTP_OK), /** - * This withdrawal will test the logic to create a "payback" + * This withdrawal will test the logic to create a "recoup" * element to insert into the reserve's history. */ - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2-over", - "payback-create-reserve-1", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-2-over", + "recoup-create-reserve-1", "EUR:10", MHD_HTTP_CONFLICT), - TALER_TESTING_cmd_status ("payback-reserve-status-2", - "payback-create-reserve-1", + TALER_TESTING_cmd_status ("recoup-reserve-status-2", + "recoup-create-reserve-1", "EUR:3.99", MHD_HTTP_OK), @@ -642,27 +642,27 @@ run (void *cls, * then have the rest paid back. Check deposit of other coin * fails. Do not use EUR:5 here as the EUR:5 coin was * revoked and we did not bother to create a new one... */// - CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2", + CMD_TRANSFER_TO_EXCHANGE ("recoup-create-reserve-2", "EUR:2.02"), - TALER_TESTING_cmd_check_bank_admin_transfer ("ck-payback-create-reserve-2", + TALER_TESTING_cmd_check_bank_admin_transfer ("ck-recoup-create-reserve-2", "EUR:2.02", bc.user42_payto, bc.exchange_payto, - "payback-create-reserve-2"), + "recoup-create-reserve-2"), /* Make previous command effective. */ CMD_EXEC_WIREWATCH ("wirewatch-5"), /* Withdraw a 1 EUR coin, at fee of 1 ct */ - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2a", - "payback-create-reserve-2", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-2a", + "recoup-create-reserve-2", "EUR:1", MHD_HTTP_OK), /* Withdraw a 1 EUR coin, at fee of 1 ct */ - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2b", - "payback-create-reserve-2", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-2b", + "recoup-create-reserve-2", "EUR:1", MHD_HTTP_OK), - TALER_TESTING_cmd_deposit ("payback-deposit-partial", - "payback-withdraw-coin-2a", + TALER_TESTING_cmd_deposit ("recoup-deposit-partial", + "recoup-withdraw-coin-2a", 0, bc.user42_payto, "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}", @@ -671,32 +671,32 @@ run (void *cls, MHD_HTTP_OK), TALER_TESTING_cmd_revoke ("revoke-1-EUR:1", MHD_HTTP_OK, - "payback-withdraw-coin-2a", + "recoup-withdraw-coin-2a", CONFIG_FILE), - TALER_TESTING_cmd_payback ("payback-2", - MHD_HTTP_OK, - "payback-withdraw-coin-2a", - "EUR:0.5", - NULL), - TALER_TESTING_cmd_payback ("payback-2b", - MHD_HTTP_CONFLICT, - "payback-withdraw-coin-2a", - "EUR:0.5", - NULL), - TALER_TESTING_cmd_deposit ("payback-deposit-revoked", - "payback-withdraw-coin-2b", + TALER_TESTING_cmd_recoup ("recoup-2", + MHD_HTTP_OK, + "recoup-withdraw-coin-2a", + "EUR:0.5", + NULL), + TALER_TESTING_cmd_recoup ("recoup-2b", + MHD_HTTP_CONFLICT, + "recoup-withdraw-coin-2a", + "EUR:0.5", + NULL), + TALER_TESTING_cmd_deposit ("recoup-deposit-revoked", + "recoup-withdraw-coin-2b", 0, bc.user42_payto, "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}", GNUNET_TIME_UNIT_ZERO, "EUR:1", MHD_HTTP_NOT_FOUND), - /* Test deposit fails after payback, with proof in payback */ + /* Test deposit fails after recoup, with proof in recoup */ /* Note that, the exchange will never return the coin's transaction - * history with payback data, as we get a 404 on the DK! */ - TALER_TESTING_cmd_deposit ("payback-deposit-partial-after-payback", - "payback-withdraw-coin-2a", + * history with recoup data, as we get a 404 on the DK! */ + TALER_TESTING_cmd_deposit ("recoup-deposit-partial-after-recoup", + "recoup-withdraw-coin-2a", 0, bc.user42_payto, "{\"items\":[{\"name\":\"extra ice cream\",\"value\":1}]}", @@ -704,17 +704,17 @@ run (void *cls, "EUR:0.5", MHD_HTTP_NOT_FOUND), /* Test that revoked coins cannot be withdrawn */ - CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-3", + CMD_TRANSFER_TO_EXCHANGE ("recoup-create-reserve-3", "EUR:1.01"), TALER_TESTING_cmd_check_bank_admin_transfer ( - "check-payback-create-reserve-3", + "check-recoup-create-reserve-3", "EUR:1.01", bc.user42_payto, bc.exchange_payto, - "payback-create-reserve-3"), + "recoup-create-reserve-3"), CMD_EXEC_WIREWATCH ("wirewatch-6"), - TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-3-revoked", - "payback-create-reserve-3", + TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-3-revoked", + "recoup-create-reserve-3", "EUR:1", MHD_HTTP_NOT_FOUND), /* check that we are empty before the rejection test */ @@ -767,8 +767,8 @@ run (void *cls, unaggregation), TALER_TESTING_cmd_batch ("refund", refund), - TALER_TESTING_cmd_batch ("payback", - payback), + TALER_TESTING_cmd_batch ("recoup", + recoup), TALER_TESTING_cmd_batch ("reserve-open-close", reserve_open_close), /* End the suite. */ -- cgit v1.2.3