From 8a9826052a4cd26a96af741e670ebefdbcd88ae2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 2 Nov 2019 23:24:21 +0100 Subject: simplify structure --- src/lib/Makefile.am | 1 + src/lib/testing_api_cmd_pay.c | 282 +++-------------------------- src/lib/testing_api_cmd_pay_abort_refund.c | 255 ++++++++++++++++++++++++++ 3 files changed, 285 insertions(+), 253 deletions(-) create mode 100644 src/lib/testing_api_cmd_pay_abort_refund.c diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 3b1be0ee..5ceadfe4 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -45,6 +45,7 @@ libtalermerchanttesting_la_SOURCES = \ testing_api_cmd_check_payment.c \ testing_api_cmd_history.c \ testing_api_cmd_pay.c \ + testing_api_cmd_pay_abort_refund.c \ testing_api_cmd_proposal.c \ testing_api_cmd_refund_increase.c \ testing_api_cmd_refund_lookup.c \ diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c index 32c7b513..44f332ca 100644 --- a/src/lib/testing_api_cmd_pay.c +++ b/src/lib/testing_api_cmd_pay.c @@ -192,53 +192,6 @@ struct PayAbortState }; -/** - * State for a "pay abort refund" CMD. This command - * takes the refund permissions from a "pay abort" CMD, - * and redeems those at the exchange. - */ -struct PayAbortRefundState -{ - - /** - * "abort" CMD that will provide with refund permissions. - */ - const char *abort_reference; - - /** - * Expected number of coins that were refunded. - * Only used to counter-check, not to perform any - * operation. - */ - unsigned int num_coins; - - /** - * The amount to be "withdrawn" from the refund session. - */ - const char *refund_amount; - - /** - * The refund fee (charged to the merchant). - */ - const char *refund_fee; - - /** - * The interpreter state. - */ - struct TALER_TESTING_Interpreter *is; - - /** - * Handle to the refund operation. - */ - struct TALER_EXCHANGE_RefundHandle *rh; - - /** - * Expected HTTP response code. - */ - unsigned int http_status; -}; - - /** * Parse the @a coins specification and grow the @a pc * array with the coins found, updating @a npc. @@ -252,7 +205,6 @@ struct PayAbortRefundState * @param amount_without_fee to be removed, there is no * per-contract fee, only per-coin exists. * @param refund_fee per-contract? per-coin? - * * @return #GNUNET_OK on success */ static int @@ -335,22 +287,21 @@ build_coins (struct TALER_MERCHANT_PayCoin **pc, icoin->denom_value = *denom_value; icoin->amount_with_fee = *denom_value; } - GNUNET_assert (NULL != (dpk = TALER_TESTING_find_pk - (is->keys, &icoin->denom_value))); - - GNUNET_assert (GNUNET_SYSERR != TALER_amount_subtract - (&icoin->amount_without_fee, - &icoin->denom_value, - &dpk->fee_deposit)); - - GNUNET_assert - (GNUNET_OK == TALER_TESTING_get_trait_url - (coin_cmd, 0, &icoin->exchange_url)); - - GNUNET_assert - (GNUNET_OK == TALER_string_to_amount - (refund_fee, &icoin->refund_fee)); - + GNUNET_assert (NULL != (dpk = + TALER_TESTING_find_pk (is->keys, + &icoin->denom_value))); + + GNUNET_assert (GNUNET_SYSERR != + TALER_amount_subtract (&icoin->amount_without_fee, + &icoin->denom_value, + &dpk->fee_deposit)); + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_url (coin_cmd, + 0, + &icoin->exchange_url)); + GNUNET_assert (GNUNET_OK == + TALER_string_to_amount (refund_fee, + &icoin->refund_fee)); } return GNUNET_OK; @@ -377,7 +328,6 @@ pay_cb (void *cls, const json_t *obj) { struct PayState *ps = cls; - struct GNUNET_CRYPTO_EddsaSignature sig; const char *error_name; unsigned int error_line; @@ -420,17 +370,21 @@ pay_cb (void *cls, /* proposal reference was used at least once, at this point */ GNUNET_assert (NULL != - (proposal_cmd = TALER_TESTING_interpreter_lookup_command - (ps->is, ps->proposal_reference))); + (proposal_cmd = + TALER_TESTING_interpreter_lookup_command (ps->is, + ps->proposal_reference))); - if (GNUNET_OK != TALER_TESTING_get_trait_peer_key_pub - (proposal_cmd, 0, &merchant_pub)) + if (GNUNET_OK != + TALER_TESTING_get_trait_peer_key_pub (proposal_cmd, + 0, + &merchant_pub)) TALER_TESTING_FAIL (ps->is); - if (GNUNET_OK != GNUNET_CRYPTO_eddsa_verify ( - TALER_SIGNATURE_MERCHANT_PAYMENT_OK, - &mr.purpose, &sig, - merchant_pub)) + if (GNUNET_OK != + GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_PAYMENT_OK, + &mr.purpose, + &sig, + merchant_pub)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Merchant signature given in response to /pay" @@ -489,10 +443,8 @@ pay_abort_cb (void *cls, "Received %u refunds\n", num_refunds); pas->num_refunds = num_refunds; - - pas->res = GNUNET_new_array - (num_refunds, struct TALER_MERCHANT_RefundEntry); - + pas->res = GNUNET_new_array (num_refunds, + struct TALER_MERCHANT_RefundEntry); memcpy (pas->res, res, num_refunds * sizeof (struct TALER_MERCHANT_RefundEntry)); @@ -1113,7 +1065,6 @@ pay_again_run (void *cls, { struct PayAgainState *pas = cls; const struct TALER_TESTING_Command *pay_cmd; - const char *proposal_reference; const char *amount_with_fee; const char *amount_without_fee; @@ -1217,179 +1168,4 @@ TALER_TESTING_cmd_pay_again (const char *label, } -/** - * Callback used to work out the response from the exchange - * to a refund operation. Currently only checks if the response - * code is as expected. - * - * @param cls closure - * @param http_status HTTP response code, #MHD_HTTP_OK (200) for - * successful deposit; 0 if the exchange's reply is bogus - * (fails to follow the protocol) - * @param ec taler-specific error code, #TALER_EC_NONE on success - * @param sign_key exchange key used to sign @a obj, or NULL - * @param obj the received JSON reply, should be kept as proof - * (and, in particular, be forwarded to the customer) - */ -static void -abort_refund_cb (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_ExchangePublicKeyP *sign_key, - const json_t *obj) -{ - struct PayAbortRefundState *pars = cls; - - pars->rh = NULL; - if (pars->http_status != http_status) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u (%d) to command %s\n", - http_status, - ec, - TALER_TESTING_interpreter_get_current_label - (pars->is)); - TALER_TESTING_interpreter_fail (pars->is); - return; - } - TALER_TESTING_interpreter_next (pars->is); -} - - -/** - * Free the state of a "pay abort refund" CMD, and possibly - * cancel a pending operation. - * - * @param cls closure. - * @param cmd the command currently being freed. - */ -static void -pay_abort_refund_cleanup (void *cls, - const struct TALER_TESTING_Command *cmd) -{ - struct PayAbortRefundState *pars = cls; - - if (NULL != pars->rh) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Command `%s' did not complete.\n", - TALER_TESTING_interpreter_get_current_label ( - pars->is)); - TALER_EXCHANGE_refund_cancel (pars->rh); - } - GNUNET_free (pars); -} - - -/** - * Run a "pay abort refund" CMD. - * - * @param cls closure. - * @param cmd command currently being run. - * @param is interpreter state. - */ -static void -pay_abort_refund_run (void *cls, - const struct TALER_TESTING_Command *cmd, - struct TALER_TESTING_Interpreter *is) -{ - struct PayAbortRefundState *pars = cls; - struct TALER_Amount refund_fee; - struct TALER_Amount refund_amount; - const struct TALER_MERCHANT_RefundEntry *refund_entry; - const unsigned int *num_refunds; - const struct TALER_TESTING_Command *abort_cmd; - const struct GNUNET_CRYPTO_EddsaPublicKey *merchant_pub; - const struct GNUNET_HashCode *h_contract_terms; - - pars->is = is; - if (NULL == - (abort_cmd = TALER_TESTING_interpreter_lookup_command - (is, pars->abort_reference)) ) - TALER_TESTING_FAIL (is); - - if (GNUNET_OK != TALER_TESTING_get_trait_uint - (abort_cmd, 0, &num_refunds)) - TALER_TESTING_FAIL (is); - - if (pars->num_coins >= *num_refunds) - TALER_TESTING_FAIL (is); - - if (GNUNET_OK != TALER_TESTING_get_trait_h_contract_terms - (abort_cmd, 0, &h_contract_terms)) - TALER_TESTING_FAIL (is); - - if (GNUNET_OK != TALER_TESTING_get_trait_peer_key_pub - (abort_cmd, 0, &merchant_pub)) - TALER_TESTING_FAIL (is); - - if (GNUNET_OK != TALER_TESTING_get_trait_refund_entry - (abort_cmd, 0, &refund_entry)) - TALER_TESTING_FAIL (is); - - GNUNET_assert (GNUNET_OK == TALER_string_to_amount - (pars->refund_amount, &refund_amount)); - GNUNET_assert (GNUNET_OK == TALER_string_to_amount - (pars->refund_fee, &refund_fee)); - - pars->rh = TALER_EXCHANGE_refund2 - (is->exchange, - &refund_amount, - &refund_fee, - h_contract_terms, - &refund_entry->coin_pub, - refund_entry->rtransaction_id, - (const struct TALER_MerchantPublicKeyP *) merchant_pub, - &refund_entry->merchant_sig, - &abort_refund_cb, - pars); - - GNUNET_assert (NULL != pars->rh); -} - - -/** - * Make a "pay abort refund" CMD. This command uses the - * refund permission from a "pay abort" CMD, and redeems it - * at the exchange. - * - * @param label command label. - * @param abort_reference reference to the "pay abort" CMD that - * will offer the refund permission. - * @param num_coins how many coins are expected to be refunded. - * @param refund_amount the amount we are going to redeem as - * refund. - * @param refund_fee the refund fee (merchant pays it) - * @param http_status expected HTTP response code. - */ -struct TALER_TESTING_Command -TALER_TESTING_cmd_pay_abort_refund - (const char *label, - const char *abort_reference, - unsigned int num_coins, - const char *refund_amount, - const char *refund_fee, - unsigned int http_status) -{ - struct PayAbortRefundState *pars; - - pars = GNUNET_new (struct PayAbortRefundState); - pars->abort_reference = abort_reference; - pars->num_coins = num_coins; - pars->refund_amount = refund_amount; - pars->refund_fee = refund_fee; - pars->http_status = http_status; - { - struct TALER_TESTING_Command cmd = { - .cls = pars, - .label = label, - .run = &pay_abort_refund_run, - .cleanup = &pay_abort_refund_cleanup - }; - - return cmd; - } -} - - /* end of testing_api_cmd_pay.c */ diff --git a/src/lib/testing_api_cmd_pay_abort_refund.c b/src/lib/testing_api_cmd_pay_abort_refund.c new file mode 100644 index 00000000..7f44c01d --- /dev/null +++ b/src/lib/testing_api_cmd_pay_abort_refund.c @@ -0,0 +1,255 @@ +/* + This file is part of TALER + Copyright (C) 2014-2018 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3, or + (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ + +/** + * @file lib/testing_api_cmd_pay_abort_refund.c + * @brief command to test the pay-abort-refund feature. + * @author Marcello Stanisci + */ +#include "platform.h" +#include +#include +#include +#include "taler_merchant_service.h" +#include "taler_merchant_testing_lib.h" + + +/** + * State for a "pay abort refund" CMD. This command + * takes the refund permissions from a "pay abort" CMD, + * and redeems those at the exchange. + */ +struct PayAbortRefundState +{ + + /** + * "abort" CMD that will provide with refund permissions. + */ + const char *abort_reference; + + /** + * Expected number of coins that were refunded. + * Only used to counter-check, not to perform any + * operation. + */ + unsigned int num_coins; + + /** + * The amount to be "withdrawn" from the refund session. + */ + const char *refund_amount; + + /** + * The refund fee (charged to the merchant). + */ + const char *refund_fee; + + /** + * The interpreter state. + */ + struct TALER_TESTING_Interpreter *is; + + /** + * Handle to the refund operation. + */ + struct TALER_EXCHANGE_RefundHandle *rh; + + /** + * Expected HTTP response code. + */ + unsigned int http_status; +}; + + +/** + * Callback used to work out the response from the exchange + * to a refund operation. Currently only checks if the response + * code is as expected. + * + * @param cls closure + * @param http_status HTTP response code, #MHD_HTTP_OK (200) for + * successful deposit; 0 if the exchange's reply is bogus + * (fails to follow the protocol) + * @param ec taler-specific error code, #TALER_EC_NONE on success + * @param sign_key exchange key used to sign @a obj, or NULL + * @param obj the received JSON reply, should be kept as proof + * (and, in particular, be forwarded to the customer) + */ +static void +abort_refund_cb (void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_ExchangePublicKeyP *sign_key, + const json_t *obj) +{ + struct PayAbortRefundState *pars = cls; + + pars->rh = NULL; + if (pars->http_status != http_status) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected response code %u (%d) to command %s\n", + http_status, + ec, + TALER_TESTING_interpreter_get_current_label + (pars->is)); + TALER_TESTING_interpreter_fail (pars->is); + return; + } + TALER_TESTING_interpreter_next (pars->is); +} + + +/** + * Free the state of a "pay abort refund" CMD, and possibly + * cancel a pending operation. + * + * @param cls closure. + * @param cmd the command currently being freed. + */ +static void +pay_abort_refund_cleanup (void *cls, + const struct TALER_TESTING_Command *cmd) +{ + struct PayAbortRefundState *pars = cls; + + if (NULL != pars->rh) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Command `%s' did not complete.\n", + TALER_TESTING_interpreter_get_current_label ( + pars->is)); + TALER_EXCHANGE_refund_cancel (pars->rh); + } + GNUNET_free (pars); +} + + +/** + * Run a "pay abort refund" CMD. + * + * @param cls closure. + * @param cmd command currently being run. + * @param is interpreter state. + */ +static void +pay_abort_refund_run (void *cls, + const struct TALER_TESTING_Command *cmd, + struct TALER_TESTING_Interpreter *is) +{ + struct PayAbortRefundState *pars = cls; + struct TALER_Amount refund_fee; + struct TALER_Amount refund_amount; + const struct TALER_MERCHANT_RefundEntry *refund_entry; + const unsigned int *num_refunds; + const struct TALER_TESTING_Command *abort_cmd; + const struct GNUNET_CRYPTO_EddsaPublicKey *merchant_pub; + const struct GNUNET_HashCode *h_contract_terms; + + pars->is = is; + if (NULL == + (abort_cmd = + TALER_TESTING_interpreter_lookup_command (is, + pars->abort_reference)) ) + TALER_TESTING_FAIL (is); + if (GNUNET_OK != + TALER_TESTING_get_trait_uint (abort_cmd, + 0, + &num_refunds)) + TALER_TESTING_FAIL (is); + if (pars->num_coins >= *num_refunds) + TALER_TESTING_FAIL (is); + if (GNUNET_OK != + TALER_TESTING_get_trait_h_contract_terms (abort_cmd, + 0, + &h_contract_terms)) + TALER_TESTING_FAIL (is); + if (GNUNET_OK != + TALER_TESTING_get_trait_peer_key_pub (abort_cmd, + 0, + &merchant_pub)) + TALER_TESTING_FAIL (is); + if (GNUNET_OK != + TALER_TESTING_get_trait_refund_entry (abort_cmd, + 0, + &refund_entry)) + TALER_TESTING_FAIL (is); + GNUNET_assert (GNUNET_OK == + TALER_string_to_amount (pars->refund_amount, + &refund_amount)); + GNUNET_assert (GNUNET_OK == + TALER_string_to_amount (pars->refund_fee, + &refund_fee)); + pars->rh = TALER_EXCHANGE_refund2 + (is->exchange, + &refund_amount, + &refund_fee, + h_contract_terms, + &refund_entry->coin_pub, + refund_entry->rtransaction_id, + (const struct TALER_MerchantPublicKeyP *) merchant_pub, + &refund_entry->merchant_sig, + &abort_refund_cb, + pars); + GNUNET_assert (NULL != pars->rh); +} + + +/** + * Make a "pay abort refund" CMD. This command uses the + * refund permission from a "pay abort" CMD, and redeems it + * at the exchange. + * + * @param label command label. + * @param abort_reference reference to the "pay abort" CMD that + * will offer the refund permission. + * @param num_coins how many coins are expected to be refunded. + * @param refund_amount the amount we are going to redeem as + * refund. + * @param refund_fee the refund fee (merchant pays it) + * @param http_status expected HTTP response code. + */ +struct TALER_TESTING_Command +TALER_TESTING_cmd_pay_abort_refund + (const char *label, + const char *abort_reference, + unsigned int num_coins, + const char *refund_amount, + const char *refund_fee, + unsigned int http_status) +{ + struct PayAbortRefundState *pars; + + pars = GNUNET_new (struct PayAbortRefundState); + pars->abort_reference = abort_reference; + pars->num_coins = num_coins; + pars->refund_amount = refund_amount; + pars->refund_fee = refund_fee; + pars->http_status = http_status; + { + struct TALER_TESTING_Command cmd = { + .cls = pars, + .label = label, + .run = &pay_abort_refund_run, + .cleanup = &pay_abort_refund_cleanup + }; + + return cmd; + } +} -- cgit v1.2.3