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/lib | |
| 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/lib')
| -rw-r--r-- | src/lib/exchange_api_handle.c | 4 | ||||
| -rw-r--r-- | src/lib/exchange_api_wire.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 94719f99a..a18ac9094 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -1534,7 +1534,7 @@ deserialize_data (struct TALER_EXCHANGE_Handle *exchange, &version), GNUNET_JSON_spec_json ("keys", &keys), - GNUNET_JSON_spec_string ("url", + GNUNET_JSON_spec_string ("exchange_url", &url), GNUNET_JSON_spec_absolute_time ("expire", &expire), @@ -1829,7 +1829,7 @@ TALER_EXCHANGE_serialize_data (json_int_t) TALER_SERIALIZATION_FORMAT_VERSION, "expire", GNUNET_JSON_from_time_abs (exchange->key_data_expiration), - "url", + "exchange_url", exchange->url, "keys", keys); diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c index 60ab4a6d1..9d17f5c80 100644 --- a/src/lib/exchange_api_wire.c +++ b/src/lib/exchange_api_wire.c @@ -271,7 +271,7 @@ handle_wire_finished (void *cls, struct TALER_EXCHANGE_WireAccount *wa = &was[i]; json_t *account; struct GNUNET_JSON_Specification spec_account[] = { - GNUNET_JSON_spec_string ("url", &wa->url), + GNUNET_JSON_spec_string ("payto_uri", &wa->payto_uri), GNUNET_JSON_spec_fixed_auto ("master_sig", &wa->master_sig), GNUNET_JSON_spec_end () }; @@ -300,7 +300,7 @@ handle_wire_finished (void *cls, ec = TALER_EC_SERVER_JSON_INVALID; break; } - if (NULL == (method = TALER_payto_get_method (wa->url))) + if (NULL == (method = TALER_payto_get_method (wa->payto_uri))) { /* bogus reply */ GNUNET_break_op (0); |