-more exchange API atomization

3 files changed, 15 insertions, 36 deletions

diff --git a/src/lib/exchange_api_contracts_get.c b/src/lib/exchange_api_contracts_get.c
index 8fd4ba1e7..aece7733a 100644
--- a/src/lib/exchange_api_contracts_get.c
+++ b/src/lib/exchange_api_contracts_get.c
@@ -39,11 +39,6 @@ struct TALER_EXCHANGE_ContractsGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -194,7 +189,8 @@ handle_contract_get_finished (void *cls,
 
 struct TALER_EXCHANGE_ContractsGetHandle *
 TALER_EXCHANGE_contract_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   TALER_EXCHANGE_ContractGetCallback cb,
   void *cb_cls)
@@ -203,14 +199,7 @@ TALER_EXCHANGE_contract_get (
   CURL *eh;
   char arg_str[sizeof (cgh->cpub) * 2 + 48];
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   cgh = GNUNET_new (struct TALER_EXCHANGE_ContractsGetHandle);
-  cgh->exchange = exchange;
   cgh->cb = cb;
   cgh->cb_cls = cb_cls;
   GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
@@ -226,12 +215,13 @@ TALER_EXCHANGE_contract_get (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/contracts/%s",
+                     "contracts/%s",
                      cpub_str);
   }
 
-  cgh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  cgh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == cgh->url)
   {
     GNUNET_free (cgh);
@@ -247,7 +237,7 @@ TALER_EXCHANGE_contract_get (
     GNUNET_free (cgh);
     return NULL;
   }
-  cgh->job = GNUNET_CURL_job_add (TEAH_handle_to_context (exchange),
+  cgh->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   &handle_contract_get_finished,
                                   cgh);
diff --git a/src/lib/exchange_api_reserves_get.c b/src/lib/exchange_api_reserves_get.c
index 733540235..7b59ba9a4 100644
--- a/src/lib/exchange_api_reserves_get.c
+++ b/src/lib/exchange_api_reserves_get.c
@@ -226,7 +226,8 @@ TALER_EXCHANGE_reserves_get (
   rgh->cb_cls = cb_cls;
   rgh->reserve_pub = *reserve_pub;
   rgh->url = TALER_url_join (url,
-                             arg_str);
+                             arg_str,
+                             NULL);
   if (NULL == rgh->url)
   {
     GNUNET_free (rgh);
diff --git a/src/lib/exchange_api_reserves_get_attestable.c b/src/lib/exchange_api_reserves_get_attestable.c
index b272d478a..f58e0592e 100644
--- a/src/lib/exchange_api_reserves_get_attestable.c
+++ b/src/lib/exchange_api_reserves_get_attestable.c
@@ -39,11 +39,6 @@ struct TALER_EXCHANGE_ReservesGetAttestHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -211,22 +206,16 @@ handle_reserves_get_attestable_finished (void *cls,
 
 struct TALER_EXCHANGE_ReservesGetAttestHandle *
 TALER_EXCHANGE_reserves_get_attestable (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   TALER_EXCHANGE_ReservesGetAttestCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah;
-  struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   {
     char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
     char *end;
@@ -239,16 +228,16 @@ TALER_EXCHANGE_reserves_get_attestable (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/reserves-attest/%s",
+                     "reserves-attest/%s",
                      pub_str);
   }
   rgah = GNUNET_new (struct TALER_EXCHANGE_ReservesGetAttestHandle);
-  rgah->exchange = exchange;
   rgah->cb = cb;
   rgah->cb_cls = cb_cls;
   rgah->reserve_pub = *reserve_pub;
-  rgah->url = TEAH_path_to_url (exchange,
-                                arg_str);
+  rgah->url = TALER_url_join (url,
+                              arg_str,
+                              NULL);
   if (NULL == rgah->url)
   {
     GNUNET_free (rgah);
@@ -262,7 +251,6 @@ TALER_EXCHANGE_reserves_get_attestable (
     GNUNET_free (rgah);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
   rgah->job = GNUNET_CURL_job_add (ctx,
                                    eh,
                                    &handle_reserves_get_attestable_finished,