summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/merchant_api_get_instance.c8
-rw-r--r--src/lib/merchant_api_get_orders.c4
-rw-r--r--src/lib/merchant_api_get_product.c4
-rw-r--r--src/lib/merchant_api_get_reserve.c8
-rw-r--r--src/lib/merchant_api_get_reserves.c8
-rw-r--r--src/lib/merchant_api_get_transfers.c4
-rw-r--r--src/lib/merchant_api_merchant_get_order.c8
-rw-r--r--src/lib/merchant_api_merchant_get_tip.c4
-rw-r--r--src/lib/merchant_api_post_transfers.c4
-rw-r--r--src/lib/merchant_api_tip_authorize.c2
-rw-r--r--src/lib/merchant_api_wallet_get_tip.c4
11 files changed, 29 insertions, 29 deletions
diff --git a/src/lib/merchant_api_get_instance.c b/src/lib/merchant_api_get_instance.c
index 0007fb7f..af93b53c 100644
--- a/src/lib/merchant_api_get_instance.c
+++ b/src/lib/merchant_api_get_instance.c
@@ -118,10 +118,10 @@ handle_get_instance_finished (void *cls,
&default_wire_fee_amortization),
TALER_JSON_spec_amount ("default_max_deposit_fee",
&default_max_deposit_fee),
- GNUNET_JSON_spec_relative_time ("default_wire_transfer_delay",
- &default_wire_transfer_delay),
- GNUNET_JSON_spec_relative_time ("default_pay_delay",
- &default_pay_delay),
+ TALER_JSON_spec_relative_time ("default_wire_transfer_delay",
+ &default_wire_transfer_delay),
+ TALER_JSON_spec_relative_time ("default_pay_delay",
+ &default_pay_delay),
GNUNET_JSON_spec_end ()
};
diff --git a/src/lib/merchant_api_get_orders.c b/src/lib/merchant_api_get_orders.c
index df96c57a..2f18a6a1 100644
--- a/src/lib/merchant_api_get_orders.c
+++ b/src/lib/merchant_api_get_orders.c
@@ -86,8 +86,8 @@ parse_orders (const json_t *ia,
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("order_id",
&ie->order_id),
- GNUNET_JSON_spec_absolute_time ("timestamp",
- &ie->timestamp),
+ TALER_JSON_spec_absolute_time ("timestamp",
+ &ie->timestamp),
GNUNET_JSON_spec_uint64 ("row_id",
&ie->order_serial),
GNUNET_JSON_spec_end ()
diff --git a/src/lib/merchant_api_get_product.c b/src/lib/merchant_api_get_product.c
index e9263b07..bc83c861 100644
--- a/src/lib/merchant_api_get_product.c
+++ b/src/lib/merchant_api_get_product.c
@@ -132,8 +132,8 @@ handle_get_product_finished (void *cls,
"next_restock"))
{
struct GNUNET_JSON_Specification spect[] = {
- GNUNET_JSON_spec_absolute_time ("next_restock",
- &next_restock),
+ TALER_JSON_spec_absolute_time ("next_restock",
+ &next_restock),
GNUNET_JSON_spec_end ()
};
diff --git a/src/lib/merchant_api_get_reserve.c b/src/lib/merchant_api_get_reserve.c
index 3ff14d41..a30b4558 100644
--- a/src/lib/merchant_api_get_reserve.c
+++ b/src/lib/merchant_api_get_reserve.c
@@ -96,10 +96,10 @@ handle_reserve_get_finished (void *cls,
struct TALER_MERCHANT_ReserveSummary rs;
const json_t *tips;
struct GNUNET_JSON_Specification spec[] = {
- GNUNET_JSON_spec_absolute_time ("creation_time",
- &rs.creation_time),
- GNUNET_JSON_spec_absolute_time ("expiration_time",
- &rs.expiration_time),
+ TALER_JSON_spec_absolute_time ("creation_time",
+ &rs.creation_time),
+ TALER_JSON_spec_absolute_time ("expiration_time",
+ &rs.expiration_time),
GNUNET_JSON_spec_bool ("active",
&active),
TALER_JSON_spec_amount ("merchant_initial_amount",
diff --git a/src/lib/merchant_api_get_reserves.c b/src/lib/merchant_api_get_reserves.c
index f524514a..428bc81c 100644
--- a/src/lib/merchant_api_get_reserves.c
+++ b/src/lib/merchant_api_get_reserves.c
@@ -134,10 +134,10 @@ handle_reserves_get_finished (void *cls,
struct GNUNET_JSON_Specification ispec[] = {
GNUNET_JSON_spec_fixed_auto ("reserve_pub",
&rd->reserve_pub),
- GNUNET_JSON_spec_absolute_time ("creation_time",
- &rd->creation_time),
- GNUNET_JSON_spec_absolute_time ("expiration_time",
- &rd->expiration_time),
+ TALER_JSON_spec_absolute_time ("creation_time",
+ &rd->creation_time),
+ TALER_JSON_spec_absolute_time ("expiration_time",
+ &rd->expiration_time),
TALER_JSON_spec_amount ("merchant_initial_amount",
&rd->merchant_initial_amount),
TALER_JSON_spec_amount ("exchange_initial_amount",
diff --git a/src/lib/merchant_api_get_transfers.c b/src/lib/merchant_api_get_transfers.c
index 5d08dba1..859d97be 100644
--- a/src/lib/merchant_api_get_transfers.c
+++ b/src/lib/merchant_api_get_transfers.c
@@ -144,8 +144,8 @@ handle_transfers_get_finished (void *cls,
&td->exchange_url),
GNUNET_JSON_spec_uint64 ("transfer_serial_id",
&td->credit_serial),
- GNUNET_JSON_spec_absolute_time ("execution_time",
- &td->execution_time),
+ TALER_JSON_spec_absolute_time ("execution_time",
+ &td->execution_time),
GNUNET_JSON_spec_bool ("verified",
&td->verified),
GNUNET_JSON_spec_bool ("confirmed",
diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c
index edd00f7a..53811ec1 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -198,8 +198,8 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
&wt->exchange_url),
GNUNET_JSON_spec_fixed_auto ("wtid",
&wt->wtid),
- GNUNET_JSON_spec_absolute_time ("execution_time",
- &wt->execution_time),
+ TALER_JSON_spec_absolute_time ("execution_time",
+ &wt->execution_time),
TALER_JSON_spec_amount ("amount",
&wt->total_amount),
GNUNET_JSON_spec_bool ("confirmed",
@@ -273,8 +273,8 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh,
&ro->refund_amount),
GNUNET_JSON_spec_string ("reason",
&ro->reason),
- GNUNET_JSON_spec_absolute_time ("timestamp",
- &ro->refund_time),
+ TALER_JSON_spec_absolute_time ("timestamp",
+ &ro->refund_time),
GNUNET_JSON_spec_end ()
};
diff --git a/src/lib/merchant_api_merchant_get_tip.c b/src/lib/merchant_api_merchant_get_tip.c
index 5ecd65ee..e1f0f23e 100644
--- a/src/lib/merchant_api_merchant_get_tip.c
+++ b/src/lib/merchant_api_merchant_get_tip.c
@@ -158,8 +158,8 @@ handle_merchant_tip_get_finished (void *cls,
&total_picked_up),
GNUNET_JSON_spec_string ("reason",
&reason),
- GNUNET_JSON_spec_absolute_time ("expiration",
- &expiration),
+ TALER_JSON_spec_absolute_time ("expiration",
+ &expiration),
GNUNET_JSON_spec_fixed_auto ("reserve_pub",
&reserve_pub),
GNUNET_JSON_spec_end ()
diff --git a/src/lib/merchant_api_post_transfers.c b/src/lib/merchant_api_post_transfers.c
index f9ea25dc..16f636b4 100644
--- a/src/lib/merchant_api_post_transfers.c
+++ b/src/lib/merchant_api_post_transfers.c
@@ -106,8 +106,8 @@ handle_post_transfers_finished (void *cls,
&total),
TALER_JSON_spec_amount ("wire_fee",
&wire_fee),
- GNUNET_JSON_spec_absolute_time ("execution_time",
- &execution_time),
+ TALER_JSON_spec_absolute_time ("execution_time",
+ &execution_time),
GNUNET_JSON_spec_json ("deposit_sums",
&deposit_sums),
GNUNET_JSON_spec_end ()
diff --git a/src/lib/merchant_api_tip_authorize.c b/src/lib/merchant_api_tip_authorize.c
index 01d369f6..d2f4cd9a 100644
--- a/src/lib/merchant_api_tip_authorize.c
+++ b/src/lib/merchant_api_tip_authorize.c
@@ -88,7 +88,7 @@ check_ok (struct TALER_MERCHANT_TipAuthorizeHandle *tao,
struct GNUNET_TIME_Absolute expiration_time;
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("tip_redirect_url", &taler_tip_url),
- GNUNET_JSON_spec_absolute_time ("tip_expiration", &expiration_time),
+ TALER_JSON_spec_absolute_time ("tip_expiration", &expiration_time),
GNUNET_JSON_spec_fixed_auto ("tip_id", &tip_id),
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 f0fae967..d50b961c 100644
--- a/src/lib/merchant_api_wallet_get_tip.c
+++ b/src/lib/merchant_api_wallet_get_tip.c
@@ -96,8 +96,8 @@ handle_wallet_tip_get_finished (void *cls,
struct TALER_Amount amount_remaining;
struct GNUNET_TIME_Absolute expiration;
struct GNUNET_JSON_Specification spec[] = {
- GNUNET_JSON_spec_absolute_time ("expiration",
- &expiration),
+ TALER_JSON_spec_absolute_time ("expiration",
+ &expiration),
GNUNET_JSON_spec_string ("exchange_url",
&exchange_url),
TALER_JSON_spec_amount ("tip_amount",
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 13:05:19 +0000