[taler-merchant] branch master updated: payto fixes

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new cecacac  payto fixes
cecacac is described below

commit cecacaca215e8d4c10bd46676d416b90c376dec9
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jan 19 17:48:02 2020 +0100

    payto fixes
---
 src/lib/Makefile.am                                                  | 1 -
 src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json | 2 +-
 src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json | 2 +-
 src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json | 5 -----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1f90eba..2890143 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -144,5 +144,4 @@ EXTRA_DIST = \
   test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \
   test_merchant_api_home/.config/taler/exchange/account-2.json \
   test_merchant_api_home/.config/taler/merchant/wire/test.json \
-  test_merchant_api_home/.config/taler/test.json \
   test_merchant.priv
diff --git 
a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json 
b/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
index 81db023..b84273e 100644
--- a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
+++ b/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
@@ -1,4 +1,4 @@
 {
-  "url": "payto://x-taler-bank/localhost/2",
+  "payto_uri": "payto://x-taler-bank/localhost/2",
   "master_sig": 
"A296BYJDP182XS8GHB362ENK4JVPQYHJ34AMNC52YKSK78NH85NA3MWCPM7XAYXWSHK0X9SH46JN84T2AYGP0YAV0E9HQXAYZGABP0R"
 }
\ No newline at end of file
diff --git 
a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json 
b/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
index 9e5c1a9..70e8bbb 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
+++ b/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
@@ -1 +1 @@
-{"salt":"NEHC5SP52WZRSZR8CTE3SV2JSZX2C1XFSA75YNRT6YJARRR2ERM32PMTHP16CT6TV7G2CX7T3J28YFP0PJP1PAMAQVT6J76RF3AE34R","url":"payto://x-taler-bank/localhost/3"}
+{"payto_uri":"payto://x-taler-bank/localhost/3","salt":"KHMDP5RV4K75TYZAAZEFSB33AQK5DECEDAQB3AYCXZHB50W83RC5C08H5CRNNG9BWQXN3RD52WCQ09A3MFJDJASGB3PRPA03V3TEGCR"}
\ No newline at end of file
diff --git 
a/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json 
b/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json
deleted file mode 100644
index 6898b00..0000000
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type":"test",
-  "bank_url":"http://localhost:8083/";,
-  "account_number":62
-}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.