rename

4 files changed, 73 insertions, 75 deletions

diff --git a/src/backend/taler-merchant-httpd_track-transfer.c b/src/backend/taler-merchant-httpd_track-transfer.c
index d647daee..03a377cf 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -470,24 +470,24 @@ check_transfer (void *cls,
     /* Build the `TrackTransferConflictDetails` */
     rctx->response
       = TALER_MHD_make_json_pack (
-      "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
-      "code",
-      (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
-      "hint",
-      "disagreement about deposit valuation",
-      "exchange_deposit_proof", exchange_proof,
-      "conflict_offset",
-      (json_int_t) rctx->current_offset,
-      "exchange_transfer_proof",
-      rctx->original_response,
-      "coin_pub", GNUNET_JSON_from_data_auto (
-        coin_pub),
-      "h_contract_terms",
-      GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
-      "amount_with_fee", TALER_JSON_from_amount (
-        amount_with_fee),
-      "deposit_fee", TALER_JSON_from_amount (
-        deposit_fee));
+          "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
+          "code",
+          (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
+          "hint",
+          "disagreement about deposit valuation",
+          "exchange_deposit_proof", exchange_proof,
+          "conflict_offset",
+          (json_int_t) rctx->current_offset,
+          "exchange_transfer_proof",
+          rctx->original_response,
+          "coin_pub", GNUNET_JSON_from_data_auto (
+            coin_pub),
+          "h_contract_terms",
+          GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
+          "amount_with_fee", TALER_JSON_from_amount (
+            amount_with_fee),
+          "deposit_fee", TALER_JSON_from_amount (
+            deposit_fee));
     return;
   }
   rctx->check_transfer_result = GNUNET_OK;
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 50e17cf6..d4720325 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -142,10 +142,10 @@ static struct GNUNET_CONTAINER_MultiHashMap *interned_strings;
  */
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_transfer (label, amount, \
-		              payer_url, \
-			      &auth, \
-			      exchange_payto, \
-		              &wtid, \
+                              payer_url, \
+                              &auth, \
+                              exchange_payto, \
+                              &wtid, \
                               EXCHANGE_URL)
 
 /**
@@ -246,8 +246,7 @@ run (void *cls,
      * Make a reserve exist,
      * according to the previous
      * transfer.
-     */
-    CMD_EXEC_WIREWATCH ("wirewatch-1"),
+     */CMD_EXEC_WIREWATCH ("wirewatch-1"),
     TALER_TESTING_cmd_check_bank_transfer
       ("check_bank_transfer-2",
       EXCHANGE_URL,
@@ -429,12 +428,12 @@ run (void *cls,
       "check_bank_transfer-498c"),
     TALER_TESTING_cmd_transfer
       ("create-reserve-2",
-       "EUR:1",
-       payer_url,
-       &auth,
-       exchange_payto,
-       &wtid,
-       EXCHANGE_URL),
+      "EUR:1",
+      payer_url,
+      &auth,
+      exchange_payto,
+      &wtid,
+      EXCHANGE_URL),
     TALER_TESTING_cmd_admin_add_incoming_with_ref
       ("create-reserve-2b",
       "EUR:4.01",
@@ -667,7 +666,7 @@ run (void *cls,
 
     TALER_TESTING_cmd_check_bank_transfer
       ("check_bank_transfer-tip-1",
-       EXCHANGE_URL,
+      EXCHANGE_URL,
       "EUR:20.04",
       payer_payto,
       exchange_payto),
@@ -1082,19 +1081,19 @@ main (int argc,
   GNUNET_assert
     (GNUNET_SYSERR != GNUNET_asprintf (&payer_url,
                                        "%s%s",
-	                               USER_ACCOUNT_PATH));
+                                       USER_ACCOUNT_PATH));
   GNUNET_assert
     (GNUNET_SYSERR != GNUNET_asprintf (&exchange_account_url,
-				       "%s%s",
-				       fakebank_url,
+                                       "%s%s",
+                                       fakebank_url,
                                        EXCHANGE_ACCOUNT_PATH));
 
-  payer_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-		                                        USER_ACCOUNT_PATH);
-  exchange_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-		                                        EXCHANGE_ACCOUNT_PATH);
-  merchant_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-		                                        MERCHANT_ACCOUNT_PATH);
+  payer_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                             USER_ACCOUNT_PATH);
+  exchange_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                                EXCHANGE_ACCOUNT_PATH);
+  merchant_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                                MERCHANT_ACCOUNT_PATH);
   if (NULL ==
       (merchant_url = TALER_TESTING_prepare_merchant (CONFIG_FILE)))
     return 77;
