merchant

commit 66a1cb6f783d1fd2c3ae08cd4a0699084590d0e8
parent fc02e0b45c1a9e2639524dcaa53cf6ffd1d93975
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Mon, 19 Oct 2015 14:58:44 +0200

minor changes to fix #3763

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -661,8 +661,8 @@ url_handler (void *cls,
     /* JSONify public key */
     eddsa_pub_enc = TALER_json_from_data ((void *) &pub, sizeof (pub));
 
-    if (NULL == (j_contract_add = json_pack ("{s:o, s:s, s:o, s:o, s:o}",
-                                             "merchant_pub", eddsa_pub_enc,
+    if (NULL == (j_contract_add = json_pack ("{s:s, s:s, s:o, s:o, s:o}",
+                                             "merchant_pub", json_string_value (eddsa_pub_enc),
                                              "H_wire", json_string_value (j_h_json_wire),
                                              "timestamp", TALER_json_from_abs (now),
                                              "refund", TALER_json_from_abs (refund),
@@ -706,10 +706,9 @@ url_handler (void *cls,
     GNUNET_CRYPTO_eddsa_key_get_public (privkey, &pub);
     eddsa_pub_enc = TALER_json_from_data ((void *) &pub, sizeof (pub));
 
-    response = json_pack ("{s:o, s:o, s:o, s:o}",
+    response = json_pack ("{s:o, s:o, s:o}",
                           "contract", root,
                           "sig", j_sig_enc,
-	                  "eddsa_pub", eddsa_pub_enc,
 			  "h_contract",
 			  TALER_json_from_data ((void *) &h_contract_str, sizeof (struct GNUNET_HashCode)));