adaptations for latest merchant C API

4 files changed, 16 insertions, 17 deletions

diff --git a/src/backend/anastasis-httpd_policy-upload.c b/src/backend/anastasis-httpd_policy-upload.c
index 94a38bc..3f0f70e 100644
--- a/src/backend/anastasis-httpd_policy-upload.c
+++ b/src/backend/anastasis-httpd_policy-upload.c
@@ -387,15 +387,14 @@ proposal_cb (void *cls,
  * Callback to process a GET /check-payment request
  *
  * @param cls our `struct PolicyUploadContext`
- * @param hr HTTP response details
  * @param osr order status
  */
 static void
 check_payment_cb (void *cls,
-                  const struct TALER_MERCHANT_HttpResponse *hr,
                   const struct TALER_MERCHANT_OrderStatusResponse *osr)
 {
   struct PolicyUploadContext *puc = cls;
+  const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
 
   /* refunds are not supported, verify */
   puc->cpo = NULL;
@@ -422,10 +421,11 @@ check_payment_cb (void *cls,
     puc->response_code = MHD_HTTP_BAD_GATEWAY;
     return;
   }
+  GNUNET_assert (MHD_HTTP_OK == hr->http_status);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Payment status checked: %s\n",
-              osr->status ? "paid" : "unpaid");
-  switch (osr->status)
+              "Payment status checked: %d\n",
+              osr->details.success.status);
+  switch (osr->details.success.status)
   {
   case TALER_MERCHANT_OSC_PAID:
     {
@@ -440,7 +440,7 @@ check_payment_cb (void *cls,
         GNUNET_JSON_spec_end ()
       };
 
-      contract = osr->details.paid.contract_terms;
+      contract = osr->details.success.details.paid.contract_terms;
       if (GNUNET_OK !=
           GNUNET_JSON_parse (contract,
                              cspec,
diff --git a/src/backend/anastasis-httpd_truth-challenge.c b/src/backend/anastasis-httpd_truth-challenge.c
index 30379a7..9f7f123 100644
--- a/src/backend/anastasis-httpd_truth-challenge.c
+++ b/src/backend/anastasis-httpd_truth-challenge.c
@@ -650,16 +650,15 @@ proposal_cb (void *cls,
  * Callback to process a GET /check-payment request
  *
  * @param cls our `struct ChallengeContext`
- * @param hr HTTP response details
  * @param osr order status
  */
 static void
 check_payment_cb (void *cls,
-                  const struct TALER_MERCHANT_HttpResponse *hr,
                   const struct TALER_MERCHANT_OrderStatusResponse *osr)
 
 {
   struct ChallengeContext *gc = cls;
+  const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
 
   gc->cpo = NULL;
   GNUNET_assert (gc->in_list);
@@ -713,7 +712,8 @@ check_payment_cb (void *cls,
     }
   }
 
-  switch (osr->status)
+  GNUNET_assert (MHD_HTTP_OK == hr->http_status);
+  switch (osr->details.success.status)
   {
   case TALER_MERCHANT_OSC_PAID:
     {
diff --git a/src/backend/anastasis-httpd_truth-solve.c b/src/backend/anastasis-httpd_truth-solve.c
index 8133cc9..a632e6b 100644
--- a/src/backend/anastasis-httpd_truth-solve.c
+++ b/src/backend/anastasis-httpd_truth-solve.c
@@ -482,16 +482,15 @@ proposal_cb (void *cls,
  * Callback to process a GET /check-payment request
  *
  * @param cls our `struct SolveContext`
- * @param hr HTTP response details
  * @param osr order status
  */
 static void
 check_payment_cb (void *cls,
-                  const struct TALER_MERCHANT_HttpResponse *hr,
                   const struct TALER_MERCHANT_OrderStatusResponse *osr)
 
 {
   struct SolveContext *gc = cls;
+  const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
 
   gc->cpo = NULL;
   GNUNET_assert (gc->in_list);
@@ -545,7 +544,8 @@ check_payment_cb (void *cls,
     }
   }
 
-  switch (osr->status)
+  GNUNET_assert (MHD_HTTP_OK == hr->http_status);
+  switch (osr->details.success.status)
   {
   case TALER_MERCHANT_OSC_PAID:
     {
diff --git a/src/backend/anastasis-httpd_truth-upload.c b/src/backend/anastasis-httpd_truth-upload.c
index 356dc36..b8d2a84 100644
--- a/src/backend/anastasis-httpd_truth-upload.c
+++ b/src/backend/anastasis-httpd_truth-upload.c
@@ -287,15 +287,14 @@ proposal_cb (void *cls,
  * Callback to process a GET /check-payment request
  *
  * @param cls our `struct PolicyUploadContext`
- * @param hr HTTP response details
  * @param osr order status
  */
 static void
 check_payment_cb (void *cls,
-                  const struct TALER_MERCHANT_HttpResponse *hr,
                   const struct TALER_MERCHANT_OrderStatusResponse *osr)
 {
   struct TruthUploadContext *tuc = cls;
+  const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
 
   tuc->cpo = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -311,7 +310,7 @@ check_payment_cb (void *cls,
       NULL);
     break;
   case MHD_HTTP_OK:
-    switch (osr->status)
+    switch (osr->details.success.status)
     {
     case TALER_MERCHANT_OSC_PAID:
       {
@@ -326,7 +325,7 @@ check_payment_cb (void *cls,
           GNUNET_JSON_spec_end ()
         };
 
-        contract = osr->details.paid.contract_terms;
+        contract = osr->details.success.details.paid.contract_terms;
         if (GNUNET_OK !=
             GNUNET_JSON_parse (contract,
                                cspec,
@@ -355,7 +354,7 @@ check_payment_cb (void *cls,
         qs = db->record_truth_upload_payment (
           db->cls,
           &tuc->truth_uuid,
-          &osr->details.paid.deposit_total,
+          &osr->details.success.details.paid.deposit_total,
           paid_until);
         if (qs <= 0)
         {