diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-05-15 10:55:47 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-05-16 11:05:00 +0200 |
| commit | be3b891dbd9b1532b9dca91629d478cc3933dfdc (patch) | |
| tree | 485e1ee4e3c4e9cbd3dc5bdddbf59a77dbefa332 | |
| parent | d3fac1856277e6a832c261f1820ed34a95301e1d (diff) | |
fix port numbers, no longer 8081 but on 8080; and box json array /history response in {data} as required by API
| -rw-r--r-- | src/bank-lib/fakebank.c | 13 | ||||
| -rw-r--r-- | src/bank-lib/test_bank_interpreter.c | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c index 0359b4a4..fb512168 100644 --- a/src/bank-lib/fakebank.c +++ b/src/bank-lib/fakebank.c @@ -411,6 +411,7 @@ handle_history (struct TALER_FAKEBANK_Handle *h, enum TALER_BANK_Direction direction; struct Transaction *pos; json_t *history; + json_t *jresponse; int ret; auth = MHD_lookup_connection_value (connection, @@ -536,7 +537,6 @@ handle_history (struct TALER_FAKEBANK_Handle *h, count++; } } - if (0 == json_array_size (history)) { struct MHD_Response *resp; @@ -552,14 +552,23 @@ handle_history (struct TALER_FAKEBANK_Handle *h, return ret; } + jresponse = json_pack ("{s:o}", + "data", history); + if (NULL == jresponse) + { + GNUNET_break (0); + return MHD_NO; + } + /* Finally build response object */ { struct MHD_Response *resp; void *json_str; size_t json_len; - json_str = json_dumps (history, + json_str = json_dumps (jresponse, JSON_INDENT(2)); + json_decref (jresponse); if (NULL == json_str) { GNUNET_break (0); diff --git a/src/bank-lib/test_bank_interpreter.c b/src/bank-lib/test_bank_interpreter.c index c53d53a5..bfd744a0 100644 --- a/src/bank-lib/test_bank_interpreter.c +++ b/src/bank-lib/test_bank_interpreter.c @@ -290,7 +290,7 @@ build_history (struct InterpreterState *is, "type", "test", "bank_uri", - "http://localhost:8081", + "http://localhost:8080", "account_number", (json_int_t) pos->details.admin_add_incoming.debit_account_no); GNUNET_assert (NULL != h[total].details.account_details); @@ -305,7 +305,7 @@ build_history (struct InterpreterState *is, "type", "test", "bank_uri", - "http://localhost:8081", + "http://localhost:8080", "account_number", (json_int_t) pos->details.admin_add_incoming.credit_account_no); GNUNET_assert (NULL != h[total].details.account_details); @@ -853,7 +853,7 @@ TBI_run_interpreter (int *resultp, is = GNUNET_new (struct InterpreterState); if (GNUNET_YES == run_bank) - is->fakebank = TALER_FAKEBANK_start (8081); + is->fakebank = TALER_FAKEBANK_start (8080); is->resultp = resultp; is->commands = commands; is->ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule, |