rename .success to .ok for consistency

1 files changed, 24 insertions, 24 deletions

diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c
index 68631bde..a0c1995b 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -81,21 +81,21 @@ handle_unpaid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount_any (
       "total_amount",
-      &osr->details.success.details.unpaid.contract_amount),
+      &osr->details.ok.details.unpaid.contract_amount),
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_string (
         "already_paid_order_id",
-        &osr->details.success.details.unpaid.already_paid_order_id),
+        &osr->details.ok.details.unpaid.already_paid_order_id),
       NULL),
     GNUNET_JSON_spec_string (
       "taler_pay_uri",
-      &osr->details.success.details.unpaid.taler_pay_uri),
+      &osr->details.ok.details.unpaid.taler_pay_uri),
     GNUNET_JSON_spec_string (
       "summary",
-      &osr->details.success.details.unpaid.summary),
+      &osr->details.ok.details.unpaid.summary),
     GNUNET_JSON_spec_timestamp (
       "creation_time",
-      &osr->details.success.details.unpaid.creation_time),
+      &osr->details.ok.details.unpaid.creation_time),
     GNUNET_JSON_spec_end ()
   };
 
@@ -111,7 +111,7 @@ handle_unpaid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
               osr);
     return;
   }
-  osr->details.success.status = TALER_MERCHANT_OSC_UNPAID;
+  osr->details.ok.status = TALER_MERCHANT_OSC_UNPAID;
   omgh->cb (omgh->cb_cls,
             osr);
 }
@@ -131,7 +131,7 @@ handle_claimed (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
 {
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_json ("contract_terms",
-                           (json_t **) &osr->details.success.details.claimed.
+                           (json_t **) &osr->details.ok.details.claimed.
                            contract_terms),
     GNUNET_JSON_spec_end ()
   };
@@ -148,7 +148,7 @@ handle_claimed (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
               osr);
     return;
   }
-  osr->details.success.status = TALER_MERCHANT_OSC_CLAIMED;
+  osr->details.ok.status = TALER_MERCHANT_OSC_CLAIMED;
   omgh->cb (omgh->cb_cls,
             osr);
   GNUNET_JSON_parse_free (spec);
@@ -174,22 +174,22 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
   json_t *refund_details;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_bool ("refunded",
-                           &osr->details.success.details.paid.refunded),
+                           &osr->details.ok.details.paid.refunded),
     GNUNET_JSON_spec_bool ("refund_pending",
-                           &osr->details.success.details.paid.refund_pending),
+                           &osr->details.ok.details.paid.refund_pending),
     GNUNET_JSON_spec_bool ("wired",
-                           &osr->details.success.details.paid.wired),
+                           &osr->details.ok.details.paid.wired),
     TALER_JSON_spec_amount_any ("deposit_total",
-                                &osr->details.success.details.paid.deposit_total),
+                                &osr->details.ok.details.paid.deposit_total),
     GNUNET_JSON_spec_uint32 ("exchange_code",
                              &ec32),
     GNUNET_JSON_spec_uint32 ("exchange_http_status",
                              &hc32),
     TALER_JSON_spec_amount_any ("refund_amount",
-                                &osr->details.success.details.paid.refund_amount),
+                                &osr->details.ok.details.paid.refund_amount),
     GNUNET_JSON_spec_json (
       "contract_terms",
-      (json_t **) &osr->details.success.details.paid.contract_terms),
+      (json_t **) &osr->details.ok.details.paid.contract_terms),
     GNUNET_JSON_spec_json ("wire_details",
                            &wire_details),
     GNUNET_JSON_spec_json ("wire_reports",
@@ -214,7 +214,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
   if (! (json_is_array (wire_details) &&
          json_is_array (wire_reports) &&
          json_is_array (refund_details) &&
-         json_is_object (osr->details.success.details.paid.contract_terms)) )
+         json_is_object (osr->details.ok.details.paid.contract_terms)) )
   {
     GNUNET_break_op (0);
     osr->hr.http_status = 0;
@@ -224,9 +224,9 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
     GNUNET_JSON_parse_free (spec);
     return;
   }
-  osr->details.success.status = TALER_MERCHANT_OSC_PAID;
-  osr->details.success.details.paid.exchange_ec = (enum TALER_ErrorCode) ec32;
-  osr->details.success.details.paid.exchange_hc = (unsigned int) hc32;
+  osr->details.ok.status = TALER_MERCHANT_OSC_PAID;
+  osr->details.ok.details.paid.exchange_ec = (enum TALER_ErrorCode) ec32;
+  osr->details.ok.details.paid.exchange_hc = (unsigned int) hc32;
   {
     unsigned int wts_len = json_array_size (wire_details);
     unsigned int wrs_len = json_array_size (wire_reports);
@@ -338,12 +338,12 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
       }
     }
 
-    osr->details.success.details.paid.wts = wts;
-    osr->details.success.details.paid.wts_len = wts_len;
-    osr->details.success.details.paid.wrs = wrs;
-    osr->details.success.details.paid.wrs_len = wrs_len;
-    osr->details.success.details.paid.refunds = ref;
-    osr->details.success.details.paid.refunds_len = ref_len;
+    osr->details.ok.details.paid.wts = wts;
+    osr->details.ok.details.paid.wts_len = wts_len;
+    osr->details.ok.details.paid.wrs = wrs;
+    osr->details.ok.details.paid.wrs_len = wrs_len;
+    osr->details.ok.details.paid.refunds = ref;
+    osr->details.ok.details.paid.refunds_len = ref_len;
     omgh->cb (omgh->cb_cls,
               osr);
   }