rename .success to .ok for consistency

10 files changed, 63 insertions, 63 deletions

diff --git a/src/lib/merchant_api_get_instance.c b/src/lib/merchant_api_get_instance.c
index 6807866f..6224e1b4 100644
--- a/src/lib/merchant_api_get_instance.c
+++ b/src/lib/merchant_api_get_instance.c
@@ -101,31 +101,31 @@ handle_get_instance_finished (void *cls,
         GNUNET_JSON_spec_json ("accounts",
                                &accounts),
         GNUNET_JSON_spec_string ("name",
-                                 &igr.details.success.details.name),
+                                 &igr.details.ok.details.name),
         GNUNET_JSON_spec_string ("user_type",
                                  &uts),
         GNUNET_JSON_spec_fixed_auto (
           "merchant_pub",
-          &igr.details.success.details.merchant_pub),
+          &igr.details.ok.details.merchant_pub),
         GNUNET_JSON_spec_json ("address",
                                &address),
         GNUNET_JSON_spec_json ("jurisdiction",
                                &jurisdiction),
         TALER_JSON_spec_amount_any (
           "default_max_wire_fee",
-          &igr.details.success.details.default_max_wire_fee),
+          &igr.details.ok.details.default_max_wire_fee),
         GNUNET_JSON_spec_uint32 (
           "default_wire_fee_amortization",
-          &igr.details.success.details.default_wire_fee_amortization),
+          &igr.details.ok.details.default_wire_fee_amortization),
         TALER_JSON_spec_amount_any (
           "default_max_deposit_fee",
-          &igr.details.success.details.default_max_deposit_fee),
+          &igr.details.ok.details.default_max_deposit_fee),
         GNUNET_JSON_spec_relative_time (
           "default_wire_transfer_delay",
-          &igr.details.success.details.default_wire_transfer_delay),
+          &igr.details.ok.details.default_wire_transfer_delay),
         GNUNET_JSON_spec_relative_time (
           "default_pay_delay",
-          &igr.details.success.details.default_pay_delay),
+          &igr.details.ok.details.default_pay_delay),
         GNUNET_JSON_spec_end ()
       };
 
@@ -177,12 +177,12 @@ handle_get_instance_finished (void *cls,
 
         if (GNUNET_OK == ret)
         {
-          igr.details.success.details.address = address;
-          igr.details.success.details.jurisdiction = jurisdiction;
+          igr.details.ok.details.address = address;
+          igr.details.ok.details.jurisdiction = jurisdiction;
           if (GNUNET_OK !=
               TALER_KYCLOGIC_kyc_user_type_from_string (
                 uts,
-                &igr.details.success.details.ut))
+                &igr.details.ok.details.ut))
           {
             GNUNET_break_op (0);
             ret = GNUNET_SYSERR;
@@ -191,8 +191,8 @@ handle_get_instance_finished (void *cls,
             GNUNET_JSON_parse_free (spec);
             break;
           }
-          igr.details.success.accounts_length = accounts_length;
-          igr.details.success.accounts = aa;
+          igr.details.ok.accounts_length = accounts_length;
+          igr.details.ok.accounts = aa;
           igh->cb (igh->cb_cls,
                    &igr);
           GNUNET_JSON_parse_free (spec);
diff --git a/src/lib/merchant_api_get_instances.c b/src/lib/merchant_api_get_instances.c
index d7b1b85a..5f26eb48 100644
--- a/src/lib/merchant_api_get_instances.c
+++ b/src/lib/merchant_api_get_instances.c
@@ -85,8 +85,8 @@ parse_instances (const json_t *json,
   struct TALER_MERCHANT_InstancesGetResponse igr = {
     .hr.http_status = MHD_HTTP_OK,
     .hr.reply = json,
-    .details.success.iis_length = iis_len,
-    .details.success.iis = iis
+    .details.ok.iis_length = iis_len,
+    .details.ok.iis = iis
   };
 
   ret = GNUNET_OK;
diff --git a/src/lib/merchant_api_get_products.c b/src/lib/merchant_api_get_products.c
index d13faf2d..98976237 100644
--- a/src/lib/merchant_api_get_products.c
+++ b/src/lib/merchant_api_get_products.c
@@ -109,8 +109,8 @@ parse_products (const json_t *json,
     struct TALER_MERCHANT_GetProductsResponse gpr = {
       .hr.http_status = MHD_HTTP_OK,
       .hr.reply = json,
-      .details.success.products_length = ies_len,
-      .details.success.products = ies
+      .details.ok.products_length = ies_len,
+      .details.ok.products = ies
     };
 
     pgh->cb (pgh->cb_cls,
diff --git a/src/lib/merchant_api_get_template.c b/src/lib/merchant_api_get_template.c
index f65f48ba..386026cf 100644
--- a/src/lib/merchant_api_get_template.c
+++ b/src/lib/merchant_api_get_template.c
@@ -96,12 +96,12 @@ handle_get_template_finished (void *cls,
       json_t *contract;
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_string ("template_description",
-                                 &tgr.details.success.template_description),
+                                 &tgr.details.ok.template_description),
         GNUNET_JSON_spec_uint32 ("pos_algorithm",
                                  &alg32),
         GNUNET_JSON_spec_mark_optional (
           GNUNET_JSON_spec_string ("pos_key",
-                                   &tgr.details.success.pos_key),
+                                   &tgr.details.ok.pos_key),
           NULL),
         GNUNET_JSON_spec_json ("template_contract",
                                &contract),
@@ -113,9 +113,9 @@ handle_get_template_finished (void *cls,
                              spec,
                              NULL, NULL))
       {
-        tgr.details.success.mca =
+        tgr.details.ok.mca =
           (enum TALER_MerchantConfirmationAlgorithm) alg32;
-        tgr.details.success.template_contract = contract;
+        tgr.details.ok.template_contract = contract;
         tgh->cb (tgh->cb_cls,
                  &tgr);
         GNUNET_JSON_parse_free (spec);
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);
   }
diff --git a/src/lib/merchant_api_merchant_get_tip.c b/src/lib/merchant_api_merchant_get_tip.c
index 7466fccc..59c4b588 100644
--- a/src/lib/merchant_api_merchant_get_tip.c
+++ b/src/lib/merchant_api_merchant_get_tip.c
@@ -94,8 +94,8 @@ parse_pickups (const json_t *pa,
       return GNUNET_SYSERR;
     }
   }
