diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-05-11 16:24:41 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-05-16 11:04:59 +0200 |
| commit | d3fac1856277e6a832c261f1820ed34a95301e1d (patch) | |
| tree | f18367d47b38c2b28639f9e97edc237689913a92 | |
| parent | cddce0fd6fd3b9870ea230c1cb659a866cac1205 (diff) | |
take the history array from "data" field returned by the bank
| -rw-r--r-- | src/bank-lib/Makefile.am | 5 | ||||
| -rw-r--r-- | src/bank-lib/bank_api_history.c | 12 | ||||
| -rw-r--r-- | src/bank-lib/test_bank_api.c | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index 72c25f66..48c7e9cb 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -57,10 +57,7 @@ check_PROGRAMS = \ test_bank_api_with_fakebank TESTS = \ - test_bank_api -# test_bank_api_with_fakebank -# For now, test_bank_api is known NOT to work (#5005, #4964, etc.) -# $(check_PROGRAMS) + $(check_PROGRAMS) test_bank_api_SOURCES = \ test_bank_interpreter.c test_bank_interpreter.h \ diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c index ecb3561d..87619e78 100644 --- a/src/bank-lib/bank_api_history.c +++ b/src/bank-lib/bank_api_history.c @@ -77,7 +77,14 @@ static int parse_account_history (struct TALER_BANK_HistoryHandle *hh, const json_t *history) { - for (unsigned int i=0;i<json_array_size (history);i++) + json_t *history_array; + + if (NULL == (history_array = json_object_get (history, "data"))) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + for (unsigned int i=0;i<json_array_size (history_array);i++) { struct TALER_BANK_TransferDetails td; const char *sign; @@ -99,7 +106,7 @@ parse_account_history (struct TALER_BANK_HistoryHandle *hh, &other_account), GNUNET_JSON_spec_end() }; - json_t *transaction = json_array_get (history, + json_t *transaction = json_array_get (history_array, i); if (GNUNET_OK != @@ -110,6 +117,7 @@ parse_account_history (struct TALER_BANK_HistoryHandle *hh, GNUNET_break_op (0); return GNUNET_SYSERR; } + td.account_details = json_pack ("{s:s, s:s, s:I}", "type", "test", "bank_uri", hh->bank_base_url, diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c index 4a378521..800dc56a 100644 --- a/src/bank-lib/test_bank_api.c +++ b/src/bank-lib/test_bank_api.c @@ -62,6 +62,7 @@ run (void *cls) .details.admin_add_incoming.credit_account_no = 1, .details.admin_add_incoming.debit_account_no = 2, /* Ignored */ .details.admin_add_incoming.amount = "PUDOS:5.01" }, + #if 0 /* Ask Exchange's incoming history */ { .oc = TBI_OC_HISTORY, .label = "history-1c", @@ -69,6 +70,7 @@ run (void *cls) .details.history.direction = TALER_BANK_DIRECTION_CREDIT, .details.history.start_row_ref = NULL, .details.history.num_results = 5 }, + #endif /* Ask Exchange's outgoing history, 5 records into the future?? */ { .oc = TBI_OC_HISTORY, .label = "history-2d", |