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

fix really stupid bugs

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-16 11:57:32 +01:00
parent 2e6d284e03
commit a12ee00d3b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/prebuilt

@ -1 +1 @@
Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5 Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc

26
src/lib/testing_api_cmd_bank_history_credit.c
View File

@ -253,7 +253,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
const char *debit_account; const char *debit_account;
const struct TALER_Amount *amount; const struct TALER_Amount *amount;
const struct TALER_ReservePublicKeyP *reserve_pub; const struct TALER_ReservePublicKeyP *reserve_pub;
const char *account_url; const char *exchange_credit_url;
/* The following command allows us to skip over those CMDs /* The following command allows us to skip over those CMDs
* that do not offer a "row_id" trait. Such skipped CMDs are * that do not offer a "row_id" trait. Such skipped CMDs are
@ -269,18 +269,18 @@ build_history (struct TALER_TESTING_Interpreter *is,
TALER_TESTING_get_trait_payto (cmd, TALER_TESTING_get_trait_payto (cmd,
TALER_TESTING_PT_DEBIT, TALER_TESTING_PT_DEBIT,
&debit_account)) || &debit_account)) ||
(GNUNET_OK == (GNUNET_OK !=
TALER_TESTING_get_trait_amount_obj (cmd, TALER_TESTING_get_trait_amount_obj (cmd,
0, 0,
&amount)) || &amount)) ||
(GNUNET_OK == (GNUNET_OK !=
TALER_TESTING_get_trait_reserve_pub (cmd, TALER_TESTING_get_trait_reserve_pub (cmd,
0, 0,
&reserve_pub)) || &reserve_pub)) ||
(GNUNET_OK == (GNUNET_OK !=
TALER_TESTING_get_trait_url (cmd, TALER_TESTING_get_trait_url (cmd,
1, 0,
&account_url)) ) &exchange_credit_url)) )
continue; /* not an interesting event */ continue; /* not an interesting event */
/* Seek "/history" starting row. */ /* Seek "/history" starting row. */
if ( (NULL != row_id_start) && if ( (NULL != row_id_start) &&
@ -295,7 +295,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
if (GNUNET_NO == ok) if (GNUNET_NO == ok)
continue; /* skip until we find the marker */ continue; /* skip until we find the marker */
if (0 != strcasecmp (hs->account_url, if (0 != strcasecmp (hs->account_url,
credit_account)) exchange_credit_url))
continue; /* account missmatch */ continue; /* account missmatch */
if (total >= GNUNET_MAX (hs->num_results, if (total >= GNUNET_MAX (hs->num_results,
-hs->num_results) ) -hs->num_results) )
@ -312,12 +312,12 @@ build_history (struct TALER_TESTING_Interpreter *is,
GNUNET_array_grow (h, GNUNET_array_grow (h,
total, total,
pos * 2); pos * 2);
h[total].url = GNUNET_strdup (debit_account); h[pos].url = GNUNET_strdup (debit_account);
h[total].details.debit_account_url = h[total].url; h[pos].details.debit_account_url = h[pos].url;
h[total].details.amount = *amount; h[pos].details.amount = *amount;
h[total].row_id = *row_id; h[pos].row_id = *row_id;
h[total].details.reserve_pub = *reserve_pub; h[pos].details.reserve_pub = *reserve_pub;
h[total].details.credit_account_url = account_url; h[pos].details.credit_account_url = exchange_credit_url;
pos++; pos++;
} }
GNUNET_assert (GNUNET_YES == ok); GNUNET_assert (GNUNET_YES == ok);

18
src/lib/testing_api_cmd_bank_history_debit.c
View File

@ -250,7 +250,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
const char *credit_account; const char *credit_account;
const struct TALER_Amount *amount; const struct TALER_Amount *amount;
const struct TALER_WireTransferIdentifierRawP *wtid; const struct TALER_WireTransferIdentifierRawP *wtid;
const char *account_url; const char *account_debit_url;
if ( (GNUNET_OK != if ( (GNUNET_OK !=
TALER_TESTING_get_trait_bank_row (cmd, TALER_TESTING_get_trait_bank_row (cmd,
@ -273,8 +273,8 @@ build_history (struct TALER_TESTING_Interpreter *is,
&wtid)) || &wtid)) ||
(GNUNET_OK != (GNUNET_OK !=
TALER_TESTING_get_trait_url (cmd, TALER_TESTING_get_trait_url (cmd,
1, 0,
&account_url)) ) &account_debit_url)) )
continue; /* not an event we care about */ continue; /* not an event we care about */
/* Seek "/history" starting row. */ /* Seek "/history" starting row. */
if ( (NULL != row_id_start) && if ( (NULL != row_id_start) &&
@ -306,12 +306,12 @@ build_history (struct TALER_TESTING_Interpreter *is,
GNUNET_array_grow (h, GNUNET_array_grow (h,
total, total,
pos * 2); pos * 2);
h[total].url = GNUNET_strdup (credit_account); h[pos].url = GNUNET_strdup (credit_account);
h[total].details.credit_account_url = h[total].url; h[pos].details.credit_account_url = h[pos].url;
h[total].details.amount = *amount; h[pos].details.amount = *amount;
h[total].row_id = *row_id; h[pos].row_id = *row_id;
h[total].details.wtid = *wtid; h[pos].details.wtid = *wtid;
h[total].details.debit_account_url = account_url; h[pos].details.debit_account_url = account_debit_url;
pos++; pos++;
} }
GNUNET_assert (GNUNET_YES == ok); GNUNET_assert (GNUNET_YES == ok);

3
src/lib/testing_api_cmd_bank_transfer.c
View File

@ -297,7 +297,8 @@ transfer_traits (void *cls,
{ {
struct TransferState *fts = cls; struct TransferState *fts = cls;
struct TALER_TESTING_Trait traits[] = { struct TALER_TESTING_Trait traits[] = {
TALER_TESTING_make_trait_url (1, fts->account_debit_url), TALER_TESTING_make_trait_url (0,
fts->account_debit_url),
TALER_TESTING_make_trait_bank_row (&fts->serial_id), TALER_TESTING_make_trait_bank_row (&fts->serial_id),
TALER_TESTING_make_trait_payto (TALER_TESTING_PT_CREDIT, TALER_TESTING_make_trait_payto (TALER_TESTING_PT_CREDIT,
fts->payto_credit_account), fts->payto_credit_account),