diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-01-17 15:03:19 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-01-17 15:03:27 +0100 |
| commit | 84f3b9b2872264bfba2027c720116f6c7de7ae4a (patch) | |
| tree | 738bfb70c000e6df80d237bae0e3a8411c470d17 /src | |
| parent | e88ad199e667a435046ca2d7cc967ba740fa0452 (diff) | |
payto fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/taler_testing_lib.h | 1 | ||||
| -rw-r--r-- | src/lib/test_bank_api.c | 1 | ||||
| -rw-r--r-- | src/lib/test_bank_api_pybank.conf | 4 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_bank_transfer.c | 3 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_insert_deposit.c | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 783aa5966..338eea654 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 d981a759c..b12576175 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 1f7d8f7c4..1d5f4a2d1 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 7e89ec610..159c0669b 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 47729a0ad..e52ce6ee2 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}", |