diff options
| m--------- | doc/prebuilt | 0 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_bank_history_credit.c | 26 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_bank_history_debit.c | 18 | ||||
| -rw-r--r-- | src/lib/testing_api_cmd_bank_transfer.c | 3 |
4 files changed, 24 insertions, 23 deletions
diff --git a/doc/prebuilt b/doc/prebuilt -Subproject ca53235ccfa0458ebf11c204888ca370e20ec3f +Subproject 934a6a18301e81c4fd1b3a8cda2dc13dca4741c diff --git a/src/lib/testing_api_cmd_bank_history_credit.c b/src/lib/testing_api_cmd_bank_history_credit.c index c23107889..fe55fbce6 100644 --- a/src/lib/testing_api_cmd_bank_history_credit.c +++ b/src/lib/testing_api_cmd_bank_history_credit.c @@ -253,7 +253,7 @@ build_history (struct TALER_TESTING_Interpreter *is, const char *debit_account; const struct TALER_Amount *amount; 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 * 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_PT_DEBIT, &debit_account)) || - (GNUNET_OK == + (GNUNET_OK != TALER_TESTING_get_trait_amount_obj (cmd, 0, &amount)) || - (GNUNET_OK == + (GNUNET_OK != TALER_TESTING_get_trait_reserve_pub (cmd, 0, &reserve_pub)) || - (GNUNET_OK == + (GNUNET_OK != TALER_TESTING_get_trait_url (cmd, - 1, - &account_url)) ) + 0, + &exchange_credit_url)) ) continue; /* not an interesting event */ /* Seek "/history" starting row. */ if ( (NULL != row_id_start) && @@ -295,7 +295,7 @@ build_history (struct TALER_TESTING_Interpreter *is, if (GNUNET_NO == ok) continue; /* skip until we find the marker */ if (0 != strcasecmp (hs->account_url, - credit_account)) + exchange_credit_url)) continue; /* account missmatch */ if (total >= GNUNET_MAX (hs->num_results, -hs->num_results) ) @@ -312,12 +312,12 @@ build_history (struct TALER_TESTING_Interpreter *is, GNUNET_array_grow (h, total, pos * 2); - h[total].url = GNUNET_strdup (debit_account); - h[total].details.debit_account_url = h[total].url; - h[total].details.amount = *amount; - h[total].row_id = *row_id; - h[total].details.reserve_pub = *reserve_pub; - h[total].details.credit_account_url = account_url; + h[pos].url = GNUNET_strdup (debit_account); + h[pos].details.debit_account_url = h[pos].url; + h[pos].details.amount = *amount; + h[pos].row_id = *row_id; + h[pos].details.reserve_pub = *reserve_pub; + h[pos].details.credit_account_url = exchange_credit_url; pos++; } GNUNET_assert (GNUNET_YES == ok); diff --git a/src/lib/testing_api_cmd_bank_history_debit.c b/src/lib/testing_api_cmd_bank_history_debit.c index a45c6da89..746a4ef12 100644 --- a/src/lib/testing_api_cmd_bank_history_debit.c +++ b/src/lib/testing_api_cmd_bank_history_debit.c @@ -250,7 +250,7 @@ build_history (struct TALER_TESTING_Interpreter *is, const char *credit_account; const struct TALER_Amount *amount; const struct TALER_WireTransferIdentifierRawP *wtid; - const char *account_url; + const char *account_debit_url; if ( (GNUNET_OK != TALER_TESTING_get_trait_bank_row (cmd, @@ -273,8 +273,8 @@ build_history (struct TALER_TESTING_Interpreter *is, &wtid)) || (GNUNET_OK != TALER_TESTING_get_trait_url (cmd, - 1, - &account_url)) ) + 0, + &account_debit_url)) ) continue; /* not an event we care about */ /* Seek "/history" starting row. */ if ( (NULL != row_id_start) && @@ -306,12 +306,12 @@ build_history (struct TALER_TESTING_Interpreter *is, GNUNET_array_grow (h, total, pos * 2); - h[total].url = GNUNET_strdup (credit_account); - h[total].details.credit_account_url = h[total].url; - h[total].details.amount = *amount; - h[total].row_id = *row_id; - h[total].details.wtid = *wtid; - h[total].details.debit_account_url = account_url; + h[pos].url = GNUNET_strdup (credit_account); + h[pos].details.credit_account_url = h[pos].url; + h[pos].details.amount = *amount; + h[pos].row_id = *row_id; + h[pos].details.wtid = *wtid; + h[pos].details.debit_account_url = account_debit_url; pos++; } GNUNET_assert (GNUNET_YES == ok); diff --git a/src/lib/testing_api_cmd_bank_transfer.c b/src/lib/testing_api_cmd_bank_transfer.c index bad707aa7..56880d687 100644 --- a/src/lib/testing_api_cmd_bank_transfer.c +++ b/src/lib/testing_api_cmd_bank_transfer.c @@ -297,7 +297,8 @@ transfer_traits (void *cls, { struct TransferState *fts = cls; 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_payto (TALER_TESTING_PT_CREDIT, fts->payto_credit_account), |