simplify kyc logic in payment logic as we now have taler-merchant-depositcheck doing it better

1 files changed, 3 insertions, 330 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 a1fdabec..cbd4aa74 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -477,69 +477,6 @@ struct PayContext
 
 
 /**
- * Active KYC operation with an exchange.
- */
-struct KycContext
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct KycContext *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct KycContext *prev;
-
-  /**
-   * Looking for the exchange.
-   */
-  struct TMH_EXCHANGES_KeysOperation *fo;
-
-  /**
-   * Exchange this is about.
-   */
-  char *exchange_url;
-
-  /**
-   * Merchant instance this is for.
-   */
-  struct TMH_MerchantInstance *mi;
-
-  /**
-   * Wire method we are checking the status of.
-   */
-  struct TMH_WireMethod *wm;
-
-  /**
-   * Handle for the GET /deposits operation.
-   */
-  struct TALER_EXCHANGE_DepositGetHandle *dg;
-
-  /**
-   * Contract we are looking up.
-   */
-  struct TALER_PrivateContractHashP h_contract_terms;
-
-  /**
-   * Coin we are looking up.
-   */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
-
-  /**
-   * Initial DB timestamp.
-   */
-  struct GNUNET_TIME_Timestamp kyc_timestamp;
-
-  /**
-   * Initial KYC status.
-   */
-  bool kyc_ok;
-
-};
-
-
-/**
  * Head of active pay context DLL.
  */
 static struct PayContext *pc_head;
@@ -549,57 +486,10 @@ static struct PayContext *pc_head;
  */
 static struct PayContext *pc_tail;
 
-/**
- * Head of active KYC context DLL.
- */
-static struct KycContext *kc_head;
-
-/**
- * Tail of active KYC context DLL.
- */
-static struct KycContext *kc_tail;
-
-
-/**
- * Free resources used by @a kc.
- *
- * @param[in] kc object to free
- */
-static void
-destroy_kc (struct KycContext *kc)
-{
-  if (NULL != kc->fo)
-  {
-    TMH_EXCHANGES_keys4exchange_cancel (kc->fo);
-    kc->fo = NULL;
-  }
-  if (NULL != kc->dg)
-  {
-    TALER_EXCHANGE_deposits_get_cancel (kc->dg);
-    kc->dg = NULL;
-  }
-  TMH_instance_decref (kc->mi);
-  kc->mi = NULL;
-  GNUNET_free (kc->exchange_url);
-  GNUNET_CONTAINER_DLL_remove (kc_head,
-                               kc_tail,
-                               kc);
-  GNUNET_free (kc);
-}
-
 
 void
 TMH_force_pc_resume ()
 {
-  struct KycContext *kc;
-
-  while (NULL != (kc = kc_head))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Aborting KYC check at %s\n",
-                kc->exchange_url);
-    destroy_kc (kc);
-  }
   for (struct PayContext *pc = pc_head;
        NULL != pc;
        pc = pc->next)
