From fc8bdb9b978334d52b80c318f9326394f855de2d Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Sun, 19 Jan 2020 17:03:19 +0100
Subject: consistently use payto URI instead of URL

---
 src/auditor/generate-auditor-basedb.conf |  4 ++--
 src/auditor/taler-wire-auditor.c         | 10 +++++-----
 src/auditor/test-auditor.conf            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/auditor')

diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index c5f7cede5..40e5d1320 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -79,7 +79,7 @@ CURRENCY = TESTKUDOS
 
 [account-1]
 WIRE_RESPONSE = ${TALER_DATA_HOME}/exchange/account-1.json
-url = payto://x-taler-bank/localhost/Exchange
+PAYTO_URI = payto://x-taler-bank/localhost/Exchange
 METHOD = x-taler-bank
 enable_debit = yes
 enable_credit = yes
@@ -89,7 +89,7 @@ USERNAME = Exchange
 PASSWORD = x
 
 [account-merchant]
-URL = payto://x-taler-bank/localhost/42
+PAYTO_URI = payto://x-taler-bank/localhost/42
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/account-3.json
 METHOD = x-taler-bank
 HONOR_default = YES
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index 8aeec8b11..73f1f9db9 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -1076,10 +1076,10 @@ wire_out_cb (void *cls,
     return GNUNET_OK;
   }
   {
-    char *payto_url;
+    char *payto_uri;
 
-    payto_url = TALER_JSON_wire_to_payto (wire);
-    if (0 != strcasecmp (payto_url,
+    payto_uri = TALER_JSON_wire_to_payto (wire);
+    if (0 != strcasecmp (payto_uri,
                          roi->details.credit_account_url))
     {
       /* Destination bank account is wrong in actual wire transfer, so
@@ -1112,10 +1112,10 @@ wire_out_cb (void *cls,
                     TALER_amount_add (&total_bad_amount_out_minus,
                                       &total_bad_amount_out_minus,
                                       amount));
-      GNUNET_free (payto_url);
+      GNUNET_free (payto_uri);
       goto cleanup;
     }
-    GNUNET_free (payto_url);
+    GNUNET_free (payto_uri);
   }
   if (0 != TALER_amount_cmp (&roi->details.amount,
                              amount))
diff --git a/src/auditor/test-auditor.conf b/src/auditor/test-auditor.conf
index 1eab83654..fa38bfa6f 100644
--- a/src/auditor/test-auditor.conf
+++ b/src/auditor/test-auditor.conf
@@ -4,7 +4,7 @@ TINY_AMOUNT = TESTKUDOS:0.01
 
 [account-1]
 WIRE_RESPONSE = ${TALER_DATA_HOME}/exchange/account-1.json
-url = payto://x-taler-bank/localhost/Exchange
+PAYTO_URI = payto://x-taler-bank/localhost/Exchange
 METHOD = x-taler-bank
 enable_debit = yes
 enable_credit = yes
-- 
cgit v1.2.3