diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-03-19 16:21:10 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-03-19 16:21:10 +0100 |
| commit | 5a4c5594ff0a8fc5f65c813f769448806b183405 (patch) | |
| tree | 6a835068581698e6d3c2d31fbc0b1ccf8750c0ab /src/backend/taler-merchant-httpd_exchanges.c | |
| parent | 4f1d6803f11d8f9ac1c441715de3091af21d25e0 (diff) | |
| download | merchant-5a4c5594ff0a8fc5f65c813f769448806b183405.tar.gz merchant-5a4c5594ff0a8fc5f65c813f769448806b183405.tar.bz2 merchant-5a4c5594ff0a8fc5f65c813f769448806b183405.zip | |
use new JSON APIs (#4237/#4150)
Diffstat (limited to 'src/backend/taler-merchant-httpd_exchanges.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index b7a5c7cc..768c119e 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2014, 2015, 2016 INRIA + (C) 2014, 2015, 2016 INRIA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -20,6 +20,7 @@ * @author Christian Grothoff */ #include "platform.h" +#include <taler/taler_json_lib.h> #include "taler-merchant-httpd_exchanges.h" @@ -502,7 +503,7 @@ TMH_EXCHANGES_init (const struct GNUNET_CONFIGURATION_Handle *cfg) continue; j_exchange = json_pack ("{s:s, s:o}", "url", exchange->uri, - "master_pub", TALER_json_from_data (&exchange->master_pub, + "master_pub", GNUNET_JSON_from_data (&exchange->master_pub, sizeof (struct TALER_MasterPublicKeyP))); json_array_append_new (trusted_exchanges, j_exchange); |