taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change edate to wire_transfer_deadline/delay (#4521)

Browse Source
This commit is contained in:
Christian Grothoff 2016-05-26 15:23:46 +02:00
parent 951ce5ef32
commit 3f468773e7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange-lib/exchange_api_deposit.c
View File

@ -457,7 +457,7 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange,
"transaction_id", (json_int_t) transaction_id, "transaction_id", (json_int_t) transaction_id,
"merchant_pub", GNUNET_JSON_from_data_auto (merchant_pub), "merchant_pub", GNUNET_JSON_from_data_auto (merchant_pub),
"refund_deadline", GNUNET_JSON_from_time_abs (refund_deadline), "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) "coin_sig", GNUNET_JSON_from_data_auto (coin_sig)
); );

2
src/exchange/taler-exchange-httpd_deposit.c
View File

@ -157,7 +157,7 @@ TMH_DEPOSIT_handler_deposit (struct TMH_RequestHandler *rh,
GNUNET_JSON_spec_uint64 ("transaction_id", &deposit.transaction_id), GNUNET_JSON_spec_uint64 ("transaction_id", &deposit.transaction_id),
GNUNET_JSON_spec_absolute_time ("timestamp", &deposit.timestamp), GNUNET_JSON_spec_absolute_time ("timestamp", &deposit.timestamp),
GNUNET_JSON_spec_absolute_time ("refund_deadline", &deposit.refund_deadline), 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 () GNUNET_JSON_spec_end ()
}; };

2
src/exchangedb/test_exchangedb.c
View File

@ -1009,7 +1009,7 @@ run (void *cls)
\"IBAN\":\"DE67830654080004822650\", \ \"IBAN\":\"DE67830654080004822650\", \
\"name\":\"GNUnet e.V.\", \ \"name\":\"GNUnet e.V.\", \
\"bic\":\"GENODEF1SLR\", \ \"bic\":\"GENODEF1SLR\", \
\"edate\":\"1449930207000\", \ \"wire_transfer_deadline\":\"1449930207000\", \
\"r\":123456789, \ \"r\":123456789, \
\"address\": \"foobar\"}"; \"address\": \"foobar\"}";
unsigned int cnt; unsigned int cnt;