diff options
| -rw-r--r-- | src/include/taler_testing_lib.h | 8 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_bank_admin_add_incoming.c | 6 | ||||
| -rw-r--r-- | src/lib/testing_api_trait_string.c | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 02fd929ce..3d9abae0e 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -867,8 +867,6 @@ TALER_TESTING_cmd_bank_debits (const char *label, * * @param label command label. * @param amount amount to transfer. - * @param bank_base_url base URL of the account that implements this - * wire transer (which account gives money). * @param auth authentication data to use * @param payto_credit_account which account receives money. * @param wtid wire transfer identifier to use @@ -2500,16 +2498,16 @@ enum TALER_TESTING_PaytoType /** - * Offer PAYTO url in a trait. + * Offer a payto uri in a trait. * * @param pt which url is to be picked, * in case multiple are offered. - * @param url the url to offer. + * @param payto_uri the uri to offer. * @return the trait. */ struct TALER_TESTING_Trait TALER_TESTING_make_trait_payto (enum TALER_TESTING_PaytoType pt, - const char *url); + const char *payto_uri); /** diff --git a/src/lib/testing_api_cmd_bank_admin_add_incoming.c b/src/lib/testing_api_cmd_bank_admin_add_incoming.c index ac92efb70..4dea3d4df 100644 --- a/src/lib/testing_api_cmd_bank_admin_add_incoming.c +++ b/src/lib/testing_api_cmd_bank_admin_add_incoming.c @@ -431,14 +431,13 @@ admin_add_incoming_traits (void *cls, */ static struct AdminAddIncomingState * make_fts (const char *amount, - const char *exchange_base_url, const struct TALER_BANK_AuthenticationData *auth, const char *payto_debit_account) { struct AdminAddIncomingState *fts; fts = GNUNET_new (struct AdminAddIncomingState); - fts->exchange_credit_url = exchange_base_url; + fts->exchange_credit_url = auth->wire_gateway_url; fts->payto_debit_account = payto_debit_account; fts->auth = *auth; if (GNUNET_OK != @@ -495,7 +494,6 @@ TALER_TESTING_cmd_admin_add_incoming (const char *label, { return make_command (label, make_fts (amount, - auth->wire_gateway_url, auth, payto_debit_account)); } @@ -526,7 +524,6 @@ TALER_TESTING_cmd_admin_add_incoming_with_ref struct AdminAddIncomingState *fts; fts = make_fts (amount, - auth->wire_gateway_url, auth, payto_debit_account); fts->reserve_reference = ref; @@ -566,7 +563,6 @@ TALER_TESTING_cmd_admin_add_incoming_with_instance struct AdminAddIncomingState *fts; fts = make_fts (amount, - auth->wire_gateway_url, auth, payto_debit_account); fts->instance = instance; diff --git a/src/lib/testing_api_trait_string.c b/src/lib/testing_api_trait_string.c index 80c9b4207..0c7a606ff 100644 --- a/src/lib/testing_api_trait_string.c +++ b/src/lib/testing_api_trait_string.c @@ -209,20 +209,20 @@ TALER_TESTING_get_trait_payto (const struct TALER_TESTING_Command *cmd, * * @param pt which reference is to be offered, * in case multiple are offered. - * @param payto the payto URL + * @param payto_uri the payto URI * @return the trait. */ struct TALER_TESTING_Trait TALER_TESTING_make_trait_payto (enum TALER_TESTING_PaytoType pt, - const char *payto) + const char *payto_uri) { struct TALER_TESTING_Trait ret = { .index = (unsigned int) pt, .trait_name = TALER_TESTING_TRAIT_PAYTO, - .ptr = (const void *) payto + .ptr = (const void *) payto_uri, }; - GNUNET_assert (0 == strncasecmp (payto, + GNUNET_assert (0 == strncasecmp (payto_uri, "payto://", strlen ("payto://"))); return ret; |