adapt to latest exchange API changes

1 files changed, 17 insertions, 20 deletions

diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 28ba72df..3a051a3c 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -454,7 +454,7 @@ struct KycContext
   /**
    * Looking for the exchange.
    */
-  struct TMH_EXCHANGES_FindOperation *fo;
+  struct TMH_EXCHANGES_Find2Operation *fo;
 
   /**
    * Exchange this is about.
@@ -530,7 +530,7 @@ destroy_kc (struct KycContext *kc)
 {
   if (NULL != kc->fo)
   {
-    TMH_EXCHANGES_find_exchange_cancel (kc->fo);
+    TMH_EXCHANGES_keys4exchange_cancel (kc->fo);
     kc->fo = NULL;
   }
   if (NULL != kc->dg)
@@ -779,34 +779,32 @@ deposit_get_callback (
  * Function called with the result of our exchange lookup.
  *
  * @param cls the `struct KycContext`
- * @param hr HTTP response details
- * @param exchange_handle NULL if exchange was not found to be acceptable
- * @param ih internal handle to the exchange
+ * @param keys NULL if exchange was not found to be acceptable
  */
 static void
 process_kyc_with_exchange (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  struct TALER_EXCHANGE_Handle *exchange_handle,
-  struct TMH_Exchange *ih)
+  struct TALER_EXCHANGE_Keys *keys)
 {
   struct KycContext *kc = cls;
 
-  (void) ih;
   kc->fo = NULL;
-  if (NULL == exchange_handle)
+  if (NULL == keys)
   {
     destroy_kc (kc);
     return;
   }
-  kc->dg = TALER_EXCHANGE_deposits_get (exchange_handle,
-                                        &kc->mi->merchant_priv,
-                                        &kc->wm->h_wire,
-                                        &kc->h_contract_terms,
-                                        &kc->coin_pub,
-                                        GNUNET_TIME_UNIT_ZERO,
-                                        &deposit_get_callback,
-                                        kc);
+  kc->dg = TALER_EXCHANGE_deposits_get (
+    merchant_curl_ctx,
+    kc->exchange_url,
+    keys,
+    &kc->mi->merchant_priv,
+    &kc->wm->h_wire,
+    &kc->h_contract_terms,
+    &kc->coin_pub,
+    GNUNET_TIME_UNIT_ZERO,
+    &deposit_get_callback,
+    kc);
   if (NULL == kc->dg)
   {
     GNUNET_break (0);
@@ -919,8 +917,7 @@ check_kyc (struct PayContext *pc,
   GNUNET_CONTAINER_DLL_insert (kc_head,
                                kc_tail,
                                kc);
-  kc->fo = TMH_EXCHANGES_find_exchange (kc->exchange_url,
-                                        false,
+  kc->fo = TMH_EXCHANGES_keys4exchange (kc->exchange_url,
                                         &process_kyc_with_exchange,
                                         kc);
   if (NULL == kc->fo)