diff options
Diffstat (limited to 'src/backend')
9 files changed, 40 insertions, 40 deletions
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index cf607fcc..d22c5a75 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -1679,14 +1679,14 @@ parse_pay (struct MHD_Connection *connection, /* Get details from contract and check fundamentals */ { struct GNUNET_JSON_Specification espec[] = { - GNUNET_JSON_spec_absolute_time ("refund_deadline", - &pc->refund_deadline), - GNUNET_JSON_spec_absolute_time ("pay_deadline", - &pc->pay_deadline), - GNUNET_JSON_spec_absolute_time ("wire_transfer_deadline", - &pc->wire_transfer_deadline), - GNUNET_JSON_spec_absolute_time ("timestamp", - &pc->timestamp), + TALER_JSON_spec_absolute_time ("refund_deadline", + &pc->refund_deadline), + TALER_JSON_spec_absolute_time ("pay_deadline", + &pc->pay_deadline), + TALER_JSON_spec_absolute_time ("wire_transfer_deadline", + &pc->wire_transfer_deadline), + TALER_JSON_spec_absolute_time ("timestamp", + &pc->timestamp), TALER_JSON_spec_amount ("max_fee", &pc->max_fee), TALER_JSON_spec_amount ("amount", diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index e983273a..d637f5cf 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -1095,8 +1095,8 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, GNUNET_break (qs >= 0); /* just warn if transaction failed */ { struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_absolute_time ("timestamp", - ×tamp), + TALER_JSON_spec_absolute_time ("timestamp", + ×tamp), GNUNET_JSON_spec_end () }; enum GNUNET_GenericReturnValue res; diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c index b00e9595..45abd398 100644 --- a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c +++ b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c @@ -81,10 +81,10 @@ TMH_private_patch_instances_ID (const struct TMH_RequestHandler *rh, &is.default_max_wire_fee), GNUNET_JSON_spec_uint32 ("default_wire_fee_amortization", &is.default_wire_fee_amortization), - GNUNET_JSON_spec_relative_time ("default_wire_transfer_delay", - &is.default_wire_transfer_delay), - GNUNET_JSON_spec_relative_time ("default_pay_delay", - &is.default_pay_delay), + TALER_JSON_spec_relative_time ("default_wire_transfer_delay", + &is.default_wire_transfer_delay), + TALER_JSON_spec_relative_time ("default_pay_delay", + &is.default_pay_delay), GNUNET_JSON_spec_end () }; enum GNUNET_DB_QueryStatus qs; diff --git a/src/backend/taler-merchant-httpd_private-patch-products-ID.c b/src/backend/taler-merchant-httpd_private-patch-products-ID.c index 6bbaba2a..e8c08359 100644 --- a/src/backend/taler-merchant-httpd_private-patch-products-ID.c +++ b/src/backend/taler-merchant-httpd_private-patch-products-ID.c @@ -147,8 +147,8 @@ TMH_private_patch_products_ID (const struct TMH_RequestHandler *rh, &total_stock), GNUNET_JSON_spec_uint64 ("total_lost", &pd.total_lost), - GNUNET_JSON_spec_absolute_time ("next_restock", - &pd.next_restock), + TALER_JSON_spec_absolute_time ("next_restock", + &pd.next_restock), GNUNET_JSON_spec_end () }; @@ -175,8 +175,8 @@ TMH_private_patch_products_ID (const struct TMH_RequestHandler *rh, { enum GNUNET_GenericReturnValue res; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_absolute_time ("next_restock", - &pd.next_restock), + TALER_JSON_spec_absolute_time ("next_restock", + &pd.next_restock), GNUNET_JSON_spec_end () }; diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c b/src/backend/taler-merchant-httpd_private-post-instances.c index 350a8eae..2320cd7b 100644 --- a/src/backend/taler-merchant-httpd_private-post-instances.c +++ b/src/backend/taler-merchant-httpd_private-post-instances.c @@ -161,10 +161,10 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, &is.default_max_wire_fee), GNUNET_JSON_spec_uint32 ("default_wire_fee_amortization", &is.default_wire_fee_amortization), - GNUNET_JSON_spec_relative_time ("default_wire_transfer_delay", - &is.default_wire_transfer_delay), - GNUNET_JSON_spec_relative_time ("default_pay_delay", - &is.default_pay_delay), + TALER_JSON_spec_relative_time ("default_wire_transfer_delay", + &is.default_wire_transfer_delay), + TALER_JSON_spec_relative_time ("default_pay_delay", + &is.default_pay_delay), GNUNET_JSON_spec_end () }; diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c index 39f8ce9e..bd90bf64 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c +++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c @@ -1179,10 +1179,10 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh, { struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_absolute_time ("refund_deadline", - &tctx->refund_deadline), - GNUNET_JSON_spec_absolute_time ("timestamp", - &tctx->timestamp), + TALER_JSON_spec_absolute_time ("refund_deadline", + &tctx->refund_deadline), + TALER_JSON_spec_absolute_time ("timestamp", + &tctx->timestamp), TALER_JSON_spec_amount ("amount", &tctx->total_amount), GNUNET_JSON_spec_fixed_auto ("h_wire", diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index 2772aef5..06fd562b 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -338,14 +338,14 @@ execute_order (struct MHD_Connection *connection, &products), GNUNET_JSON_spec_json ("merchant", &merchant), - GNUNET_JSON_spec_absolute_time ("timestamp", - ×tamp), - GNUNET_JSON_spec_absolute_time ("refund_deadline", - &refund_deadline), - GNUNET_JSON_spec_absolute_time ("pay_deadline", - &pay_deadline), - GNUNET_JSON_spec_absolute_time ("wire_transfer_deadline", - &wire_transfer_deadline), + TALER_JSON_spec_absolute_time ("timestamp", + ×tamp), + TALER_JSON_spec_absolute_time ("refund_deadline", + &refund_deadline), + TALER_JSON_spec_absolute_time ("pay_deadline", + &pay_deadline), + TALER_JSON_spec_absolute_time ("wire_transfer_deadline", + &wire_transfer_deadline), GNUNET_JSON_spec_end () }; enum GNUNET_DB_QueryStatus qs; diff --git a/src/backend/taler-merchant-httpd_private-post-products-ID-lock.c b/src/backend/taler-merchant-httpd_private-post-products-ID-lock.c index ddd891a6..aac8b8c9 100644 --- a/src/backend/taler-merchant-httpd_private-post-products-ID-lock.c +++ b/src/backend/taler-merchant-httpd_private-post-products-ID-lock.c @@ -51,8 +51,8 @@ TMH_private_post_products_ID_lock (const struct TMH_RequestHandler *rh, &uuid), GNUNET_JSON_spec_uint32 ("quantity", &quantity), - GNUNET_JSON_spec_relative_time ("duration", - &duration), + TALER_JSON_spec_relative_time ("duration", + &duration), GNUNET_JSON_spec_end () }; diff --git a/src/backend/taler-merchant-httpd_private-post-products.c b/src/backend/taler-merchant-httpd_private-post-products.c index c291845a..688a1aad 100644 --- a/src/backend/taler-merchant-httpd_private-post-products.c +++ b/src/backend/taler-merchant-httpd_private-post-products.c @@ -105,8 +105,8 @@ TMH_private_post_products (const struct TMH_RequestHandler *rh, &pd.address), GNUNET_JSON_spec_int64 ("total_stock", &total_stock), - GNUNET_JSON_spec_absolute_time ("next_restock", - &pd.next_restock), + TALER_JSON_spec_absolute_time ("next_restock", + &pd.next_restock), GNUNET_JSON_spec_end () }; @@ -132,8 +132,8 @@ TMH_private_post_products (const struct TMH_RequestHandler *rh, { enum GNUNET_GenericReturnValue res; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_absolute_time ("next_restock", - &pd.next_restock), + TALER_JSON_spec_absolute_time ("next_restock", + &pd.next_restock), GNUNET_JSON_spec_end () }; |