taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

payto fixes

Browse Source
This commit is contained in:
Florian Dold 2020-01-17 15:03:19 +01:00
parent e88ad199e6
commit 84f3b9b287
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/taler-bank-manage-testing
View File

@ -12,6 +12,8 @@ set -eu
# Ensure starting accounts exist # Ensure starting accounts exist
taler-bank-manage -c $1 --with-db $2 django provide_accounts 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 # This is 'x' hashed by Django
PW_HASH='pbkdf2_sha256$180000$RBYjEO0WzE1z$x2Avt35TkOL2pMHvts3B1U1NIJalXZf95WnJhGFOAUs=' PW_HASH='pbkdf2_sha256$180000$RBYjEO0WzE1z$x2Avt35TkOL2pMHvts3B1U1NIJalXZf95WnJhGFOAUs='

1
src/include/taler_testing_lib.h
View File

@ -878,6 +878,7 @@ TALER_TESTING_cmd_transfer (const char *label,
const char *amount, const char *amount,
const char *account_base_url, const char *account_base_url,
const struct TALER_BANK_AuthenticationData *auth, const struct TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account,
const char *payto_credit_account, const char *payto_credit_account,
const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_WireTransferIdentifierRawP *wtid,
const char *exchange_base_url); const char *exchange_base_url);

1
src/lib/test_bank_api.c
View File

@ -97,6 +97,7 @@ run (void *cls,
"KUDOS:3.22", "KUDOS:3.22",
bc.exchange_account_url, bc.exchange_account_url,
&bc.exchange_auth, &bc.exchange_auth,
bc.exchange_payto,
bc.user42_payto, bc.user42_payto,
&wtid, &wtid,
"http://exchange.example.com/"), "http://exchange.example.com/"),

4
src/lib/test_bank_api_pybank.conf
View File

@ -4,9 +4,9 @@
currency = KUDOS currency = KUDOS
[account-2] [account-2]
URL = payto://x-taler-bank/localhost/2 URL = payto://x-taler-bank/localhost/Exchange
METHOD = x-taler-bank 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 WIRE_GATEWAY_AUTH_METHOD = basic
USERNAME = Exchange USERNAME = Exchange
PASSWORD = x PASSWORD = x

3
src/lib/testing_api_cmd_bank_transfer.c
View File

@ -348,6 +348,7 @@ TALER_TESTING_cmd_transfer
const char *amount, const char *amount,
const char *account_base_url, const char *account_base_url,
const struct TALER_BANK_AuthenticationData *auth, const struct TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account,
const char *payto_credit_account, const char *payto_credit_account,
const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_WireTransferIdentifierRawP *wtid,
const char *exchange_base_url) const char *exchange_base_url)
@ -357,7 +358,7 @@ TALER_TESTING_cmd_transfer
fts = GNUNET_new (struct TransferState); fts = GNUNET_new (struct TransferState);
fts->account_debit_url = account_base_url; fts->account_debit_url = account_base_url;
fts->exchange_base_url = exchange_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->payto_credit_account = payto_credit_account;
fts->auth = *auth; fts->auth = *auth;
fts->wtid = *wtid; fts->wtid = *wtid;

2
src/lib/testing_api_cmd_insert_deposit.c
View File

@ -181,7 +181,7 @@ insert_deposit_run (void *cls,
char *str; char *str;
GNUNET_asprintf (&str, GNUNET_asprintf (&str,
"payto://x-taler-bank/localhost:8082/%s", "payto://x-taler-bank/localhost/%s",
ids->merchant_account); ids->merchant_account);
deposit.receiver_wire_account deposit.receiver_wire_account
= json_pack ("{s:s, s:s}", = json_pack ("{s:s, s:s}",