use url instead of uri consistently

6 files changed, 20 insertions, 20 deletions

diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate
index 8af08280f..248faa0bc 100755
--- a/src/exchange/taler-config-generate
+++ b/src/exchange/taler-config-generate
@@ -12,7 +12,7 @@
 # -m, --merchant (generate configuration for the merchant)
 # -t, --trusted (generate configuration for exchange and merchant, with exchange set as trusted with merchant)
 # -w WIREFORMAT, --wire=WIREFORMAT (which wire plugin should we use)
-# --bank-uri=URI (only for WIREFORMAT='test')
+# --bank-url=URL (only for WIREFORMAT='test')
 # --exchange-bank-account=NUMBER (only for WIREFORMAT='test')
 # --merchant-bank-account=NUMBER (only for WIREFORMAT='test')
 
@@ -27,13 +27,13 @@ ARG_JM=
 ARG_M=0
 ARG_T=0
 ARG_W=test
-ARG_BANK_URI=
+ARG_BANK_URL=
 ARG_EXCHANGE_BANK_ACCOUNT=
 ARG_MERCHANT_BANK_ACCOUNT=
 
 ##################################
 # read the options
-TEMP=`getopt -o c:C:ef:hj:J:mtw: --long config:,currency:,exchange,wirefee:,help,wire-json-exchange:,wire-json-merchant:,merchant,trusted,wire:,bank-uri:,exchange-bank-account:,merchant-bank-account: -n 'taler-config-generate' -- "$@"`
+TEMP=`getopt -o c:C:ef:hj:J:mtw: --long config:,currency:,exchange,wirefee:,help,wire-json-exchange:,wire-json-merchant:,merchant,trusted,wire:,bank-url:,exchange-bank-account:,merchant-bank-account: -n 'taler-config-generate' -- "$@"`
 eval set -- "$TEMP"
 
 ####################################################
@@ -70,8 +70,8 @@ while true ; do
         -w|--wire)
             ARG_W="$2"
             shift 2 ;;
-        --bank-uri)
-            ARG_BANK_URI="$2"
+        --bank-url)
+            ARG_BANK_URL="$2"
             shift 2 ;;
         --exchange-bank-account)
             ARG_EXCHANGE_BANK_ACCOUNT="$2"
@@ -111,19 +111,19 @@ fi
 # Assemble JSON description of wireformat for "test" if we can
 if (test "test" = "$ARG_W")
 then
-  if (test ! -z "$ARG_BANK_URI" -a ! -z "$ARG_MERCHANT_BANK_ACCOUNT")
+  if (test ! -z "$ARG_BANK_URL" -a ! -z "$ARG_MERCHANT_BANK_ACCOUNT")
   then
-    ARG_JM="{\"type\":\"test\",\"bank_uri\":\"$ARG_BANK_URI\",\"account_number\":$ARG_MERCHANT_BANK_ACCOUNT}"
+    ARG_JM="{\"type\":\"test\",\"bank_url\":\"$ARG_BANK_URL\",\"account_number\":$ARG_MERCHANT_BANK_ACCOUNT}"
 #    echo "Account detail: $ARG_JM"
   else
-    echo "Bank URI or account not given, skipping JSON generation for merchant"
+    echo "Bank URL or account not given, skipping JSON generation for merchant"
   fi
-  if (test ! -z "$ARG_BANK_URI" -a ! -z "$ARG_EXCHANGE_BANK_ACCOUNT")
+  if (test ! -z "$ARG_BANK_URL" -a ! -z "$ARG_EXCHANGE_BANK_ACCOUNT")
   then
-    ARG_JE="{\"type\":\"test\",\"bank_uri\":\"$ARG_BANK_URI\",\"account_number\":$ARG_EXCHANGE_BANK_ACCOUNT}"
+    ARG_JE="{\"type\":\"test\",\"bank_url\":\"$ARG_BANK_URL\",\"account_number\":$ARG_EXCHANGE_BANK_ACCOUNT}"
 #    echo "Account detail: $ARG_JE"
   else
-    echo "Bank URI or account not given, skipping JSON generation for exchange"
+    echo "Bank URL or account not given, skipping JSON generation for exchange"
   fi
 else
   echo "Wire format is not 'test', not auto-generating JSON"
@@ -185,9 +185,9 @@ then
     $CS -s exchange-wire-$WMETHOD -o ENABLE -V YES || exit 1
 
 # If possible, initialize outgoing wire account details ('test' method only)
