rename .success to .ok for consistency

1 files changed, 16 insertions, 16 deletions

diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c
index 917a4a23..b9a8a954 100644
--- a/src/testing/testing_api_cmd_merchant_get_order.c
+++ b/src/testing/testing_api_cmd_merchant_get_order.c
@@ -156,14 +156,14 @@ merchant_get_order_cb (
   switch (osr->hr.http_status)
   {
   case MHD_HTTP_OK:
-    if (gos->osc != osr->details.success.status)
+    if (gos->osc != osr->details.ok.status)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Order paid does not match\n");
       TALER_TESTING_interpreter_fail (gos->is);
       return;
     }
-    switch (osr->details.success.status)
+    switch (osr->details.ok.status)
     {
     case TALER_MERCHANT_OSC_PAID:
       {
@@ -236,7 +236,7 @@ merchant_get_order_cb (
           }
 
           if (1 != json_equal (ct,
-                               osr->details.success.details.paid.contract_terms))
+                               osr->details.ok.details.paid.contract_terms))
           {
             GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                         "Order contract terms do not match\n");
@@ -246,14 +246,14 @@ merchant_get_order_cb (
 
           json_decref (ct);
         }
-        if (gos->wired != osr->details.success.details.paid.wired)
+        if (gos->wired != osr->details.ok.details.paid.wired)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Order wired does not match\n");
           TALER_TESTING_interpreter_fail (gos->is);
           return;
         }
-        if (gos->transfers_length != osr->details.success.details.paid.wts_len)
+        if (gos->transfers_length != osr->details.ok.details.paid.wts_len)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Number of transfers found does not match\n");
@@ -280,7 +280,7 @@ merchant_get_order_cb (
               return;
             }
             if (0 != GNUNET_memcmp (wtid,
-                                    &osr->details.success.details.paid.wts[i].
+                                    &osr->details.ok.details.paid.wts[i].
                                     wtid))
             {
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -302,7 +302,7 @@ merchant_get_order_cb (
               return;
             }
             if (0 != strcmp (*exchange_url,
-                             osr->details.success.details.paid.wts[i].
+                             osr->details.ok.details.paid.wts[i].
                              exchange_url))
             {
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -312,7 +312,7 @@ merchant_get_order_cb (
             }
           }
         }
-        if (gos->refunded != osr->details.success.details.paid.refunded)
+        if (gos->refunded != osr->details.ok.details.paid.refunded)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Order refunded does not match\n");
@@ -320,7 +320,7 @@ merchant_get_order_cb (
           return;
         }
         if (gos->refunds_length !=
-            osr->details.success.details.paid.refunds_len)
+            osr->details.ok.details.paid.refunds_len)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Number of refunds found does not match\n");
@@ -331,7 +331,7 @@ merchant_get_order_cb (
           GNUNET_assert (
             GNUNET_OK ==
             TALER_amount_set_zero (
-              osr->details.success.details.paid.refund_amount.currency,
+              osr->details.ok.details.paid.refund_amount.currency,
               &refunded_total));
         for (unsigned int i = 0; i < gos->refunds_length; ++i)
         {
@@ -343,7 +343,7 @@ merchant_get_order_cb (
           {
             const struct TALER_Amount *expected_amount;
             struct TALER_Amount *amount_found =
-              &osr->details.success.details.paid.refunds[i].refund_amount;
+              &osr->details.ok.details.paid.refunds[i].refund_amount;
 
             if (GNUNET_OK !=
                 TALER_TESTING_get_trait_amount (refund_cmd,
@@ -383,7 +383,7 @@ merchant_get_order_cb (
             }
             if (0 != strcmp (
                   *expected_reason,
-                  osr->details.success.details.paid.refunds[i].reason))
+                  osr->details.ok.details.paid.refunds[i].reason))
             {
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                           "Refund reason does not match\n");
@@ -393,7 +393,7 @@ merchant_get_order_cb (
           }
         }
 
-        if (gos->wired != osr->details.success.details.paid.wired)
+        if (gos->wired != osr->details.ok.details.paid.wired)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Order wired does not match\n");
@@ -414,12 +414,12 @@ merchant_get_order_cb (
 
         if (GNUNET_OK !=
             TALER_MERCHANT_parse_pay_uri (
-              osr->details.success.details.unpaid.taler_pay_uri,
+              osr->details.ok.details.unpaid.taler_pay_uri,
               &pud))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Taler pay uri `%s' is malformed\n",
-                      osr->details.success.details.unpaid.taler_pay_uri);
+                      osr->details.ok.details.unpaid.taler_pay_uri);
           TALER_TESTING_interpreter_fail (gos->is);
           return;
         }
@@ -472,7 +472,7 @@ merchant_get_order_cb (
           {
             GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                         "Order pay uri `%s' does not match, wanted %s/%s\n",
-                        osr->details.success.details.unpaid.taler_pay_uri,
+                        osr->details.ok.details.unpaid.taler_pay_uri,
                         host,
                         *order_id);
             TALER_TESTING_interpreter_fail (gos->is);