diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 11:51:50 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 11:51:50 +0100 |
| commit | d1bcef56490ebcc6a5b6c9ee464590d6c7e1ea94 (patch) | |
| tree | 12532d28bedf7a27e90f7e2e101af7d5e27d7439 | |
| parent | d99e30afaf337da28b527785cebc7aa22731e357 (diff) | |
| download | merchant-d1bcef56490ebcc6a5b6c9ee464590d6c7e1ea94.tar.gz merchant-d1bcef56490ebcc6a5b6c9ee464590d6c7e1ea94.tar.bz2 merchant-d1bcef56490ebcc6a5b6c9ee464590d6c7e1ea94.zip | |
various fixes
| -rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index c157b859..e4b556a4 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -166,7 +166,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh, "contract", root, "sig", TALER_json_from_data (&contract_sig, sizeof (contract_sig)), - "h_contract", TALER_json_from_data + "H_contract", TALER_json_from_data (&contract.h_contract, sizeof (contract.h_contract))); diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 6a9c4af2..028f50ad 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -87,16 +87,16 @@ deposit_fee_from_coin_aggregate (struct MHD_Connection *connection, if (1 == mints[mint_index].pending) return GNUNET_SYSERR; keys = TALER_MINT_get_keys (mints[mint_index].conn); - - if (NULL == - (denom_details = TALER_MINT_get_denomination_key (keys, &denom))) + denom_details = TALER_MINT_get_denomination_key (keys, &denom); + if (NULL == denom_details) + { TMH_RESPONSE_reply_json_pack (connection, MHD_HTTP_BAD_REQUEST, "{s:s, s:o}", "hint", "unknown denom to mint", "denom_pub", TALER_json_from_rsa_public_key (denom.rsa_public_key)); return GNUNET_NO; - + } *deposit_fee = denom_details->fee_deposit; return GNUNET_OK; } @@ -158,7 +158,6 @@ MH_handler_pay (struct TMH_RequestHandler *rh, struct GNUNET_TIME_Absolute edate; struct GNUNET_TIME_Absolute timestamp; struct GNUNET_TIME_Absolute refund_deadline; - struct GNUNET_TIME_Absolute wire_deadline; struct TALER_MerchantPublicKeyP pubkey; struct TALER_CoinSpendPublicKeyP coin_pub; struct TALER_DenominationPublicKey denom_pub; @@ -172,7 +171,6 @@ MH_handler_pay (struct TMH_RequestHandler *rh, TMH_PARSE_member_amount ("max_fee", &max_fee), TMH_PARSE_member_time_abs ("timestamp", ×tamp), TMH_PARSE_member_time_abs ("refund_deadline", &refund_deadline), - TMH_PARSE_member_time_abs ("edate", &wire_deadline), TMH_PARSE_member_uint64 ("transaction_id", &transaction_id), TMH_PARSE_member_fixed ("H_contract", &h_contract), TMH_PARSE_MEMBER_END @@ -272,6 +270,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, &coin_fee); } + if (-1 == TALER_amount_cmp (&max_fee, &acc_fee)) return MHD_HTTP_NOT_ACCEPTABLE; @@ -327,7 +326,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, dh = TALER_MINT_deposit (mints[mint_index].conn, &amount, - wire_deadline, + edate, wire_details, &h_contract, &coin_pub, |