summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-01-22 16:52:52 +0100
committerChristian Grothoff <christian@grothoff.org>2016-01-22 16:52:52 +0100
commit5601a81d4dbefcd62ff84b2d6b8802046dc8520a (patch)
tree7fd9d0edaaaee153bedc666f770dd3c75a48eb25 /src
parentc2fe7e8ee9bc658b3934f6ea5a5c2b28f8b7053f (diff)
downloadexchange-5601a81d4dbefcd62ff84b2d6b8802046dc8520a.tar.gz
exchange-5601a81d4dbefcd62ff84b2d6b8802046dc8520a.tar.bz2
exchange-5601a81d4dbefcd62ff84b2d6b8802046dc8520a.zip
do not have curl be verbose
Diffstat (limited to 'src')
-rw-r--r--src/mint-lib/mint_api_deposit_wtid.c1
-rw-r--r--src/mint-lib/mint_api_handle.c2
-rw-r--r--src/mint/taler-mint-httpd_tracking.c5
3 files changed, 3 insertions, 5 deletions
diff --git a/src/mint-lib/mint_api_deposit_wtid.c b/src/mint-lib/mint_api_deposit_wtid.c
index bb81d93e1..50f9c55d8 100644
--- a/src/mint-lib/mint_api_deposit_wtid.c
+++ b/src/mint-lib/mint_api_deposit_wtid.c
@@ -300,7 +300,6 @@ TALER_MINT_deposit_wtid (struct TALER_MINT_Handle *mint,
GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv,
&dtp.purpose,
&merchant_sig.eddsa_sig));
-
deposit_wtid_obj = json_pack ("{s:o, s:o," /* H_wire, H_contract */
" s:o, s:I," /* coin_pub, transaction_id */
" s:o, s:o}", /* merchant_pub, merchant_sig */
diff --git a/src/mint-lib/mint_api_handle.c b/src/mint-lib/mint_api_handle.c
index 077e42c24..c8898d5c3 100644
--- a/src/mint-lib/mint_api_handle.c
+++ b/src/mint-lib/mint_api_handle.c
@@ -757,7 +757,7 @@ TALER_MINT_connect (struct TALER_MINT_Context *ctx,
GNUNET_assert (CURLE_OK ==
curl_easy_setopt (c,
CURLOPT_VERBOSE,
- 1));
+ 0));
GNUNET_assert (CURLE_OK ==
curl_easy_setopt (c,
CURLOPT_STDERR,
diff --git a/src/mint/taler-mint-httpd_tracking.c b/src/mint/taler-mint-httpd_tracking.c
index 76293803d..a6b41cf86 100644
--- a/src/mint/taler-mint-httpd_tracking.c
+++ b/src/mint/taler-mint-httpd_tracking.c
@@ -121,13 +121,12 @@ TMH_TRACKING_handler_deposit_wtid (struct TMH_RequestHandler *rh,
struct TALER_DepositTrackPS tps;
uint64_t transaction_id;
struct TALER_MerchantSignatureP merchant_sig;
- struct TALER_MerchantPublicKeyP merchant_pub;
struct TMH_PARSE_FieldSpecification spec[] = {
TMH_PARSE_member_fixed ("H_wire", &tps.h_wire),
TMH_PARSE_member_fixed ("H_contract", &tps.h_contract),
TMH_PARSE_member_fixed ("coin_pub", &tps.coin_pub),
TMH_PARSE_member_uint64 ("transaction_id", &transaction_id),
- TMH_PARSE_member_fixed ("merchant_pub", &merchant_pub),
+ TMH_PARSE_member_fixed ("merchant_pub", &tps.merchant),
TMH_PARSE_member_fixed ("merchant_sig", &merchant_sig),
TMH_PARSE_MEMBER_END
};
@@ -154,7 +153,7 @@ TMH_TRACKING_handler_deposit_wtid (struct TMH_RequestHandler *rh,
tps.transaction_id = GNUNET_htonll (transaction_id);
res = check_and_handle_deposit_wtid_request (connection,
&tps,
- &merchant_pub,
+ &tps.merchant,
&merchant_sig,
transaction_id);
TMH_PARSE_release_data (spec);