diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-06-21 23:52:30 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-06-21 23:52:30 +0200 |
| commit | 5d3bfab13a189a5f8a94ccadf257a6a612e618dc (patch) | |
| tree | 696f6b036c78044f057ea77ca7754744f7dc8dfa /src/backend/taler-merchant-httpd_private-post-transfers.c | |
| parent | e5c81bcae0e402877fc9b6c54f91ef9ef3267b67 (diff) | |
| download | merchant-5d3bfab13a189a5f8a94ccadf257a6a612e618dc.tar.gz merchant-5d3bfab13a189a5f8a94ccadf257a6a612e618dc.tar.bz2 merchant-5d3bfab13a189a5f8a94ccadf257a6a612e618dc.zip | |
add missing notifications to private-get-orders long poller
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-transfers.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-transfers.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c index 23bb08e7..042825be 100644 --- a/src/backend/taler-merchant-httpd_private-post-transfers.c +++ b/src/backend/taler-merchant-httpd_private-post-transfers.c @@ -322,9 +322,9 @@ check_transfer (void *cls, GNUNET_JSON_from_data_auto (&ttd->coin_pub), "h_wire", GNUNET_JSON_from_data_auto (h_wire), - "exchange_sig", + "deposit_exchange_sig", GNUNET_JSON_from_data_auto (exchange_sig), - "exchange_pub", + "deposit_exchange_pub", GNUNET_JSON_from_data_auto (exchange_pub), /* first block of 5 */ "h_contract_terms", @@ -399,15 +399,12 @@ check_wire_fee (struct PostTransfersContext *ptc, return GNUNET_OK; /* expected_fee >= wire_fee */ } /* Wire fee check failed, export proof to client */ - /* FIXME: This is not actually the *full* proof, as we are - not including the exchange's bogus response with the - signature claiming a different wire fee. Also, this - error is not described in the API docs! */ ptc->response_code = MHD_HTTP_ACCEPTED; ptc->response = TALER_MHD_make_json_pack ( - "{s:I, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}", + "{s:I, s:s, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}", "code", (json_int_t) TALER_EC_POST_TRANSFERS_JSON_BAD_WIRE_FEE, + "hint", "exchange provided conflicting wire fee information", "wire_fee", TALER_JSON_from_amount (wire_fee), "execution_time", GNUNET_JSON_from_time_abs (execution_time), "expected_wire_fee", TALER_JSON_from_amount (&expected_fee), |