diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-11-25 16:40:45 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-11-25 16:40:45 +0100 |
commit | 698519e581cc5822ba68eb687e19ab8f10f5a093 (patch) | |
tree | 832bd06d049a87a36262b86af7dccb28e7ee6a77 /src/backend/taler-merchant-httpd_contract.c | |
parent | 85cc2554fe5537f79b3c5bb1700faeadb8bad99e (diff) | |
download | merchant-698519e581cc5822ba68eb687e19ab8f10f5a093.tar.gz merchant-698519e581cc5822ba68eb687e19ab8f10f5a093.tar.bz2 merchant-698519e581cc5822ba68eb687e19ab8f10f5a093.zip |
major refactoring of taler-merchant-httpd_pay, compiles but cannot yet work (uninitialized fields, some logic still broken, etc.)
Diffstat (limited to 'src/backend/taler-merchant-httpd_contract.c')
-rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index b5050666..81bf3ed9 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -31,6 +31,7 @@ #include <taler/taler_mint_service.h> #include "taler-merchant-httpd.h" #include "taler-merchant-httpd_parsing.h" +#include "taler-merchant-httpd_mints.h" #include "taler-merchant-httpd_responses.h" #include "taler_merchantdb_lib.h" #include "taler-merchant-httpd.h" @@ -57,11 +58,8 @@ MH_handler_contract (struct TMH_RequestHandler *rh, size_t *upload_data_size) { json_t *root; - json_t *trusted_mints; json_t *j_auditors; json_t *auditor; - json_t *mint; - const struct TALER_MINT_Keys *keys; int res; int cnt; struct GNUNET_HashCode h_wire; @@ -82,21 +80,6 @@ MH_handler_contract (struct TMH_RequestHandler *rh, /* Generate preferred mint(s) array. */ - trusted_mints = json_array (); - for (cnt = 0; cnt < nmints; cnt++) - { - if (! mints[cnt]->pending) - { - keys = TALER_MINT_get_keys (mints[cnt]->conn); - mint = json_pack ("{s:s, s:o}", - "url", mints[cnt]->hostname, - "master_pub", - TALER_json_from_data - (&keys->master_pub.eddsa_pub, - sizeof (keys->master_pub.eddsa_pub))); - json_array_append_new (trusted_mints, mint); - } - } j_auditors = json_array (); for (cnt = 0; cnt < nauditors; cnt++) { |