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

rename fresh coin to have TALER_TESTING_-prefix

Browse Source
This commit is contained in:
Christian Grothoff 2019-07-19 11:20:18 +02:00
parent 4785bcb4bb
commit c94309ee6e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/taler_testing_lib.h
View File

@ -1953,7 +1953,7 @@ TALER_TESTING_get_trait_uint
* *
* FIXME: should be renamed, easily confused with `struct TALER_FreshCoin`! * FIXME: should be renamed, easily confused with `struct TALER_FreshCoin`!
*/ */
struct FreshCoin struct TALER_TESTING_FreshCoinData
{ {
/** /**
@ -1989,7 +1989,7 @@ struct FreshCoin
struct TALER_TESTING_Trait struct TALER_TESTING_Trait
TALER_TESTING_make_trait_fresh_coins TALER_TESTING_make_trait_fresh_coins
(unsigned int index, (unsigned int index,
struct FreshCoin *fresh_coins); struct TALER_TESTING_FreshCoinData *fresh_coins);
/** /**
@ -2006,7 +2006,7 @@ int
TALER_TESTING_get_trait_fresh_coins TALER_TESTING_get_trait_fresh_coins
(const struct TALER_TESTING_Command *cmd, (const struct TALER_TESTING_Command *cmd,
unsigned int index, unsigned int index,
const struct FreshCoin **fresh_coins); const struct TALER_TESTING_FreshCoinData **fresh_coins);
/** /**

12
src/lib/testing_api_cmd_refresh.c
View File

@ -157,7 +157,7 @@ struct RefreshRevealState
* data related to one fresh coin, set by the reveal callback * data related to one fresh coin, set by the reveal callback
* as it comes from the exchange. * as it comes from the exchange.
*/ */
struct FreshCoin *fresh_coins; struct TALER_TESTING_FreshCoinData *fresh_coins;
/** /**
* Interpreter state. * Interpreter state.
@ -344,10 +344,10 @@ reveal_cb (void *cls,
{ {
case MHD_HTTP_OK: case MHD_HTTP_OK:
rrs->fresh_coins = GNUNET_new_array rrs->fresh_coins = GNUNET_new_array
(num_coins, struct FreshCoin); (num_coins, struct TALER_TESTING_FreshCoinData);
for (unsigned int i=0; i<num_coins; i++) for (unsigned int i=0; i<num_coins; i++)
{ {
struct FreshCoin *fc = &rrs->fresh_coins[i]; struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
if (GNUNET_OK != if (GNUNET_OK !=
TALER_TESTING_get_trait_denom_pub (melt_cmd, TALER_TESTING_get_trait_denom_pub (melt_cmd,
@ -598,7 +598,7 @@ link_cb (void *cls,
found = 0; found = 0;
/* Will point to the pointer inside the cmd state. */ /* Will point to the pointer inside the cmd state. */
const struct FreshCoin *fc = NULL; const struct TALER_TESTING_FreshCoinData *fc = NULL;
if (GNUNET_OK != TALER_TESTING_get_trait_fresh_coins if (GNUNET_OK != TALER_TESTING_get_trait_fresh_coins
(reveal_cmd, 0, &fc)) (reveal_cmd, 0, &fc))
@ -1203,9 +1203,7 @@ refresh_reveal_traits (void *cls,
(i, &rrs->fresh_coins[i].sig); (i, &rrs->fresh_coins[i].sig);
#if 0 #if 0
/* FIXME: need *some* trait for #5777 here, but we don't have /* FIXME: need *some* trait for #5777 here, but we don't have
the blinding keys at hand, and #5777 asks for the transfer the blinding keys at hand. So we need to GET them! */
private keys, which according to bugnote 14690 is a bad idea.
So what should we do here? */
/* blinding key traits */ /* blinding key traits */
for (unsigned int i=0; i<num_coins; i++) for (unsigned int i=0; i<num_coins; i++)
traits[(num_coins * 3) + i] traits[(num_coins * 3) + i]

4
src/lib/testing_api_trait_fresh_coin.c
View File

@ -44,7 +44,7 @@ int
TALER_TESTING_get_trait_fresh_coins TALER_TESTING_get_trait_fresh_coins
(const struct TALER_TESTING_Command *cmd, (const struct TALER_TESTING_Command *cmd,
unsigned int index, unsigned int index,
const struct FreshCoin **fresh_coins) const struct TALER_TESTING_FreshCoinData **fresh_coins)
{ {
return cmd->traits (cmd->cls, return cmd->traits (cmd->cls,
(const void **) fresh_coins, (const void **) fresh_coins,
@ -66,7 +66,7 @@ TALER_TESTING_get_trait_fresh_coins
struct TALER_TESTING_Trait struct TALER_TESTING_Trait
TALER_TESTING_make_trait_fresh_coins TALER_TESTING_make_trait_fresh_coins
(unsigned int index, (unsigned int index,
struct FreshCoin *fresh_coins) struct TALER_TESTING_FreshCoinData *fresh_coins)
{ {
struct TALER_TESTING_Trait ret = { struct TALER_TESTING_Trait ret = {
.index = index, .index = index,