-json pack refactoring

1 files changed, 9 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index 51b49f5..f4156d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1577,14 +1577,15 @@ launch_payment (struct Product *product)
   }
   else
   {
-    orderReq = json_pack ("{ s:s, s:o, s:s, s:o }",
-                          "summary",
-                          product->description,
-                          "amount", TALER_JSON_from_amount (&product->price),
-                          "fulfillment_message", msg,
-                          "auto_refund", GNUNET_JSON_from_time_rel (
-                            MAX_REFUND_DELAY)
-                          );
+    orderReq = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("summary",
+                               product->description),
+      TALER_JSON_pack_amount ("amount",
+                              &product->price),
+      GNUNET_JSON_pack_string ("fulfillment_message",
+                               msg),
+      GNUNET_JSON_pack_time_rel ("auto_refund",
+                                 MAX_REFUND_DELAY));
   }
   GNUNET_free (msg);
   if (NULL == orderReq)