diff options
| author | Özgür Kesim <oec-taler@kesim.org> | 2023-12-23 13:02:45 +0100 |
|---|---|---|
| committer | Özgür Kesim <oec-taler@kesim.org> | 2023-12-23 13:02:45 +0100 |
| commit | 8fd6a4e148a93aab45082cbe159a56be05acd1c4 (patch) | |
| tree | a3d97967cb8d68ab05315a808bef2dc16a40b52e /src/testing/testing_api_cmd_batch_withdraw.c | |
| parent | a162761ceb2e1678703b984dfb1608d5144e8b10 (diff) | |
| download | exchange-8fd6a4e148a93aab45082cbe159a56be05acd1c4.tar.gz exchange-8fd6a4e148a93aab45082cbe159a56be05acd1c4.tar.bz2 exchange-8fd6a4e148a93aab45082cbe159a56be05acd1c4.zip | |
[wip, #7267] added test to detect age commitment conflict on deposit
A new testcase is added to detect same coin_pub with different age
commitments during deposit.
Diffstat (limited to 'src/testing/testing_api_cmd_batch_withdraw.c')
| -rw-r--r-- | src/testing/testing_api_cmd_batch_withdraw.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c index a93fadace..744da56c9 100644 --- a/src/testing/testing_api_cmd_batch_withdraw.c +++ b/src/testing/testing_api_cmd_batch_withdraw.c @@ -177,7 +177,7 @@ struct BatchWithdrawState /** * Force a conflict: */ - enum TALER_TESTING_CoinConflictType force_conflict; + bool force_conflict; }; @@ -200,9 +200,10 @@ reserve_batch_withdraw_cb (void *cls, ws->wsh = NULL; if (ws->expected_response_code != wr->hr.http_status) { - TALER_TESTING_unexpected_status (is, - wr->hr.http_status, - ws->expected_response_code); + TALER_TESTING_unexpected_status_with_body (is, + wr->hr.http_status, + ws->expected_response_code, + wr->hr.reply); return; } switch (wr->hr.http_status) @@ -271,7 +272,6 @@ batch_withdraw_run (void *cls, struct TALER_EXCHANGE_WithdrawCoinInput wcis[ws->num_coins]; struct TALER_PlanchetMasterSecretP conflict_ps = {0}; struct TALER_AgeMask mask = {0}; - struct GNUNET_HashCode seed = {0}; (void) cmd; ws->is = is; @@ -307,30 +307,25 @@ batch_withdraw_run (void *cls, if (0 < ws->age) mask = TALER_extensions_get_age_restriction_mask (); - if (Conflict_Denom == ws->force_conflict) + if (ws->force_conflict) TALER_planchet_master_setup_random (&conflict_ps); - if (Conflict_Age == ws->force_conflict) - GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, - &seed, - sizeof(seed)); - for (unsigned int i = 0; i<ws->num_coins; i++) { struct CoinState *cs = &ws->coins[i]; struct TALER_EXCHANGE_WithdrawCoinInput *wci = &wcis[i]; - if (Conflict_Denom == ws->force_conflict) + if (ws->force_conflict) cs->ps = conflict_ps; else TALER_planchet_master_setup_random (&cs->ps); if (0 < ws->age) { - if (Conflict_Age != ws->force_conflict) - GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, - &seed, - sizeof(seed)); + struct GNUNET_HashCode seed = {0}; + GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, + &seed, + sizeof(seed)); TALER_age_restriction_commit (&mask, ws->age, &seed, @@ -494,7 +489,7 @@ struct TALER_TESTING_Command TALER_TESTING_cmd_batch_withdraw_with_conflict ( const char *label, const char *reserve_reference, - enum TALER_TESTING_CoinConflictType conflict, + bool conflict, uint8_t age, unsigned int expected_response_code, const char *amount, |