summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/taler_testing_lib.h6
-rw-r--r--src/lib/testing_api_cmd_refresh.c12
-rw-r--r--src/lib/testing_api_trait_fresh_coin.c4
3 files changed, 10 insertions, 12 deletions
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 20641002f..a421cf43c 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1953,7 +1953,7 @@ TALER_TESTING_get_trait_uint
*
* 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
TALER_TESTING_make_trait_fresh_coins
(unsigned int index,
- struct FreshCoin *fresh_coins);
+ struct TALER_TESTING_FreshCoinData *fresh_coins);
/**
@@ -2006,7 +2006,7 @@ int
TALER_TESTING_get_trait_fresh_coins
(const struct TALER_TESTING_Command *cmd,
unsigned int index,
- const struct FreshCoin **fresh_coins);
+ const struct TALER_TESTING_FreshCoinData **fresh_coins);
/**
diff --git a/src/lib/testing_api_cmd_refresh.c b/src/lib/testing_api_cmd_refresh.c
index 3fb52d830..155d30cee 100644
--- a/src/lib/testing_api_cmd_refresh.c
+++ b/src/lib/testing_api_cmd_refresh.c
@@ -157,7 +157,7 @@ struct RefreshRevealState
* data related to one fresh coin, set by the reveal callback
* as it comes from the exchange.
*/
- struct FreshCoin *fresh_coins;
+ struct TALER_TESTING_FreshCoinData *fresh_coins;
/**
* Interpreter state.
@@ -344,10 +344,10 @@ reveal_cb (void *cls,
{
case MHD_HTTP_OK:
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++)
{
- struct FreshCoin *fc = &rrs->fresh_coins[i];
+ struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
if (GNUNET_OK !=
TALER_TESTING_get_trait_denom_pub (melt_cmd,
@@ -598,7 +598,7 @@ link_cb (void *cls,
found = 0;
/* 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
(reveal_cmd, 0, &fc))
@@ -1203,9 +1203,7 @@ refresh_reveal_traits (void *cls,
(i, &rrs->fresh_coins[i].sig);
#if 0
/* FIXME: need *some* trait for #5777 here, but we don't have
- the blinding keys at hand, and #5777 asks for the transfer
- private keys, which according to bugnote 14690 is a bad idea.
- So what should we do here? */
+ the blinding keys at hand. So we need to GET them! */
/* blinding key traits */
for (unsigned int i=0; i<num_coins; i++)
traits[(num_coins * 3) + i]
diff --git a/src/lib/testing_api_trait_fresh_coin.c b/src/lib/testing_api_trait_fresh_coin.c
index 1f6cdac2c..464e7e74c 100644
--- a/src/lib/testing_api_trait_fresh_coin.c
+++ b/src/lib/testing_api_trait_fresh_coin.c
@@ -44,7 +44,7 @@ int
TALER_TESTING_get_trait_fresh_coins
(const struct TALER_TESTING_Command *cmd,
unsigned int index,
- const struct FreshCoin **fresh_coins)
+ const struct TALER_TESTING_FreshCoinData **fresh_coins)
{
return cmd->traits (cmd->cls,
(const void **) fresh_coins,
@@ -66,7 +66,7 @@ TALER_TESTING_get_trait_fresh_coins
struct TALER_TESTING_Trait
TALER_TESTING_make_trait_fresh_coins
(unsigned int index,
- struct FreshCoin *fresh_coins)
+ struct TALER_TESTING_FreshCoinData *fresh_coins)
{
struct TALER_TESTING_Trait ret = {
.index = index,