From 3f468773e71b68e9ceb5431e797941b1cc086e68 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 26 May 2016 15:23:46 +0200 Subject: [PATCH] change edate to wire_transfer_deadline/delay (#4521) --- src/exchange-lib/exchange_api_deposit.c | 2 +- src/exchange/taler-exchange-httpd_deposit.c | 2 +- src/exchangedb/test_exchangedb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/exchange-lib/exchange_api_deposit.c index f8c8367ea..4d13febf4 100644 --- a/src/exchange-lib/exchange_api_deposit.c +++ b/src/exchange-lib/exchange_api_deposit.c @@ -457,7 +457,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange, "transaction_id", (json_int_t) transaction_id, "merchant_pub", GNUNET_JSON_from_data_auto (merchant_pub), "refund_deadline", GNUNET_JSON_from_time_abs (refund_deadline), - "edate", GNUNET_JSON_from_time_abs (wire_deadline), + "wire_transfer_deadline", GNUNET_JSON_from_time_abs (wire_deadline), "coin_sig", GNUNET_JSON_from_data_auto (coin_sig) ); diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index 08f4d227d..c59f9a6ae 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -157,7 +157,7 @@ TMH_DEPOSIT_handler_deposit (struct TMH_RequestHandler *rh, GNUNET_JSON_spec_uint64 ("transaction_id", &deposit.transaction_id), GNUNET_JSON_spec_absolute_time ("timestamp", &deposit.timestamp), GNUNET_JSON_spec_absolute_time ("refund_deadline", &deposit.refund_deadline), - GNUNET_JSON_spec_absolute_time ("edate", &deposit.wire_deadline), + GNUNET_JSON_spec_absolute_time ("wire_transfer_deadline", &deposit.wire_deadline), GNUNET_JSON_spec_end () }; diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index d9c04b8c1..355ef6a87 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -1009,7 +1009,7 @@ run (void *cls) \"IBAN\":\"DE67830654080004822650\", \ \"name\":\"GNUnet e.V.\", \ \"bic\":\"GENODEF1SLR\", \ -\"edate\":\"1449930207000\", \ +\"wire_transfer_deadline\":\"1449930207000\", \ \"r\":123456789, \ \"address\": \"foobar\"}"; unsigned int cnt;