breaking protocol changes towards fixing #7810 (incomplete, taler-exchange-offline still unfinished)

1 files changed, 32 insertions, 35 deletions

diff --git a/src/lib/exchange_api_recoup_refresh.c b/src/lib/exchange_api_recoup_refresh.c
index 00eeca070..7b42aa7eb 100644
--- a/src/lib/exchange_api_recoup_refresh.c
+++ b/src/lib/exchange_api_recoup_refresh.c
@@ -101,16 +101,15 @@ process_recoup_response (
   const struct TALER_EXCHANGE_RecoupRefreshHandle *ph,
   const json_t *json)
 {
-  struct TALER_CoinSpendPublicKeyP old_coin_pub;
+  struct TALER_EXCHANGE_RecoupRefreshResponse rrr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
   struct GNUNET_JSON_Specification spec_refresh[] = {
     GNUNET_JSON_spec_fixed_auto ("old_coin_pub",
-                                 &old_coin_pub),
+                                 &rrr.details.ok.old_coin_pub),
     GNUNET_JSON_spec_end ()
   };
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = json,
-    .http_status = MHD_HTTP_OK
-  };
 
   if (GNUNET_OK !=
       GNUNET_JSON_parse (json,
@@ -121,8 +120,7 @@ process_recoup_response (
     return GNUNET_SYSERR;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          &old_coin_pub);
+          &rrr);
   return GNUNET_OK;
 }
 
@@ -142,9 +140,9 @@ handle_recoup_refresh_finished (void *cls,
 {
   struct TALER_EXCHANGE_RecoupRefreshHandle *ph = cls;
   const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_RecoupRefreshResponse rrr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
   };
   const struct TALER_EXCHANGE_Keys *keys;
 
@@ -153,7 +151,7 @@ handle_recoup_refresh_finished (void *cls,
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rrr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
@@ -161,8 +159,8 @@ handle_recoup_refresh_finished (void *cls,
                                  j))
     {
       GNUNET_break_op (0);
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      hr.http_status = 0;
+      rrr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      rrr.hr.http_status = 0;
       break;
     }
     TALER_EXCHANGE_recoup_refresh_cancel (ph);
@@ -170,35 +168,35 @@ handle_recoup_refresh_finished (void *cls,
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the exchange is buggy
        (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_CONFLICT:
     {
       struct TALER_Amount min_key;
 
-      hr.ec = TALER_JSON_get_error_code (j);
-      hr.hint = TALER_JSON_get_error_hint (j);
+      rrr.hr.ec = TALER_JSON_get_error_code (j);
+      rrr.hr.hint = TALER_JSON_get_error_hint (j);
       if (GNUNET_OK !=
           TALER_EXCHANGE_get_min_denomination_ (keys,
                                                 &min_key))
       {
         GNUNET_break (0);
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        hr.http_status = 0;
+        rrr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        rrr.hr.http_status = 0;
         break;
       }
       if (GNUNET_OK !=
@@ -211,8 +209,8 @@ handle_recoup_refresh_finished (void *cls,
             &min_key))
       {
         GNUNET_break (0);
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        hr.http_status = 0;
+        rrr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        rrr.hr.http_status = 0;
         break;
       }
       break;
@@ -220,29 +218,28 @@ handle_recoup_refresh_finished (void *cls,
   case MHD_HTTP_GONE:
     /* Kind of normal: the money was already sent to the merchant
        (it was too late for the refund). */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   default:
     /* unexpected response code */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange recoup\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rrr.hr.ec);
     GNUNET_break (0);
     break;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          NULL);
+          &rrr);
   TALER_EXCHANGE_recoup_refresh_cancel (ph);
 }