diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-12-14 17:47:45 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-12-14 17:47:45 +0100 |
| commit | cb0bdc2223b79abdc17d1058b642ca6eb8c3880d (patch) | |
| tree | 20e5eef1cf32ea0a94a1ddcc81d791da6063af7e | |
| parent | 25111b5197111d037f836d298221c8ea9dad2d5e (diff) | |
| download | merchant-cb0bdc2223b79abdc17d1058b642ca6eb8c3880d.tar.gz merchant-cb0bdc2223b79abdc17d1058b642ca6eb8c3880d.tar.bz2 merchant-cb0bdc2223b79abdc17d1058b642ca6eb8c3880d.zip | |
fixing #4085
| -rw-r--r-- | src/backend/merchant.conf | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 99d30b22..80a7b412 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -46,7 +46,6 @@ PUBLIC_KEY = 9QXF7XY7E9VPV47B5Z806NDFSX2VJ79SVHHD29QEQ3BG31ANHZ60 [merchantdb-postgres] CONFIG = postgres:///talerdemo - # "wire-" sections include wire details, here for SEPA. [wire-sepa] IBAN = DE67830654080004822650 diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index 93292c87..b490f788 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -68,6 +68,10 @@ MH_handler_contract (struct TMH_RequestHandler *rh, if ((GNUNET_NO == res) || (NULL == root)) return MHD_YES; + if (GNUNET_OK != TALER_hash_json (j_wire, &h_wire)) + return TMH_RESPONSE_reply_internal_error (connection, + "failed to hash wire details"); + /* add fields to the "root" that the backend should provide */ json_object_set (root, "mints", diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index f50488dc..779ce91c 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -674,6 +674,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, return TMH_RESPONSE_reply_external_error (connection, "no coins given"); } + /* note: 1 coin = 1 deposit confirmation expected */ pc->dc = GNUNET_new_array (pc->coins_cnt, struct MERCHANT_DepositConfirmation); |