diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-01-19 17:03:19 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-01-19 17:03:19 +0100 |
| commit | fc8bdb9b978334d52b80c318f9326394f855de2d (patch) | |
| tree | 428c6b9235dee248bef4fc7e7c41b029495b0d0f /src/exchangedb | |
| parent | 9f522baadcf3b5288d35216962a91b5aeb688820 (diff) | |
| download | exchange-fc8bdb9b978334d52b80c318f9326394f855de2d.tar.gz exchange-fc8bdb9b978334d52b80c318f9326394f855de2d.tar.bz2 exchange-fc8bdb9b978334d52b80c318f9326394f855de2d.zip | |
consistently use payto URI instead of URL
Diffstat (limited to 'src/exchangedb')
| -rw-r--r-- | src/exchangedb/exchangedb_accounts.c | 14 | ||||
| -rw-r--r-- | src/exchangedb/test_exchangedb.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c index fa349d58a..fa45fd81f 100644 --- a/src/exchangedb/exchangedb_accounts.c +++ b/src/exchangedb/exchangedb_accounts.c @@ -62,7 +62,7 @@ check_for_account (void *cls, { struct FindAccountContext *ctx = cls; char *method; - char *payto_url; + char *payto_uri; char *wire_response_filename; struct TALER_EXCHANGEDB_AccountInfo ai; @@ -73,12 +73,12 @@ check_for_account (void *cls, if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (ctx->cfg, section, - "URL", - &payto_url)) + "PAYTO_URI", + &payto_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, section, - "URL"); + "PAYTO_URI"); return; } if (GNUNET_OK != @@ -90,7 +90,7 @@ check_for_account (void *cls, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, section, "METHOD"); - GNUNET_free (payto_url); + GNUNET_free (payto_uri); return; } if (GNUNET_OK != @@ -101,7 +101,7 @@ check_for_account (void *cls, wire_response_filename = NULL; ai.section_name = section; ai.method = method; - ai.payto_url = payto_url; + ai.payto_uri = payto_uri; ai.wire_response_filename = wire_response_filename; ai.debit_enabled = (GNUNET_YES == @@ -114,7 +114,7 @@ check_for_account (void *cls, "ENABLE_CREDIT")); ctx->cb (ctx->cb_cls, &ai); - GNUNET_free (payto_url); + GNUNET_free (payto_uri); GNUNET_free (method); GNUNET_free_non_null (wire_response_filename); } diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index 8bca8df7a..2a3ab0cbd 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -760,7 +760,7 @@ cb_wt_check (void *cls, GNUNET_assert (0 == GNUNET_memcmp (merchant_pub, &merchant_pub_wt)); GNUNET_assert (0 == strcmp (json_string_value (json_object_get (wire, - "url")), + "payto_uri")), "payto://sepa/DE67830654080004822650")); GNUNET_assert (0 == GNUNET_memcmp (h_wire, &h_wire_wt)); @@ -1257,7 +1257,7 @@ test_wire_out (struct TALER_EXCHANGEDB_Session *session, json_t *wire_out_account; wire_out_account = json_pack ("{s:s,s:s}", - "url", + "payto_uri", "payto://x-taler-bank/localhost:8080/1", "salt", "this-is-my-salt"); if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != @@ -1473,7 +1473,7 @@ run (void *cls) session = NULL; deposit.coin.denom_sig.rsa_signature = NULL; wire = json_pack ("{s:s, s:s}", - "url", "payto://sepa/DE67830654080004822650", + "payto_uri", "payto://sepa/DE67830654080004822650", "salt", "this-is-a-salt-value"); ZR_BLK (&cbc); ZR_BLK (&cbc2); |