resolve another FIXME
This commit is contained in:
parent
096de63d04
commit
67bfd94009
@ -2103,36 +2103,10 @@ TALER_TESTING_get_trait_uint (const struct TALER_TESTING_Command *cmd,
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Information about a fresh coin generated by the refresh
|
* Opaque handle to fresh coins generated during refresh.
|
||||||
* operation. FIXME: should go away from here!
|
* Details are internal to the refresh logic.
|
||||||
*/
|
*/
|
||||||
struct TALER_TESTING_FreshCoinData
|
struct TALER_TESTING_FreshCoinData;
|
||||||
{
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If @e amount is NULL, this specifies the denomination key to
|
|
||||||
* use. Otherwise, this will be set (by the interpreter) to the
|
|
||||||
* denomination PK matching @e amount.
|
|
||||||
*/
|
|
||||||
const struct TALER_EXCHANGE_DenomPublicKey *pk;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set (by the interpreter) to the exchange's signature over the
|
|
||||||
* coin's public key.
|
|
||||||
*/
|
|
||||||
struct TALER_DenominationSignature sig;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set (by the interpreter) to the coin's private key.
|
|
||||||
*/
|
|
||||||
struct TALER_CoinSpendPrivateKeyP coin_priv;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The blinding key (needed for payback operations).
|
|
||||||
*/
|
|
||||||
struct TALER_DenominationBlindingKeyP blinding_key;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2147,7 +2121,7 @@ struct TALER_TESTING_FreshCoinData
|
|||||||
*/
|
*/
|
||||||
struct TALER_TESTING_Trait
|
struct TALER_TESTING_Trait
|
||||||
TALER_TESTING_make_trait_fresh_coins (unsigned int index,
|
TALER_TESTING_make_trait_fresh_coins (unsigned int index,
|
||||||
struct TALER_TESTING_FreshCoinData *
|
const struct TALER_TESTING_FreshCoinData *
|
||||||
fresh_coins);
|
fresh_coins);
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,13 +16,11 @@
|
|||||||
License along with TALER; see the file COPYING. If not, see
|
License along with TALER; see the file COPYING. If not, see
|
||||||
<http://www.gnu.org/licenses/>
|
<http://www.gnu.org/licenses/>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file exchange-lib/testing_api_cmd_refresh.c
|
* @file exchange-lib/testing_api_cmd_refresh.c
|
||||||
* @brief commands for testing all "refresh" features.
|
* @brief commands for testing all "refresh" features.
|
||||||
* @author Marcello Stanisci
|
* @author Marcello Stanisci
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
#include "taler_json_lib.h"
|
#include "taler_json_lib.h"
|
||||||
#include <gnunet/gnunet_curl_lib.h>
|
#include <gnunet/gnunet_curl_lib.h>
|
||||||
@ -31,12 +29,37 @@
|
|||||||
#include "taler_signatures.h"
|
#include "taler_signatures.h"
|
||||||
#include "backoff.h"
|
#include "backoff.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Data for a coin to be melted.
|
* Information about a fresh coin generated by the refresh
|
||||||
|
* operation.
|
||||||
*/
|
*/
|
||||||
struct MeltDetails
|
struct TALER_TESTING_FreshCoinData
|
||||||
{
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If @e amount is NULL, this specifies the denomination key to
|
||||||
|
* use. Otherwise, this will be set (by the interpreter) to the
|
||||||
|
* denomination PK matching @e amount.
|
||||||
|
*/
|
||||||
|
const struct TALER_EXCHANGE_DenomPublicKey *pk;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set (by the interpreter) to the exchange's signature over the
|
||||||
|
* coin's public key.
|
||||||
|
*/
|
||||||
|
struct TALER_DenominationSignature sig;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set (by the interpreter) to the coin's private key.
|
||||||
|
*/
|
||||||
|
struct TALER_CoinSpendPrivateKeyP coin_priv;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The blinding key (needed for payback operations).
|
||||||
|
*/
|
||||||
|
struct TALER_DenominationBlindingKeyP blinding_key;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -344,8 +367,8 @@ reveal_cb (void *cls,
|
|||||||
switch (http_status)
|
switch (http_status)
|
||||||
{
|
{
|
||||||
case MHD_HTTP_OK:
|
case MHD_HTTP_OK:
|
||||||
rrs->fresh_coins = GNUNET_new_array
|
rrs->fresh_coins = GNUNET_new_array (num_coins,
|
||||||
(num_coins, struct TALER_TESTING_FreshCoinData);
|
struct TALER_TESTING_FreshCoinData);
|
||||||
for (unsigned int i = 0; i<num_coins; i++)
|
for (unsigned int i = 0; i<num_coins; i++)
|
||||||
{
|
{
|
||||||
struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
|
struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
|
||||||
|
@ -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 TALER_TESTING_FreshCoinData *fresh_coins)
|
const struct TALER_TESTING_FreshCoinData *fresh_coins)
|
||||||
{
|
{
|
||||||
struct TALER_TESTING_Trait ret = {
|
struct TALER_TESTING_Trait ret = {
|
||||||
.index = index,
|
.index = index,
|
||||||
|
Loading…
Reference in New Issue
Block a user