[taler-exchange] 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 exchange.

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

commit 84f3b9b2872264bfba2027c720116f6c7de7ae4a
Author: Florian Dold <address@hidden>
AuthorDate: Fri Jan 17 15:03:19 2020 +0100

    payto fixes
---
 contrib/taler-bank-manage-testing        | 2 ++
 src/include/taler_testing_lib.h          | 1 +
 src/lib/test_bank_api.c                  | 1 +
 src/lib/test_bank_api_pybank.conf        | 4 ++--
 src/lib/testing_api_cmd_bank_transfer.c  | 3 ++-
 src/lib/testing_api_cmd_insert_deposit.c | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/contrib/taler-bank-manage-testing 
b/contrib/taler-bank-manage-testing
index 7495f64f..b7e356d4 100755
--- a/contrib/taler-bank-manage-testing
+++ b/contrib/taler-bank-manage-testing
@@ -12,6 +12,8 @@ set -eu
 
 # Ensure starting accounts exist
 taler-bank-manage -c $1 --with-db $2 django provide_accounts
+taler-bank-manage -c $1 --with-db $2 django add_bank_account 42
+taler-bank-manage -c $1 --with-db $2 django add_bank_account 43
 
 # This is 'x' hashed by Django
 
PW_HASH='pbkdf2_sha256$180000$RBYjEO0WzE1z$x2Avt35TkOL2pMHvts3B1U1NIJalXZf95WnJhGFOAUs='
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 783aa596..338eea65 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -878,6 +878,7 @@ TALER_TESTING_cmd_transfer (const char *label,
                             const char *amount,
                             const char *account_base_url,
                             const struct TALER_BANK_AuthenticationData *auth,
+                            const char *payto_debit_account,
                             const char *payto_credit_account,
                             const struct TALER_WireTransferIdentifierRawP 
*wtid,
                             const char *exchange_base_url);
diff --git a/src/lib/test_bank_api.c b/src/lib/test_bank_api.c
index d981a759..b1257617 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -97,6 +97,7 @@ run (void *cls,
                                   "KUDOS:3.22",
                                   bc.exchange_account_url,
                                   &bc.exchange_auth,
+                                  bc.exchange_payto,
                                   bc.user42_payto,
                                   &wtid,
                                   "http://exchange.example.com/";),
diff --git a/src/lib/test_bank_api_pybank.conf 
b/src/lib/test_bank_api_pybank.conf
index 1f7d8f7c..1d5f4a2d 100644
--- a/src/lib/test_bank_api_pybank.conf
+++ b/src/lib/test_bank_api_pybank.conf
@@ -4,9 +4,9 @@
 currency = KUDOS
 
 [account-2]
-URL = payto://x-taler-bank/localhost/2
+URL = payto://x-taler-bank/localhost/Exchange
 METHOD = x-taler-bank
-WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/2/";
+WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/Exchange/";
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
diff --git a/src/lib/testing_api_cmd_bank_transfer.c 
b/src/lib/testing_api_cmd_bank_transfer.c
index 7e89ec61..159c0669 100644
--- a/src/lib/testing_api_cmd_bank_transfer.c
+++ b/src/lib/testing_api_cmd_bank_transfer.c
@@ -348,6 +348,7 @@ TALER_TESTING_cmd_transfer
   const char *amount,
   const char *account_base_url,
   const struct TALER_BANK_AuthenticationData *auth,
+  const char *payto_debit_account,
   const char *payto_credit_account,
   const struct TALER_WireTransferIdentifierRawP *wtid,
   const char *exchange_base_url)
@@ -357,7 +358,7 @@ TALER_TESTING_cmd_transfer
   fts = GNUNET_new (struct TransferState);
   fts->account_debit_url = account_base_url;
   fts->exchange_base_url = exchange_base_url;
-  fts->payto_debit_account = TALER_payto_xtalerbank_make2 (account_base_url);
+  fts->payto_debit_account = GNUNET_strdup (payto_debit_account);
   fts->payto_credit_account = payto_credit_account;
   fts->auth = *auth;
   fts->wtid = *wtid;
diff --git a/src/lib/testing_api_cmd_insert_deposit.c 
b/src/lib/testing_api_cmd_insert_deposit.c
index 47729a0a..e52ce6ee 100644
--- a/src/lib/testing_api_cmd_insert_deposit.c
+++ b/src/lib/testing_api_cmd_insert_deposit.c
@@ -181,7 +181,7 @@ insert_deposit_run (void *cls,
     char *str;
 
     GNUNET_asprintf (&str,
-                     "payto://x-taler-bank/localhost:8082/%s",
+                     "payto://x-taler-bank/localhost/%s",
                      ids->merchant_account);
     deposit.receiver_wire_account
       = json_pack ("{s:s, s:s}",

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