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

fix use of struct TALER_DepositConfirmationPS

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-28 17:21:51 +01:00
parent 3c87b1a0b3
commit cf13997ffc
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mint/taler-mint-httpd_db.c
View File

@ -130,6 +130,7 @@ TMH_DB_execute_deposit (struct MHD_Connection *connection,
&deposit->h_wire, &deposit->h_wire,
&deposit->h_contract, &deposit->h_contract,
deposit->transaction_id, deposit->transaction_id,
deposit->refund_deadline,
&deposit->merchant_pub, &deposit->merchant_pub,
&amount_without_fee); &amount_without_fee);
} }
@ -201,6 +202,7 @@ TMH_DB_execute_deposit (struct MHD_Connection *connection,
&deposit->h_wire, &deposit->h_wire,
&deposit->h_contract, &deposit->h_contract,
deposit->transaction_id, deposit->transaction_id,
deposit->refund_deadline,
&deposit->merchant_pub, &deposit->merchant_pub,
&deposit->amount_with_fee); &deposit->amount_with_fee);
} }

4
src/mint/taler-mint-httpd_responses.c
View File

@ -276,6 +276,7 @@ TMH_RESPONSE_reply_invalid_json (struct MHD_Connection *connection)
* @param h_wire hash of wire details * @param h_wire hash of wire details
* @param h_contract hash of contract details * @param h_contract hash of contract details
* @param transaction_id transaction ID * @param transaction_id transaction ID
* @param refund_deadline until when this deposit be refunded
* @param merchant merchant public key * @param merchant merchant public key
* @param amount_without_fee fraction of coin value to deposit, without the fee * @param amount_without_fee fraction of coin value to deposit, without the fee
* @return MHD result code * @return MHD result code
@ -286,6 +287,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
const struct GNUNET_HashCode *h_wire, const struct GNUNET_HashCode *h_wire,
const struct GNUNET_HashCode *h_contract, const struct GNUNET_HashCode *h_contract,
uint64_t transaction_id, uint64_t transaction_id,
struct GNUNET_TIME_Absolute refund_deadline,
const struct TALER_MerchantPublicKeyP *merchant, const struct TALER_MerchantPublicKeyP *merchant,
const struct TALER_Amount *amount_without_fee) const struct TALER_Amount *amount_without_fee)
{ {
@ -299,6 +301,8 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
dc.h_contract = *h_contract; dc.h_contract = *h_contract;
dc.h_wire = *h_wire; dc.h_wire = *h_wire;
dc.transaction_id = GNUNET_htonll (transaction_id); dc.transaction_id = GNUNET_htonll (transaction_id);
dc.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
dc.refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline);
TALER_amount_hton (&dc.amount_without_fee, TALER_amount_hton (&dc.amount_without_fee,
amount_without_fee); amount_without_fee);
dc.coin_pub = *coin_pub; dc.coin_pub = *coin_pub;

3
src/mint/taler-mint-httpd_responses.h
View File

@ -179,6 +179,7 @@ TMH_RESPONSE_reply_invalid_json (struct MHD_Connection *connection);
* @param h_wire hash of wire details * @param h_wire hash of wire details
* @param h_contract hash of contract details * @param h_contract hash of contract details
* @param transaction_id transaction ID * @param transaction_id transaction ID
* @param refund_deadline until when this deposit be refunded
* @param merchant merchant public key * @param merchant merchant public key
* @param amount_without_fee fraction of coin value to deposit (without fee) * @param amount_without_fee fraction of coin value to deposit (without fee)
* @return MHD result code * @return MHD result code
@ -189,7 +190,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
const struct GNUNET_HashCode *h_wire, const struct GNUNET_HashCode *h_wire,
const struct GNUNET_HashCode *h_contract, const struct GNUNET_HashCode *h_contract,
uint64_t transaction_id, uint64_t transaction_id,
const struct TALER_MerchantPublicKeyP *merchant, struct GNUNET_TIME_Absolute refund_deadline, const struct TALER_MerchantPublicKeyP *merchant,
const struct TALER_Amount *amount_without_fee); const struct TALER_Amount *amount_without_fee);