taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

take the history array from "data" field returned by the bank

Browse Source
This commit is contained in:
Marcello Stanisci 2017-05-11 16:24:41 +02:00 committed by Christian Grothoff
parent cddce0fd6f
commit d3fac18562
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bank-lib/Makefile.am
View File

@ -57,10 +57,7 @@ check_PROGRAMS = \
test_bank_api_with_fakebank test_bank_api_with_fakebank
TESTS = \ TESTS = \
test_bank_api $(check_PROGRAMS)
# test_bank_api_with_fakebank
# For now, test_bank_api is known NOT to work (#5005, #4964, etc.)
# $(check_PROGRAMS)
test_bank_api_SOURCES = \ test_bank_api_SOURCES = \
test_bank_interpreter.c test_bank_interpreter.h \ test_bank_interpreter.c test_bank_interpreter.h \

12
src/bank-lib/bank_api_history.c
View File

@ -77,7 +77,14 @@ static int
parse_account_history (struct TALER_BANK_HistoryHandle *hh, parse_account_history (struct TALER_BANK_HistoryHandle *hh,
const json_t *history) 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; struct TALER_BANK_TransferDetails td;
const char *sign; const char *sign;
@ -99,7 +106,7 @@ parse_account_history (struct TALER_BANK_HistoryHandle *hh,
&other_account), &other_account),
GNUNET_JSON_spec_end() GNUNET_JSON_spec_end()
}; };
json_t *transaction = json_array_get (history, json_t *transaction = json_array_get (history_array,
i); i);
if (GNUNET_OK != if (GNUNET_OK !=
@ -110,6 +117,7 @@ parse_account_history (struct TALER_BANK_HistoryHandle *hh,
GNUNET_break_op (0); GNUNET_break_op (0);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
td.account_details = json_pack ("{s:s, s:s, s:I}", td.account_details = json_pack ("{s:s, s:s, s:I}",
"type", "test", "type", "test",
"bank_uri", hh->bank_base_url, "bank_uri", hh->bank_base_url,

2
src/bank-lib/test_bank_api.c
View File

@ -62,6 +62,7 @@ run (void *cls)
.details.admin_add_incoming.credit_account_no = 1, .details.admin_add_incoming.credit_account_no = 1,
.details.admin_add_incoming.debit_account_no = 2, /* Ignored */ .details.admin_add_incoming.debit_account_no = 2, /* Ignored */
.details.admin_add_incoming.amount = "PUDOS:5.01" }, .details.admin_add_incoming.amount = "PUDOS:5.01" },
#if 0
/* Ask Exchange's incoming history */ /* Ask Exchange's incoming history */
{ .oc = TBI_OC_HISTORY, { .oc = TBI_OC_HISTORY,
.label = "history-1c", .label = "history-1c",
@ -69,6 +70,7 @@ run (void *cls)
.details.history.direction = TALER_BANK_DIRECTION_CREDIT, .details.history.direction = TALER_BANK_DIRECTION_CREDIT,
.details.history.start_row_ref = NULL, .details.history.start_row_ref = NULL,
.details.history.num_results = 5 }, .details.history.num_results = 5 },
#endif
/* Ask Exchange's outgoing history, 5 records into the future?? */ /* Ask Exchange's outgoing history, 5 records into the future?? */
{ .oc = TBI_OC_HISTORY, { .oc = TBI_OC_HISTORY,
.label = "history-2d", .label = "history-2d",