-    if (test "test" = "$WMETHOD" -a ! -z "$ARG_BANK_URI")
+    if (test "test" = "$WMETHOD" -a ! -z "$ARG_BANK_URL")
     then
-      $CS -s exchange-wire-test -o BANK_URI -V "$ARG_BANK_URI" || exit 1
+      $CS -s exchange-wire-test -o BANK_URL -V "$ARG_BANK_URL" || exit 1
     else
       echo "Skipped generating wire account details for exchange"
     fi
@@ -236,7 +236,7 @@ then
   if (test 1 = "$ARG_E")
   then
     EPORT=`$CS -s exchange -o PORT`
-    $CS -s merchant-exchange-test -o URI -V "http://localhost:$EPORT/" || exit
+    $CS -s merchant-exchange-test -o URL -V "http://localhost:$EPORT/" || exit
     $CS -s merchant-exchange-test -o MASTER_KEY -V `$CS -s exchange -o MASTER_PUBLIC_KEY`
   else
     echo "Need to be configuring exchange as well for -t to be useful."
diff --git a/src/exchange/test-taler-exchange-aggregator-postgres.conf b/src/exchange/test-taler-exchange-aggregator-postgres.conf
index f609c0afb..a5f35196b 100644
--- a/src/exchange/test-taler-exchange-aggregator-postgres.conf
+++ b/src/exchange/test-taler-exchange-aggregator-postgres.conf
@@ -64,7 +64,7 @@ CLOSING-FEE-2026 = EUR:0.01
 
 
 # What is the main website of the bank?
-BANK_URI = "http://localhost:8082/"
+BANK_URL = "http://localhost:8082/"
 
 # From which account at the 'bank' should outgoing
 # wire transfers be made?
diff --git a/src/exchange/test-taler-exchange-wirewatch-postgres.conf b/src/exchange/test-taler-exchange-wirewatch-postgres.conf
index 2e846d88c..cc614fc83 100644
--- a/src/exchange/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/exchange/test-taler-exchange-wirewatch-postgres.conf
@@ -66,7 +66,7 @@ CLOSING-FEE-2026 = EUR:0.01
 
 
 # What is the main website of the bank?
-BANK_URI = "http://localhost:8082/"
+BANK_URL = "http://localhost:8082/"
 
 # From which account at the 'bank' should outgoing
 # wire transfers be made?
diff --git a/src/exchange/test_taler_exchange_aggregator.c b/src/exchange/test_taler_exchange_aggregator.c
index 178b5aa32..3265bf2a1 100644
--- a/src/exchange/test_taler_exchange_aggregator.c
+++ b/src/exchange/test_taler_exchange_aggregator.c
@@ -434,7 +434,7 @@ do_deposit (struct Command *cmd)
   /* Build JSON for wire details */
   deposit.receiver_wire_account = json_pack ("{s:s, s:s, s:I}",
                                              "type", "test",
-                                             "bank_uri", "http://localhost:8082/",
+                                             "bank_url", "http://localhost:8082/",
                                              "account_number", (json_int_t) cmd->details.deposit.merchant_account);
   GNUNET_assert (GNUNET_OK ==
                  TALER_JSON_hash (deposit.receiver_wire_account,
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index 2204f8d3c..7df8d9b22 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -37,7 +37,7 @@ DB_CONN_STR = "postgres:///talercheck"
 ENABLE = YES
 
 # What is the main website of the bank?
-BANK_URI = "http://localhost:8082/"
+BANK_URL = "http://localhost:8082/"
 
 # From which account at the 'bank' should outgoing
 # wire transfers be made?
diff --git a/src/exchange/test_taler_exchange_httpd_home/.config/taler/test.json b/src/exchange/test_taler_exchange_httpd_home/.config/taler/test.json
index be5e92c11..eca394241 100644
--- a/src/exchange/test_taler_exchange_httpd_home/.config/taler/test.json
+++ b/src/exchange/test_taler_exchange_httpd_home/.config/taler/test.json
@@ -2,7 +2,7 @@
   "salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8",
   "name": "The exchange",
   "account_number": 3,
-  "bank_uri": "http://localhost:8082/",
+  "bank_url": "http://localhost:8082/",
   "type": "test",
   "sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28"
-}
\ No newline at end of file
+}