merchant

commit d1a98628b2014a3faffd39467a51803b5c4deb36
parent 6a7e7e583e6095ec956cabf49e89b63508729114
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 21 Aug 2022 11:51:12 +0200

-fix FTBFS after exchange API changes

Diffstat:
M
src/backend/taler-merchant-httpd_post-orders-ID-pay.c
 | 
4
++--
M
src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c
 | 
23
+++++++++++++----------
M
src/backend/taler-merchant-httpd_private-get-orders-ID.c
 | 
2
+-

3 files changed, 16 insertions(+), 13 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
@@ -746,7 +746,7 @@ deposit_get_callback (
       kc->mi->settings.id,
       &kc->wm->h_wire,
       kc->exchange_url,
-      dr->details.success.legitimization_uuid,
+      0LL,
       NULL, /* no signature */
       NULL, /* no signature */
       now,
@@ -759,7 +759,7 @@ deposit_get_callback (
       kc->mi->settings.id,
       &kc->wm->h_wire,
       kc->exchange_url,
-      dr->details.accepted.legitimization_uuid,
+      dr->details.accepted.requirement_row,
       NULL, /* no signature */
       NULL, /* no signature */
       now,
diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c
@@ -457,9 +457,9 @@ exchange_check_cb (void *cls,
                                            &ekr->h_wire,
                                            ekr->exchange_url,
                                            ekr->exchange_kyc_serial,
-                                           &ks->details.kyc_ok.exchange_sig,
-                                           &ks->details.kyc_ok.exchange_pub,
-                                           ks->details.kyc_ok.timestamp,
+                                           &ks->details.success.exchange_sig,
+                                           &ks->details.success.exchange_pub,
+                                           ks->details.success.timestamp,
                                            true);
       if (qs < 0)
       {
@@ -475,7 +475,7 @@ exchange_check_cb (void *cls,
         kc->pending_kycs,
         GNUNET_JSON_PACK (
           GNUNET_JSON_pack_string ("kyc_url",
-                                   ks->details.kyc_url),
+                                   ks->details.accepted.kyc_url),
           GNUNET_JSON_pack_string ("exchange_url",
                                    ekr->exchange_url),
           GNUNET_JSON_pack_string ("payto_uri",
@@ -584,12 +584,15 @@ kyc_with_exchange (void *cls,
   ekr->fo = NULL;
   TALER_payto_hash (ekr->payto_uri,
                     &h_payto);
-  ekr->kyc = TALER_EXCHANGE_kyc_check (eh,
-                                       ekr->exchange_kyc_serial,
-                                       &h_payto,
-                                       kc->timeout,
-                                       &exchange_check_cb,
-                                       ekr);
+  ekr->kyc = TALER_EXCHANGE_kyc_check (
+    eh,
+    ekr->exchange_kyc_serial,
+    &h_payto,
+    /* FIXME: get from settings! */
+    TALER_KYCLOGIC_KYC_UT_BUSINESS,
+    kc->timeout,
+    &exchange_check_cb,
+    ekr);
 }
 
 
diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c
@@ -533,7 +533,7 @@ deposit_get_cb (void *cls,
         gorc->hc->instance->settings.id,
         &tq->h_wire,
         tq->exchange_url,
-        dr->details.accepted.legitimization_uuid,
+        dr->details.accepted.requirement_row,
         NULL,
         NULL,
         now,