@@ -1102,7 +1101,7 @@ main (int argc,
   TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
-			                  &ec))
+                                          &ec))
   {
   case GNUNET_SYSERR:
     GNUNET_break (0);
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
index eb2706f9..0e5120ec 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -169,7 +169,6 @@ static struct TALER_TESTING_ExchangeConfiguration ec;
   TALER_TESTING_cmd_exec_aggregator (label, CONFIG_FILE)
 
 
-
 /**
  * Run wire transfer of funds from some user's account to the
  * exchange.
@@ -181,9 +180,9 @@ static struct TALER_TESTING_ExchangeConfiguration ec;
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_transfer (label, amount, \
                               payer_url, \
-		              &auth, \
-		              exchange_payto, \
-			      &wtid, \
+                              &auth, \
+                              exchange_payto, \
+                              &wtid, \
                               EXCHANGE_URL)
 
 /**
@@ -1073,16 +1072,16 @@ main (int argc,
     return 77;
 
 
-  exchange_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-		                                        EXCHANGE_ACCOUNT_PATH);
-  payer_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-                                                     USER_ACCOUNT_PATH);
-  merchant_payto = TALER_TESTING_make_xtalerbank_payto (fakebank_url,
-                                                        MERCHANT_ACCOUNT_PATH);
+  exchange_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                                EXCHANGE_ACCOUNT_PATH);
+  payer_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                             USER_ACCOUNT_PATH);
+  merchant_payto = TALER_payto_xtalerbank_make (fakebank_url,
+                                                MERCHANT_ACCOUNT_PATH);
   GNUNET_asprintf (&payer_url,
-		  "%s%s",
-		  fakebank_url,
-		  USER_ACCOUNT_PATH);
+                   "%s%s",
+                   fakebank_url,
+                   USER_ACCOUNT_PATH);
 
   if (NULL == (merchant_url = TALER_TESTING_prepare_merchant
                                 (CONFIG_FILE)))
@@ -1104,7 +1103,7 @@ main (int argc,
   TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
-			                  &ec))
+                                          &ec))
   {
   case GNUNET_SYSERR:
     GNUNET_break (0);
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c
index d9c6dcc4..c278e4ae 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -335,12 +335,12 @@ run (void *cls,
 
     TALER_TESTING_cmd_transfer
       ("create-reserve-1",
-       CURRENCY_10_02,
-       PAYER_URL, // bank base URL + path to the payer account.
-       &auth,
-       exchange_payto,
-       &wtid,
-       EXCHANGE_URL),
+      CURRENCY_10_02,
+      PAYER_URL,  // bank base URL + path to the payer account.
+      &auth,
+      exchange_payto,
+      &wtid,
+      EXCHANGE_URL),
 
     TALER_TESTING_cmd_exec_wirewatch
       ("wirewatch-1",
@@ -429,12 +429,12 @@ run (void *cls,
 
     TALER_TESTING_cmd_transfer
       ("create-reserve-1",
-       CURRENCY_5_01,
-       PAYER_URL,
-       &auth,
-       exchange_payto,
-       &wtid,
-       EXCHANGE_URL),
+      CURRENCY_5_01,
+      PAYER_URL,
+      &auth,
+      exchange_payto,
+      &wtid,
+      EXCHANGE_URL),
 
     TALER_TESTING_cmd_exec_wirewatch
       ("wirewatch-1",
@@ -469,12 +469,12 @@ run (void *cls,
 
     TALER_TESTING_cmd_transfer
       ("create-reserve-2",
-       CURRENCY_10_02,
-       PAYER_URL,
-       &auth,
-       exchange_payto,
-       &wtid,
-       EXCHANGE_URL),
+      CURRENCY_10_02,
+      PAYER_URL,
+      &auth,
+      exchange_payto,
+      &wtid,
+      EXCHANGE_URL),
 
     TALER_TESTING_cmd_exec_wirewatch
       ("wirewatch-2",
@@ -800,8 +800,8 @@ main (int argc,
   /**
    * FIXME: Need to retrieve the bank base URL!
    */
-  exchange_payto = TALER_TESTING_make_xtalerbank_payto ("FIXME-BANK-HOSTNAME:PORT",
-		                                        "/2");
+  exchange_payto = TALER_payto_xtalerbank_make ("FIXME-BANK-HOSTNAME:PORT",
+                                                "/2");
 
   result = TALER_TESTING_setup_with_exchange
              (run,