taler-mdb

commit 6169a602ad87688719629acfe84791fc15096992
parent c450de5db5b48433941dc7485ddb61c93be3fcd7
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Thu,  8 Sep 2022 11:33:32 +0200

fix logic

Diffstat:
M
src/taler-mdb.c
 | 
15
+++++++++++----

1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/taler-mdb.c b/src/taler-mdb.c
@@ -93,7 +93,9 @@ along with
     GNUNET_TIME_UNIT_MINUTES, 5)
 
 
-#define NFC_FAILURE_RETRY_FREQ GNUNET_TIME_UNIT_SECONDS
+#define NFC_FAILURE_RETRY_FREQ GNUNET_TIME_UNIT_MINUTES
+
+#define NFC_NOT_FOUND_RETRY_FREQ GNUNET_TIME_UNIT_SECONDS
 
 /**
  * How long do we wait at most for an ACK from MDB?
@@ -1354,7 +1356,7 @@ wallet_select_aid (void *cls)
               response[0],
               response[1]);
   /* start the selection again */
-  pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
+  pa->task = GNUNET_SCHEDULER_add_delayed (NFC_NOT_FOUND_RETRY_FREQ,
                                            &connect_target,
                                            pa);
 }
@@ -1409,7 +1411,7 @@ connect_target (void *cls)
     return;
   }
   /* if no target was found try again */
-  pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
+  pa->task = GNUNET_SCHEDULER_add_delayed (NFC_NOT_FOUND_RETRY_FREQ,
                                            &connect_target,
                                            pa);
 }
@@ -1496,7 +1498,11 @@ check_payment_cb (void *cls,
     return;
   }
 
-  if ( (MHD_HTTP_OK != hr->http_status) &&
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Backend request to /check-payment returned: %u/%d\n",
+              hr->http_status,
+              (int) osr->details.success.status);
+  if ( (MHD_HTTP_OK == hr->http_status) &&
        (TALER_MERCHANT_OSC_PAID == osr->details.success.status) )
   {
     mdb.cmd = &cmd_approve_vend;
@@ -1733,6 +1739,7 @@ launch_payment (struct Product *product)
   pa->base_url = (NULL == product->instance)
                  ? backend_base_url
                  : product->instance;
+  GNUNET_assert (NULL == pa->po);
   pa->po = TALER_MERCHANT_orders_post2 (pa->ctx,
                                         pa->base_url,
                                         orderReq,