use url instead of uri

1 files changed, 10 insertions, 10 deletions

diff --git a/config/generate-config b/config/generate-config
index c708a11..5f11192 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -100,9 +100,9 @@ def config(currency, envname, exchange_pub, standalone):
         cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(envname))
 
     if standalone:
-        cfg_put("merchant-exchange-test", "uri", "https://env.taler.net/{}/exchange/".format(envname))
+        cfg_put("merchant-exchange-test", "url", "https://env.taler.net/{}/exchange/".format(envname))
     else:
-        cfg_put("merchant-exchange-test", "uri", "https://exchange.{}.taler.net/".format(envname))
+        cfg_put("merchant-exchange-test", "url", "https://exchange.{}.taler.net/".format(envname))
 
     cfg_put("merchant-exchange-test", "master_key", exchange_pub)
 
@@ -135,9 +135,9 @@ def config(currency, envname, exchange_pub, standalone):
         cfg_put("auditordb-postgres", "db_conn_str", "postgres:///taler{}".format(envname))
 
     if standalone:
-        cfg_put("exchange-wire-test", "bank_uri", "https://env.taler.net/{}/bank/".format(envname))
+        cfg_put("exchange-wire-test", "bank_url", "https://env.taler.net/{}/bank/".format(envname))
     else:
-        cfg_put("exchange-wire-test", "bank_uri", "https://bank.{}.taler.net/".format(envname))
+        cfg_put("exchange-wire-test", "bank_url", "https://bank.{}.taler.net/".format(envname))
     cfg_put("exchange-wire-test", "bank_account_number", "1")
     cfg_put("exchange-wire-test", "exchange_account_number", "2")
     cfg_put("exchange-wire-test", "enable", "yes")
@@ -221,12 +221,12 @@ def config(currency, envname, exchange_pub, standalone):
 
 def merchant_wf(envname, instance_name, acct_no, standalone):
     if standalone:
-        bank_uri = "https://env.taler.net/{}/bank/".format(envname)
+        bank_url = "https://env.taler.net/{}/bank/".format(envname)
     else:
-        bank_uri = "https://bank.{}.taler.net/".format(envname)
+        bank_url = "https://bank.{}.taler.net/".format(envname)
     data = OrderedDict(
         type="test",
-        bank_uri=bank_uri,
+        bank_url=bank_url,
         sig="MERCHANTSIGNATURE",
         account_number=acct_no,
         salt="SALT"
@@ -236,13 +236,13 @@ def merchant_wf(envname, instance_name, acct_no, standalone):
 
 def exchange_wf(envname, wfname, acct_no, name, standalone):
     if standalone:
-        bank_uri = "https://env.taler.net/{}/bank/".format(envname)
+        bank_url = "https://env.taler.net/{}/bank/".format(envname)
     else:
-        bank_uri = "https://bank.{}.taler.net/".format(envname)
+        bank_url = "https://bank.{}.taler.net/".format(envname)
     data = OrderedDict(
         name=name,
         type=wfname,
-        bank_uri=bank_uri,
+        bank_url=bank_url,
         account_number=acct_no
     )
     return (wfname, json.dumps(data, indent=2))