-  tsr->details.success.pickups_length = pa_len;
-  tsr->details.success.pickups = pickups;
+  tsr->details.ok.pickups_length = pa_len;
+  tsr->details.ok.pickups = pickups;
   tgh->cb (tgh->cb_cls,
            tsr);
   return GNUNET_OK;
@@ -132,15 +132,15 @@ handle_merchant_tip_get_finished (void *cls,
     {
       struct GNUNET_JSON_Specification spec[] = {
         TALER_JSON_spec_amount_any ("total_authorized",
-                                    &tsr.details.success.total_authorized),
+                                    &tsr.details.ok.total_authorized),
         TALER_JSON_spec_amount_any ("total_picked_up",
-                                    &tsr.details.success.total_picked_up),
+                                    &tsr.details.ok.total_picked_up),
         GNUNET_JSON_spec_string ("reason",
-                                 &tsr.details.success.reason),
+                                 &tsr.details.ok.reason),
         GNUNET_JSON_spec_timestamp ("expiration",
-                                    &tsr.details.success.expiration),
+                                    &tsr.details.ok.expiration),
         GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                     &tsr.details.success.reserve_pub),
+                                     &tsr.details.ok.reserve_pub),
         GNUNET_JSON_spec_end ()
       };
 
diff --git a/src/lib/merchant_api_post_order_pay.c b/src/lib/merchant_api_post_order_pay.c
index c631085c..aecc9fc4 100644
--- a/src/lib/merchant_api_post_order_pay.c
+++ b/src/lib/merchant_api_post_order_pay.c
@@ -403,11 +403,11 @@ handle_pay_finished (void *cls,
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_fixed_auto (
           "sig",
-          &pr.details.success.merchant_sig),
+          &pr.details.ok.merchant_sig),
         GNUNET_JSON_spec_mark_optional (
           GNUNET_JSON_spec_string (
             "pos_confirmation",
-            &pr.details.success.pos_confirmation),
+            &pr.details.ok.pos_confirmation),
           NULL),
         GNUNET_JSON_spec_end ()
       };
@@ -427,7 +427,7 @@ handle_pay_finished (void *cls,
       if (GNUNET_OK !=
           TALER_merchant_pay_verify (&oph->h_contract_terms,
                                      &oph->merchant_pub,
-                                     &pr.details.success.merchant_sig))
+                                     &pr.details.ok.merchant_sig))
       {
         GNUNET_break_op (0);
         pr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c
index ba1256b1..75ec2d6c 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -218,8 +218,8 @@ pickup_done_cb (void *cls,
     }
     else
     {
-      pd.details.success.num_sigs = num_blind_sigs;
-      pd.details.success.pcds = tp->pcds;
+      pd.details.ok.num_sigs = num_blind_sigs;
+      pd.details.ok.pcds = tp->pcds;
       tp->cb (tp->cb_cls,
               &pd);
     }
diff --git a/src/lib/merchant_api_wallet_get_order.c b/src/lib/merchant_api_wallet_get_order.c
index 61bed534..b0a4d9b9 100644
--- a/src/lib/merchant_api_wallet_get_order.c
+++ b/src/lib/merchant_api_wallet_get_order.c
@@ -116,11 +116,11 @@ handle_wallet_get_order_finished (void *cls,
       };
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_bool ("refunded",
-                               &owgr.details.success.refunded),
+                               &owgr.details.ok.refunded),
         GNUNET_JSON_spec_bool ("refund_pending",
-                               &owgr.details.success.refund_pending),
+                               &owgr.details.ok.refund_pending),
         TALER_JSON_spec_amount_any ("refund_amount",
-                                    &owgr.details.success.refund_amount),
+                                    &owgr.details.ok.refund_amount),
         GNUNET_JSON_spec_end ()
       };
 
diff --git a/src/lib/merchant_api_wallet_get_tip.c b/src/lib/merchant_api_wallet_get_tip.c
index 82fc990f..ee931d13 100644
--- a/src/lib/merchant_api_wallet_get_tip.c
+++ b/src/lib/merchant_api_wallet_get_tip.c
@@ -96,13 +96,13 @@ handle_wallet_tip_get_finished (void *cls,
     {
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_timestamp ("expiration",
-                                    &wgr.details.success.expiration),
+                                    &wgr.details.ok.expiration),
         GNUNET_JSON_spec_string ("exchange_url",
-                                 &wgr.details.success.exchange_url),
+                                 &wgr.details.ok.exchange_url),
         GNUNET_JSON_spec_string ("next_url",
-                                 &wgr.details.success.next_url),
+                                 &wgr.details.ok.next_url),
         TALER_JSON_spec_amount_any ("tip_amount",
-                                    &wgr.details.success.amount_remaining),
+                                    &wgr.details.ok.amount_remaining),
         GNUNET_JSON_spec_end ()
       };