remove more redundant args

8 files changed, 4 insertions, 17 deletions

diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index 7e1af6e9a..4181534d7 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -1439,7 +1439,6 @@ process_debits (void *cls)
               wa->section_name);
   GNUNET_assert (NULL == wa->dhh);
   wa->dhh = TALER_BANK_debit_history (ctx,
-                                      wa->auth.wire_gateway_url,
                                       &wa->auth,
                                       wa->out_wire_off,
                                       INT64_MAX,
@@ -1848,7 +1847,6 @@ process_credits (void *cls)
               "Starting bank CREDIT history of account `%s'\n",
               wa->section_name);
   wa->chh = TALER_BANK_credit_history (ctx,
-                                       wa->auth.wire_gateway_url,
                                        &wa->auth,
                                        wa->in_wire_off,
                                        INT64_MAX,
diff --git a/src/bank-lib/bank_api_credit.c b/src/bank-lib/bank_api_credit.c
index 95e91d7db..8803ac9b2 100644
--- a/src/bank-lib/bank_api_credit.c
+++ b/src/bank-lib/bank_api_credit.c
@@ -218,7 +218,6 @@ handle_history_finished (void *cls,
  * Request the credit history of the exchange's bank account.
  *
  * @param ctx curl context for the event loop
- * @param bank_base_url URL of the base INCLUDING account number
  * @param auth authentication data to use
  * @param start_row from which row on do we want to get results,
  *        use UINT64_MAX for the latest; exclusive
@@ -235,7 +234,6 @@ handle_history_finished (void *cls,
  */
 struct TALER_BANK_CreditHistoryHandle *
 TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
-                           const char *bank_base_url,
                            const struct TALER_BANK_AuthenticationData *auth,
                            uint64_t start_row,
                            int64_t num_results,
@@ -267,7 +265,7 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
   hh = GNUNET_new (struct TALER_BANK_CreditHistoryHandle);
   hh->hcb = hres_cb;
   hh->hcb_cls = hres_cb_cls;
-  hh->request_url = TALER_url_join (bank_base_url,
+  hh->request_url = TALER_url_join (auth->wire_gateway_url,
                                     url,
                                     NULL);
   GNUNET_free (url);
@@ -277,7 +275,7 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
     GNUNET_break (0);
     return NULL;
   }
-  hh->bank_base_url = GNUNET_strdup (bank_base_url);
+  hh->bank_base_url = GNUNET_strdup (auth->wire_gateway_url);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Requesting history at `%s'\n",
               hh->request_url);
diff --git a/src/bank-lib/bank_api_debit.c b/src/bank-lib/bank_api_debit.c
index 652dde8d5..0e218eb48 100644
--- a/src/bank-lib/bank_api_debit.c
+++ b/src/bank-lib/bank_api_debit.c
@@ -215,7 +215,6 @@ handle_history_finished (void *cls,
  * Request the debit history of the exchange's bank account.
  *
  * @param ctx curl context for the event loop
- * @param account_base_url URL of the base INCLUDING account number
  * @param auth authentication data to use
  * @param start_row from which row on do we want to get results,
  *        use UINT64_MAX for the latest; exclusive
@@ -232,7 +231,6 @@ handle_history_finished (void *cls,
  */
 struct TALER_BANK_DebitHistoryHandle *
 TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
-                          const char *account_base_url,
                           const struct TALER_BANK_AuthenticationData *auth,
                           uint64_t start_row,
                           int64_t num_results,
@@ -264,7 +262,7 @@ TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
   hh = GNUNET_new (struct TALER_BANK_DebitHistoryHandle);
   hh->hcb = hres_cb;
   hh->hcb_cls = hres_cb_cls;
-  hh->request_url = TALER_url_join (account_base_url,
+  hh->request_url = TALER_url_join (auth->wire_gateway_url,
                                     url,
                                     NULL);
   GNUNET_free (url);
diff --git a/src/exchange-tools/taler-wire.c b/src/exchange-tools/taler-wire.c
index cdfdb1428..3251aad41 100644
--- a/src/exchange-tools/taler-wire.c
+++ b/src/exchange-tools/taler-wire.c
@@ -232,7 +232,6 @@ static void
 execute_history ()
 {
   hh = TALER_BANK_credit_history (ctx,
-                                  destination_account_url,
                                   &auth,
                                   start_row,
                                   -10,
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index bc73e1d2b..01097482c 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -524,7 +524,6 @@ find_transfers (void *cls)
               wa_pos->auth.wire_gateway_url);
 
   hh = TALER_BANK_credit_history (ctx,
-                                  wa_pos->auth.wire_gateway_url,
                                   &wa_pos->auth,
                                   last_row_off,
                                   batch_size,
diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h
index 8efc1a79b..1f91a389d 100644
--- a/src/include/taler_bank_service.h
+++ b/src/include/taler_bank_service.h
@@ -165,7 +165,7 @@ TALER_BANK_admin_add_incoming_cancel (struct
 /**
  * Prepare for exeuction of a wire transfer.
  *
- * @param destination_account_url payto:// URL identifying where to send the money
+ * @param destination_account_uri payto:// URL identifying where to send the money
  * @param amount amount to transfer, already rounded
  * @param exchange_base_url base URL of this exchange (included in subject
  *        to facilitate use of tracking API by merchant backend)
@@ -315,7 +315,6 @@ typedef int
  * Request the wire credit history of an exchange's bank account.
  *
  * @param ctx curl context for the event loop
- * @param account_base_url URL of the base INCLUDING account number
  * @param auth authentication data to use
  * @param start_row from which row on do we want to get results, use UINT64_MAX for the latest; exclusive
  * @param num_results how many results do we want; negative numbers to go into the past,
@@ -329,7 +328,6 @@ typedef int
  */
 struct TALER_BANK_CreditHistoryHandle *
 TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
-                           const char *account_base_url,
                            const struct TALER_BANK_AuthenticationData *auth,
                            uint64_t start_row,
                            int64_t num_results,
@@ -442,7 +440,6 @@ typedef int
  */
 struct TALER_BANK_DebitHistoryHandle *
 TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
-                          const char *bank_base_url,
                           const struct TALER_BANK_AuthenticationData *auth,
                           uint64_t start_row,
                           int64_t num_results,
diff --git a/src/lib/testing_api_cmd_bank_history_credit.c b/src/lib/testing_api_cmd_bank_history_credit.c
index 85a67f9d7..41a1f0b80 100644
--- a/src/lib/testing_api_cmd_bank_history_credit.c
+++ b/src/lib/testing_api_cmd_bank_history_credit.c
@@ -523,7 +523,6 @@ history_run (void *cls,
   hs->total = build_history (is,
                              &hs->h);
   hs->hh = TALER_BANK_credit_history (is->ctx,
-                                      hs->account_url,
                                       &hs->auth,
                                       row_id,
                                       hs->num_results,
diff --git a/src/lib/testing_api_cmd_bank_history_debit.c b/src/lib/testing_api_cmd_bank_history_debit.c
index 671c79d33..d6cbbab21 100644
--- a/src/lib/testing_api_cmd_bank_history_debit.c
+++ b/src/lib/testing_api_cmd_bank_history_debit.c
@@ -523,7 +523,6 @@ history_run (void *cls,
   }
   hs->total = build_history (is, &hs->h);
   hs->hh = TALER_BANK_debit_history (is->ctx,
-                                     hs->account_url,
                                      &hs->auth,
                                      row_id,
                                      hs->num_results,