@@ -744,221 +634,6 @@ phase_return_response (struct PayContext *pc)
 
 
 /**
- * Function called with detailed wire transfer data.
- *
- * @param cls a `struct KycContext *`
- * @param dr HTTP response data
- */
-static void
-deposit_get_callback (
-  void *cls,
-  const struct TALER_EXCHANGE_GetDepositResponse *dr)
-{
-  struct KycContext *kc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_TIME_Timestamp now;
-
-  kc->dg = NULL;
-  now = GNUNET_TIME_timestamp_get ();
-  switch (dr->hr.http_status)
-  {
-  case MHD_HTTP_OK:
-    qs = TMH_db->account_kyc_set_status (
-      TMH_db->cls,
-      kc->mi->settings.id,
-      &kc->wm->h_wire,
-      kc->exchange_url,
-      0LL,
-      NULL, /* no signature */
-      NULL, /* no signature */
-      now,
-      true,
-      TALER_AML_NORMAL);
-    GNUNET_break (qs > 0);
-    break;
-  case MHD_HTTP_ACCEPTED:
-    qs = TMH_db->account_kyc_set_status (
-      TMH_db->cls,
-      kc->mi->settings.id,
-      &kc->wm->h_wire,
-      kc->exchange_url,
-      dr->details.accepted.requirement_row,
-      NULL, /* no signature */
-      NULL, /* no signature */
-      now,
-      dr->details.accepted.kyc_ok,
-      dr->details.accepted.aml_decision);
-    GNUNET_break (qs > 0);
-    break;
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "KYC check failed at %s with unexpected status %u\n",
-                kc->exchange_url,
-                dr->hr.http_status);
-  }
-  destroy_kc (kc);
-}
-
-
-/**
- * Function called with the result of our exchange lookup.
- *
- * @param cls the `struct KycContext`
- * @param keys NULL if exchange was not found to be acceptable
- * @param exchange representation of the exchange
- */
-static void
-process_kyc_with_exchange (
-  void *cls,
-  struct TALER_EXCHANGE_Keys *keys,
-  struct TMH_Exchange *exchange)
-{
-  struct KycContext *kc = cls;
-
-  (void) exchange;
-  kc->fo = NULL;
-  if (NULL == keys)
-  {
-    destroy_kc (kc);
-    return;
-  }
-  kc->dg = TALER_EXCHANGE_deposits_get (
-    TMH_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);
-    destroy_kc (kc);
-  }
-}
-
-
-/**
- * Function called from ``account_kyc_get_status``
- * with KYC status information for this merchant.
- *
- * @param cls a `struct KycContext *`
- * @param h_wire hash of the wire account
- * @param exchange_kyc_serial serial number for the KYC process at the exchange, 0 if unknown
- * @param payto_uri payto:// URI of the merchant's bank account
- * @param exchange_url base URL of the exchange for which this is a status
- * @param last_check when did we last get an update on our KYC status from the exchange
- * @param kyc_ok true if we satisfied the KYC requirements
- * @param aml_decision latest AML decision by the exchange
- */
-static void
-kyc_cb (
-  void *cls,
-  const struct TALER_MerchantWireHashP *h_wire,
-  uint64_t exchange_kyc_serial,
-  const char *payto_uri,
-  const char *exchange_url,
-  struct GNUNET_TIME_Timestamp last_check,
-  bool kyc_ok,
-  enum TALER_AmlDecisionState aml_decision)
-{
-  struct KycContext *kc = cls;
-
-  (void) h_wire;
-  (void) exchange_kyc_serial;
-  (void) payto_uri;
-  (void) exchange_url;
-  kc->kyc_timestamp = last_check;
-  kc->kyc_ok = kyc_ok;
-  /* FIXME: act on aml_decision? */
-}
-
-
-/**
- * Check for our KYC status at @a exchange_url for the
- * payment of @a pc. First checks if we already have a
- * positive result from the exchange, and if not checks
- * with the exchange.
- *
- * @param pc payment context to use as starting point
- * @param eg exchange group of the exchange we are triggering on
- */
-static void
-check_kyc (struct PayContext *pc,
-           const struct ExchangeGroup *eg)
-{
-  enum GNUNET_DB_QueryStatus qs;
-  struct KycContext *kc;
-
-  kc = GNUNET_new (struct KycContext);
-  qs = TMH_db->account_kyc_get_status (TMH_db->cls,
-                                       pc->hc->instance->settings.id,
-                                       &pc->wm->h_wire,
-                                       eg->exchange_url,
-                                       &kyc_cb,
-                                       kc);
-  if (qs < 0)
-  {
-    GNUNET_break (0);
-    GNUNET_free (kc);
-    return;
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-  {
-    if (kc->kyc_ok)
-    {
-      GNUNET_free (kc);
-      return; /* we are done */
-    }
-    if (GNUNET_TIME_relative_cmp (
-          GNUNET_TIME_absolute_get_duration (
-            kc->kyc_timestamp.abs_time),
-          <,
-          KYC_RETRY_FREQUENCY))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Not re-checking KYC status at `%s', as we already recently asked\n",
-                  eg->exchange_url);
-      GNUNET_free (kc);
-      return;
-    }
-  }
-  kc->mi = pc->hc->instance;
-  kc->mi->rc++;
-  kc->wm = pc->wm;
-  kc->exchange_url = GNUNET_strdup (eg->exchange_url);
-  kc->h_contract_terms = pc->h_contract_terms;
-  /* find one of the coins of the batch */
-  for (unsigned int i = 0; i<pc->coins_cnt; i++)
-  {
-    struct DepositConfirmation *dc = &pc->dc[i];
-
-    if (0 != strcmp (eg->exchange_url,
-                     pc->dc[i].exchange_url))
-      continue;
-    kc->coin_pub = dc->cdd.coin_pub;
-    break;
-  }
-  GNUNET_CONTAINER_DLL_insert (kc_head,
-                               kc_tail,
-                               kc);
-  kc->fo = TMH_EXCHANGES_keys4exchange (
-    kc->exchange_url,
-    false,
-    &process_kyc_with_exchange,
-    kc);
-  if (NULL == kc->fo)
-  {
-    GNUNET_break (0);
-    destroy_kc (kc);
-  }
-}
-
-
-/**
  * Do database transaction for a completed batch deposit.
  *
  * @param eg group that completed
@@ -1133,8 +808,6 @@ handle_batch_deposit_ok (struct ExchangeGroup *eg,
     dc->found_in_db = true;     /* well, at least NOW it'd be true ;-) */
     pc->pending--;
   }
-  check_kyc (pc,
-             eg);
 }
 
 
@@ -1577,9 +1250,9 @@ get_pay_timeout (unsigned int num_coins)
 {
   struct GNUNET_TIME_Relative t;
 
-  /* FIXME:  Do some benchmarking to come up with a better timeout.
-   * We've increased this value so the wallet integration test passes again
-   * on my (Florian) machine.
+  /* FIXME-Performance-Optimization: Do some benchmarking to come up with a
+   * better timeout.  We've increased this value so the wallet integration
+   * test passes again on my (Florian) machine.
    */
   t = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
                                      15 * (1 + (num_coins / 5)));