summaryrefslogtreecommitdiff
path: root/src/mint-lib
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-09-19 22:08:49 +0200
committerChristian Grothoff <christian@grothoff.org>2015-09-19 22:08:49 +0200
commit1eadd66ae0c4abe6867321bcac0ad2f9832a0baf (patch)
tree852f4e09401d0c6c39fab2c98be3663691f02aca /src/mint-lib
parentcc47c5c701340c9be0acc6b7394aa2afad0cd0d3 (diff)
downloadexchange-1eadd66ae0c4abe6867321bcac0ad2f9832a0baf.tar.gz
exchange-1eadd66ae0c4abe6867321bcac0ad2f9832a0baf.tar.bz2
exchange-1eadd66ae0c4abe6867321bcac0ad2f9832a0baf.zip
renaming /withdraw to /reserve (#3968)
Diffstat (limited to 'src/mint-lib')
-rw-r--r--src/mint-lib/Makefile.am4
-rw-r--r--src/mint-lib/mint_api_handle.c2
-rw-r--r--src/mint-lib/mint_api_handle.h2
-rw-r--r--src/mint-lib/mint_api_reserve.c (renamed from src/mint-lib/mint_api_withdraw.c)104
-rw-r--r--src/mint-lib/test_mint_api.c178
5 files changed, 145 insertions, 145 deletions
diff --git a/src/mint-lib/Makefile.am b/src/mint-lib/Makefile.am
index 2729177f8..ccea4ec58 100644
--- a/src/mint-lib/Makefile.am
+++ b/src/mint-lib/Makefile.am
@@ -22,8 +22,8 @@ libtalermint_la_SOURCES = \
mint_api_deposit.c \
mint_api_refresh.c \
mint_api_refresh_link.c \
- mint_api_wire.c \
- mint_api_withdraw.c
+ mint_api_reserve.c \
+ mint_api_wire.c
libtalermint_la_LIBADD = \
-lgnunetutil \
diff --git a/src/mint-lib/mint_api_handle.c b/src/mint-lib/mint_api_handle.c
index 9eaa6171d..61291389d 100644
--- a/src/mint-lib/mint_api_handle.c
+++ b/src/mint-lib/mint_api_handle.c
@@ -686,7 +686,7 @@ MAH_handle_is_ready (struct TALER_MINT_Handle *h)
* Obtain the URL to use for an API request.
*
* @param h the mint handle to query
- * @param path Taler API path (i.e. "/withdraw/sign")
+ * @param path Taler API path (i.e. "/reserve/withdraw")
* @return the full URI to use with cURL
*/
char *
diff --git a/src/mint-lib/mint_api_handle.h b/src/mint-lib/mint_api_handle.h
index aeaeeb593..fae30a309 100644
--- a/src/mint-lib/mint_api_handle.h
+++ b/src/mint-lib/mint_api_handle.h
@@ -48,7 +48,7 @@ MAH_handle_is_ready (struct TALER_MINT_Handle *h);
* Obtain the URL to use for an API request.
*
* @param h the mint handle to query
- * @param path Taler API path (i.e. "/withdraw/sign")
+ * @param path Taler API path (i.e. "/reserve/withdraw")
* @return the full URI to use with cURL
*/
char *
diff --git a/src/mint-lib/mint_api_withdraw.c b/src/mint-lib/mint_api_reserve.c
index ddabb8116..57e8552cc 100644
--- a/src/mint-lib/mint_api_withdraw.c
+++ b/src/mint-lib/mint_api_reserve.c
@@ -15,8 +15,8 @@
<http://www.gnu.org/licenses/>
*/
/**
- * @file mint-lib/mint_api_withdraw.c
- * @brief Implementation of the /withdraw requests of the mint's HTTP API
+ * @file mint-lib/mint_api_reserve.c
+ * @brief Implementation of the /reserve requests of the mint's HTTP API
* @author Christian Grothoff
*/
#include "platform.h"
@@ -31,12 +31,12 @@
#include "taler_signatures.h"
-/* ********************** /withdraw/status ********************** */
+/* ********************** /reserve/status ********************** */
/**
* @brief A Withdraw Status Handle
*/
-struct TALER_MINT_WithdrawStatusHandle
+struct TALER_MINT_ReserveStatusHandle
{
/**
@@ -57,7 +57,7 @@ struct TALER_MINT_WithdrawStatusHandle
/**
* Function to call with the result.
*/
- TALER_MINT_WithdrawStatusResultCallback cb;
+ TALER_MINT_ReserveStatusResultCallback cb;
/**
* Public key of the reserve we are querying.
@@ -264,16 +264,16 @@ parse_reserve_history (json_t *history,
/**
* Function called when we're done processing the
- * HTTP /withdraw/status request.
+ * HTTP /reserve/status request.
*
- * @param cls the `struct TALER_MINT_WithdrawStatusHandle`
+ * @param cls the `struct TALER_MINT_ReserveStatusHandle`
* @param eh curl handle of the request that finished
*/
static void
-handle_withdraw_status_finished (void *cls,
- CURL *eh)
+handle_reserve_status_finished (void *cls,
+ CURL *eh)
{
- struct TALER_MINT_WithdrawStatusHandle *wsh = cls;
+ struct TALER_MINT_ReserveStatusHandle *wsh = cls;
long response_code;
json_t *json;
@@ -376,7 +376,7 @@ handle_withdraw_status_finished (void *cls,
NULL,
0, NULL);
json_decref (json);
- TALER_MINT_withdraw_status_cancel (wsh);
+ TALER_MINT_reserve_status_cancel (wsh);
}
@@ -396,13 +396,13 @@ handle_withdraw_status_finished (void *cls,
* @return a handle for this request; NULL if the inputs are invalid (i.e.
* signatures fail to verify). In this case, the callback is not called.
*/
-struct TALER_MINT_WithdrawStatusHandle *
-TALER_MINT_withdraw_status (struct TALER_MINT_Handle *mint,
- const struct TALER_ReservePublicKeyP *reserve_pub,
- TALER_MINT_WithdrawStatusResultCallback cb,
- void *cb_cls)
+struct TALER_MINT_ReserveStatusHandle *
+TALER_MINT_reserve_status (struct TALER_MINT_Handle *mint,
+ const struct TALER_ReservePublicKeyP *reserve_pub,
+ TALER_MINT_ReserveStatusResultCallback cb,
+ void *cb_cls)
{
- struct TALER_MINT_WithdrawStatusHandle *wsh;
+ struct TALER_MINT_ReserveStatusHandle *wsh;
struct TALER_MINT_Context *ctx;
CURL *eh;
char *pub_str;
@@ -417,10 +417,10 @@ TALER_MINT_withdraw_status (struct TALER_MINT_Handle *mint,
pub_str = GNUNET_STRINGS_data_to_string_alloc (reserve_pub,
sizeof (struct TALER_ReservePublicKeyP));
GNUNET_asprintf (&arg_str,
- "/withdraw/status?reserve_pub=%s",
+ "/reserve/status?reserve_pub=%s",
pub_str);
GNUNET_free (pub_str);
- wsh = GNUNET_new (struct TALER_MINT_WithdrawStatusHandle);
+ wsh = GNUNET_new (struct TALER_MINT_ReserveStatusHandle);
wsh->mint = mint;
wsh->cb = cb;
wsh->cb_cls = cb_cls;
@@ -446,7 +446,7 @@ TALER_MINT_withdraw_status (struct TALER_MINT_Handle *mint,
wsh->job = MAC_job_add (ctx,
eh,
GNUNET_NO,
- &handle_withdraw_status_finished,
+ &handle_reserve_status_finished,
wsh);
return wsh;
}
@@ -459,7 +459,7 @@ TALER_MINT_withdraw_status (struct TALER_MINT_Handle *mint,
* @param wsh the withdraw status request handle
*/
void
-TALER_MINT_withdraw_status_cancel (struct TALER_MINT_WithdrawStatusHandle *wsh)
+TALER_MINT_reserve_status_cancel (struct TALER_MINT_ReserveStatusHandle *wsh)
{
if (NULL != wsh->job)
{
@@ -472,12 +472,12 @@ TALER_MINT_withdraw_status_cancel (struct TALER_MINT_WithdrawStatusHandle *wsh)
}
-/* ********************** /withdraw/sign ********************** */
+/* ********************** /reserve/withdraw ********************** */
/**
* @brief A Withdraw Sign Handle
*/
-struct TALER_MINT_WithdrawSignHandle
+struct TALER_MINT_ReserveWithdrawHandle
{
/**
@@ -503,7 +503,7 @@ struct TALER_MINT_WithdrawSignHandle
/**
* Function to call with the result.
*/
- TALER_MINT_WithdrawSignResultCallback cb;
+ TALER_MINT_ReserveWithdrawResultCallback cb;
/**
* Key used to blind the value.
@@ -539,7 +539,7 @@ struct TALER_MINT_WithdrawSignHandle
/**
- * We got a 200 OK response for the /withdraw/sign operation.
+ * We got a 200 OK response for the /reserve/withdraw operation.
* Extract the coin's signature and return it to the caller.
* The signature we get from the mint is for the blinded value.
* Thus, we first must unblind it and then should verify its
@@ -553,7 +553,7 @@ struct TALER_MINT_WithdrawSignHandle
* @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
*/
static int
-withdraw_sign_ok (struct TALER_MINT_WithdrawSignHandle *wsh,
+reserve_withdraw_ok (struct TALER_MINT_ReserveWithdrawHandle *wsh,
json_t *json)
{
struct GNUNET_CRYPTO_rsa_Signature *blind_sig;
@@ -598,7 +598,7 @@ withdraw_sign_ok (struct TALER_MINT_WithdrawSignHandle *wsh,
/**
- * We got a 402 PAYMENT REQUIRED response for the /withdraw/sign operation.
+ * We got a 402 PAYMENT REQUIRED response for the /reserve/withdraw operation.
* Check the signatures on the withdraw transactions in the provided
* history and that the balances add up. We don't do anything directly
* with the information, as the JSON will be returned to the application.
@@ -610,8 +610,8 @@ withdraw_sign_ok (struct TALER_MINT_WithdrawSignHandle *wsh,
* @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
*/
static int
-withdraw_sign_payment_required (struct TALER_MINT_WithdrawSignHandle *wsh,
- json_t *json)
+reserve_withdraw_payment_required (struct TALER_MINT_ReserveWithdrawHandle *wsh,
+ json_t *json)
{
struct TALER_Amount balance;
struct TALER_Amount balance_from_history;
@@ -690,16 +690,16 @@ withdraw_sign_payment_required (struct TALER_MINT_WithdrawSignHandle *wsh,
/**
* Function called when we're done processing the
- * HTTP /withdraw/sign request.
+ * HTTP /reserve/withdraw request.
*
- * @param cls the `struct TALER_MINT_WithdrawSignHandle`
+ * @param cls the `struct TALER_MINT_ReserveWithdrawHandle`
* @param eh curl handle of the request that finished
*/
static void
-handle_withdraw_sign_finished (void *cls,
- CURL *eh)
+handle_reserve_withdraw_finished (void *cls,
+ CURL *eh)
{
- struct TALER_MINT_WithdrawSignHandle *wsh = cls;
+ struct TALER_MINT_ReserveWithdrawHandle *wsh = cls;
long response_code;
json_t *json;
@@ -713,7 +713,7 @@ handle_withdraw_sign_finished (void *cls,
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
- withdraw_sign_ok (wsh,
+ reserve_withdraw_ok (wsh,
json))
{
GNUNET_break_op (0);
@@ -728,7 +728,7 @@ handle_withdraw_sign_finished (void *cls,
/* The mint says that the reserve has insufficient funds;
check the signatures in the history... */
if (GNUNET_OK !=
- withdraw_sign_payment_required (wsh,
+ reserve_withdraw_payment_required (wsh,
json))
{
GNUNET_break_op (0);
@@ -766,12 +766,12 @@ handle_withdraw_sign_finished (void *cls,
NULL,
json);
json_decref (json);
- TALER_MINT_withdraw_sign_cancel (wsh);
+ TALER_MINT_reserve_withdraw_cancel (wsh);
}
/**
- * Withdraw a coin from the mint using a /withdraw/sign request. Note
+ * Withdraw a coin from the mint using a /reserve/withdraw request. Note
* that to ensure that no money is lost in case of hardware failures,
* the caller must have committed (most of) the arguments to disk
* before calling, and be ready to repeat the request with the same
@@ -790,16 +790,16 @@ handle_withdraw_sign_finished (void *cls,
* if the inputs are invalid (i.e. denomination key not with this mint).
* In this case, the callback is not called.
*/
-struct TALER_MINT_WithdrawSignHandle *
-TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
- const struct TALER_MINT_DenomPublicKey *pk,
- const struct TALER_ReservePrivateKeyP *reserve_priv,
- const struct TALER_CoinSpendPrivateKeyP *coin_priv,
- const struct TALER_DenominationBlindingKey *blinding_key,
- TALER_MINT_WithdrawSignResultCallback res_cb,
- void *res_cb_cls)
+struct TALER_MINT_ReserveWithdrawHandle *
+TALER_MINT_reserve_withdraw (struct TALER_MINT_Handle *mint,
+ const struct TALER_MINT_DenomPublicKey *pk,
+ const struct TALER_ReservePrivateKeyP *reserve_priv,
+ const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+ const struct TALER_DenominationBlindingKey *blinding_key,
+ TALER_MINT_ReserveWithdrawResultCallback res_cb,
+ void *res_cb_cls)
{
- struct TALER_MINT_WithdrawSignHandle *wsh;
+ struct TALER_MINT_ReserveWithdrawHandle *wsh;
struct TALER_WithdrawRequestPS req;
struct TALER_ReserveSignatureP reserve_sig;
struct TALER_CoinSpendPublicKeyP coin_pub;
@@ -810,7 +810,7 @@ TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
json_t *withdraw_obj;
CURL *eh;
- wsh = GNUNET_new (struct TALER_MINT_WithdrawSignHandle);
+ wsh = GNUNET_new (struct TALER_MINT_ReserveWithdrawHandle);
wsh->mint = mint;
wsh->cb = res_cb;
wsh->cb_cls = res_cb_cls;
@@ -866,7 +866,7 @@ TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
GNUNET_free (coin_ev);
wsh->blinding_key = blinding_key;
- wsh->url = MAH_path_to_url (mint, "/withdraw/sign");
+ wsh->url = MAH_path_to_url (mint, "/reserve/withdraw");
eh = curl_easy_init ();
GNUNET_assert (NULL != (wsh->json_enc =
@@ -897,7 +897,7 @@ TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
wsh->job = MAC_job_add (ctx,
eh,
GNUNET_YES,
- &handle_withdraw_sign_finished,
+ &handle_reserve_withdraw_finished,
wsh);
return wsh;
}
@@ -910,7 +910,7 @@ TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
* @param sign the withdraw sign request handle
*/
void
-TALER_MINT_withdraw_sign_cancel (struct TALER_MINT_WithdrawSignHandle *sign)
+TALER_MINT_reserve_withdraw_cancel (struct TALER_MINT_ReserveWithdrawHandle *sign)
{
if (NULL != sign->job)
{
@@ -924,4 +924,4 @@ TALER_MINT_withdraw_sign_cancel (struct TALER_MINT_WithdrawSignHandle *sign)
}
-/* end of mint_api_withdraw.c */
+/* end of mint_api_reserve.c */
diff --git a/src/mint-lib/test_mint_api.c b/src/mint-lib/test_mint_api.c
index 96a152074..b2f833d08 100644
--- a/src/mint-lib/test_mint_api.c
+++ b/src/mint-lib/test_mint_api.c
@@ -131,7 +131,7 @@ struct MeltDetails
const char *amount;
/**
- * Reference to withdraw_sign operations for coin to
+ * Reference to reserve_withdraw operations for coin to
* be used for the /refresh/melt operation.
*/
const char *coin_ref;
@@ -243,14 +243,14 @@ struct Command
/**
* Set to the API's handle during the operation.
*/
- struct TALER_MINT_WithdrawStatusHandle *wsh;
+ struct TALER_MINT_ReserveStatusHandle *wsh;
/**
* Expected reserve balance.
*/
const char *expected_balance;
- } withdraw_status;
+ } reserve_status;
/**
* Information for a #OC_WITHDRAW_SIGN command.
@@ -296,9 +296,9 @@ struct Command
/**
* Withdraw handle (while operation is running).
*/
- struct TALER_MINT_WithdrawSignHandle *wsh;
+ struct TALER_MINT_ReserveWithdrawHandle *wsh;
- } withdraw_sign;
+ } reserve_withdraw;
/**
* Information for a #OC_DEPOSIT command.
@@ -312,7 +312,7 @@ struct Command
const char *amount;
/**
- * Reference to a withdraw_sign operation for a coin to
+ * Reference to a reserve_withdraw operation for a coin to
* be used for the /deposit operation.
*/
const char *coin_ref;
@@ -649,8 +649,8 @@ compare_admin_add_incoming_history (const struct TALER_MINT_ReserveHistory *h,
* @return #GNUNET_OK if they match, #GNUNET_SYSERR if not
*/
static int
-compare_withdraw_sign_history (const struct TALER_MINT_ReserveHistory *h,
- const struct Command *cmd)
+compare_reserve_withdraw_history (const struct TALER_MINT_ReserveHistory *h,
+ const struct Command *cmd)
{
struct TALER_Amount amount;
struct TALER_Amount amount_with_fee;
@@ -661,12 +661,12 @@ compare_withdraw_sign_history (const struct TALER_MINT_ReserveHistory *h,
return GNUNET_SYSERR;
}
GNUNET_assert (GNUNET_OK ==
- TALER_string_to_amount (cmd->details.withdraw_sign.amount,
+ TALER_string_to_amount (cmd->details.reserve_withdraw.amount,
&amount));
GNUNET_assert (GNUNET_OK ==
TALER_amount_add (&amount_with_fee,
&amount,
- &cmd->details.withdraw_sign.pk->fee_withdraw));
+ &cmd->details.reserve_withdraw.pk->fee_withdraw));
if (0 != TALER_amount_cmp (&amount_with_fee,
&h->amount))
{
@@ -678,7 +678,7 @@ compare_withdraw_sign_history (const struct TALER_MINT_ReserveHistory *h,
/**
- * Function called with the result of a /withdraw/status request.
+ * Function called with the result of a /reserve/status request.
*
* @param cls closure with the interpreter state
* @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
@@ -689,12 +689,12 @@ compare_withdraw_sign_history (const struct TALER_MINT_ReserveHistory *h,
* @param history detailed transaction history, NULL on error
*/
static void
-withdraw_status_cb (void *cls,
- unsigned int http_status,
- json_t *json,
- const struct TALER_Amount *balance,
- unsigned int history_length,
- const struct TALER_MINT_ReserveHistory *history)
+reserve_status_cb (void *cls,
+ unsigned int http_status,
+ json_t *json,
+ const struct TALER_Amount *balance,
+ unsigned int history_length,
+ const struct TALER_MINT_ReserveHistory *history)
{
struct InterpreterState *is = cls;
struct Command *cmd = &is->commands[is->ip];
@@ -703,7 +703,7 @@ withdraw_status_cb (void *cls,
unsigned int j;
struct TALER_Amount amount;
- cmd->details.withdraw_status.wsh = NULL;
+ cmd->details.reserve_status.wsh = NULL;
if (cmd->expected_response_code != http_status)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -727,10 +727,10 @@ withdraw_status_cb (void *cls,
{
case OC_ADMIN_ADD_INCOMING:
if ( ( (NULL != rel->label) &&
- (0 == strcmp (cmd->details.withdraw_status.reserve_reference,
+ (0 == strcmp (cmd->details.reserve_status.reserve_reference,
rel->label) ) ) ||
( (NULL != rel->details.admin_add_incoming.reserve_reference) &&
- (0 == strcmp (cmd->details.withdraw_status.reserve_reference,
+ (0 == strcmp (cmd->details.reserve_status.reserve_reference,
rel->details.admin_add_incoming.reserve_reference) ) ) )
{
if (GNUNET_OK !=
@@ -745,11 +745,11 @@ withdraw_status_cb (void *cls,
}
break;
case OC_WITHDRAW_SIGN:
- if (0 == strcmp (cmd->details.withdraw_status.reserve_reference,
- rel->details.withdraw_sign.reserve_reference))
+ if (0 == strcmp (cmd->details.reserve_status.reserve_reference,
+ rel->details.reserve_withdraw.reserve_reference))
{
if (GNUNET_OK !=
- compare_withdraw_sign_history (&history[j],
+ compare_reserve_withdraw_history (&history[j],
rel))
{
GNUNET_break (0);
@@ -770,10 +770,10 @@ withdraw_status_cb (void *cls,
fail (is);
return;
}
- if (NULL != cmd->details.withdraw_status.expected_balance)
+ if (NULL != cmd->details.reserve_status.expected_balance)
{
GNUNET_assert (GNUNET_OK ==
- TALER_string_to_amount (cmd->details.withdraw_status.expected_balance,
+ TALER_string_to_amount (cmd->details.reserve_status.expected_balance,
&amount));
if (0 != TALER_amount_cmp (&amount,
balance))
@@ -796,7 +796,7 @@ withdraw_status_cb (void *cls,
/**
- * Function called upon completion of our /withdraw/sign request.
+ * Function called upon completion of our /reserve/withdraw request.
*
* @param cls closure with the interpreter state
* @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
@@ -805,15 +805,15 @@ withdraw_status_cb (void *cls,
* @param full_response full response from the mint (for logging, in case of errors)
*/
static void
-withdraw_sign_cb (void *cls,
- unsigned int http_status,
- const struct TALER_DenominationSignature *sig,
- json_t *full_response)
+reserve_withdraw_cb (void *cls,
+ unsigned int http_status,
+ const struct TALER_DenominationSignature *sig,
+ json_t *full_response)
{
struct InterpreterState *is = cls;
struct Command *cmd = &is->commands[is->ip];
- cmd->details.withdraw_sign.wsh = NULL;
+ cmd->details.reserve_withdraw.wsh = NULL;
if (cmd->expected_response_code != http_status)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -834,7 +834,7 @@ withdraw_sign_cb (void *cls,
fail (is);
return;
}
- cmd->details.withdraw_sign.sig.rsa_signature
+ cmd->details.reserve_withdraw.sig.rsa_signature
= GNUNET_CRYPTO_rsa_signature_dup (sig->rsa_signature);
break;
case MHD_HTTP_PAYMENT_REQUIRED:
@@ -1309,44 +1309,44 @@ interpreter_run (void *cls,
return;
case OC_WITHDRAW_STATUS:
GNUNET_assert (NULL !=
- cmd->details.withdraw_status.reserve_reference);
+ cmd->details.reserve_status.reserve_reference);
ref = find_command (is,
- cmd->details.withdraw_status.reserve_reference);
+ cmd->details.reserve_status.reserve_reference);
GNUNET_assert (NULL != ref);
GNUNET_assert (OC_ADMIN_ADD_INCOMING == ref->oc);
GNUNET_CRYPTO_eddsa_key_get_public (&ref->details.admin_add_incoming.reserve_priv.eddsa_priv,
&reserve_pub.eddsa_pub);
- cmd->details.withdraw_status.wsh
- = TALER_MINT_withdraw_status (mint,
- &reserve_pub,
- &withdraw_status_cb,
- is);
+ cmd->details.reserve_status.wsh
+ = TALER_MINT_reserve_status (mint,
+ &reserve_pub,
+ &reserve_status_cb,
+ is);
trigger_context_task ();
return;
case OC_WITHDRAW_SIGN:
GNUNET_assert (NULL !=
- cmd->details.withdraw_sign.reserve_reference);
+ cmd->details.reserve_withdraw.reserve_reference);
ref = find_command (is,
- cmd->details.withdraw_sign.reserve_reference);
+ cmd->details.reserve_withdraw.reserve_reference);
GNUNET_assert (NULL != ref);
GNUNET_assert (OC_ADMIN_ADD_INCOMING == ref->oc);
- if (NULL != cmd->details.withdraw_sign.amount)
+ if (NULL != cmd->details.reserve_withdraw.amount)
{
if (GNUNET_OK !=
- TALER_string_to_amount (cmd->details.withdraw_sign.amount,
+ TALER_string_to_amount (cmd->details.reserve_withdraw.amount,
&amount))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to parse amount `%s' at %u\n",
- cmd->details.withdraw_sign.amount,
+ cmd->details.reserve_withdraw.amount,
is->ip);
fail (is);
return;
}
- cmd->details.withdraw_sign.pk = find_pk (is->keys,
- &amount);
+ cmd->details.reserve_withdraw.pk = find_pk (is->keys,
+ &amount);
}
- if (NULL == cmd->details.withdraw_sign.pk)
+ if (NULL == cmd->details.reserve_withdraw.pk)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to determine denomination key at %u\n",
@@ -1360,22 +1360,22 @@ interpreter_run (void *cls,
struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
priv = GNUNET_CRYPTO_eddsa_key_create ();
- cmd->details.withdraw_sign.coin_priv.eddsa_priv = *priv;
+ cmd->details.reserve_withdraw.coin_priv.eddsa_priv = *priv;
GNUNET_free (priv);
}
- GNUNET_CRYPTO_eddsa_key_get_public (&cmd->details.withdraw_sign.coin_priv.eddsa_priv,
+ GNUNET_CRYPTO_eddsa_key_get_public (&cmd->details.reserve_withdraw.coin_priv.eddsa_priv,
&coin_pub.eddsa_pub);
- cmd->details.withdraw_sign.blinding_key.rsa_blinding_key
- = GNUNET_CRYPTO_rsa_blinding_key_create (GNUNET_CRYPTO_rsa_public_key_len (cmd->details.withdraw_sign.pk->key.rsa_public_key));
- cmd->details.withdraw_sign.wsh
- = TALER_MINT_withdraw_sign (mint,
- cmd->details.withdraw_sign.pk,
- &ref->details.admin_add_incoming.reserve_priv,
- &cmd->details.withdraw_sign.coin_priv,
- &cmd->details.withdraw_sign.blinding_key,
- &withdraw_sign_cb,
- is);
- if (NULL == cmd->details.withdraw_sign.wsh)
+ cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key
+ = GNUNET_CRYPTO_rsa_blinding_key_create (GNUNET_CRYPTO_rsa_public_key_len (cmd->details.reserve_withdraw.pk->key.rsa_public_key));
+ cmd->details.reserve_withdraw.wsh
+ = TALER_MINT_reserve_withdraw (mint,
+ cmd->details.reserve_withdraw.pk,
+ &ref->details.admin_add_incoming.reserve_priv,
+ &cmd->details.reserve_withdraw.coin_priv,
+ &cmd->details.reserve_withdraw.blinding_key,
+ &reserve_withdraw_cb,
+ is);
+ if (NULL == cmd->details.reserve_withdraw.wsh)
{
GNUNET_break (0);
fail (is);
@@ -1404,9 +1404,9 @@ interpreter_run (void *cls,
switch (ref->oc)
{
case OC_WITHDRAW_SIGN:
- coin_priv = &ref->details.withdraw_sign.coin_priv;
- coin_pk = ref->details.withdraw_sign.pk;
- coin_pk_sig = &ref->details.withdraw_sign.sig;
+ coin_priv = &ref->details.reserve_withdraw.coin_priv;
+ coin_pk = ref->details.reserve_withdraw.pk;
+ coin_pk_sig = &ref->details.reserve_withdraw.sig;
break;
case OC_REFRESH_REVEAL:
{
@@ -1549,7 +1549,7 @@ interpreter_run (void *cls,
GNUNET_assert (NULL != ref);
GNUNET_assert (OC_WITHDRAW_SIGN == ref->oc);
- melt_privs[i] = ref->details.withdraw_sign.coin_priv;
+ melt_privs[i] = ref->details.reserve_withdraw.coin_priv;
if (GNUNET_OK !=
TALER_string_to_amount (md->amount,
&melt_amounts[i]))
@@ -1561,8 +1561,8 @@ interpreter_run (void *cls,
fail (is);
return;
}
- melt_sigs[i] = ref->details.withdraw_sign.sig;
- melt_pks[i] = *ref->details.withdraw_sign.pk;
+ melt_sigs[i] = ref->details.reserve_withdraw.sig;
+ melt_pks[i] = *ref->details.reserve_withdraw.pk;
}
for (i=0;i<num_fresh_coins;i++)
{
@@ -1572,7 +1572,7 @@ interpreter_run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to parse amount `%s' at %u\n",
- cmd->details.withdraw_sign.amount,
+ cmd->details.reserve_withdraw.amount,
is->ip);
fail (is);
return;
@@ -1639,7 +1639,7 @@ interpreter_run (void *cls,
/* find melt command */
ref = find_command (is,
ref->details.refresh_reveal.melt_ref);
- /* find withdraw_sign command */
+ /* find reserve_withdraw command */
{
unsigned int idx;
const struct MeltDetails *md;
@@ -1658,7 +1658,7 @@ interpreter_run (void *cls,
/* finally, use private key from withdraw sign command */
cmd->details.refresh_link.rlh
= TALER_MINT_refresh_link (mint,
- &ref->details.withdraw_sign.coin_priv,
+ &ref->details.reserve_withdraw.coin_priv,
&link_cb,
is);
if (NULL == cmd->details.refresh_link.rlh)
@@ -1724,35 +1724,35 @@ do_shutdown (void *cls,
}
break;
case OC_WITHDRAW_STATUS:
- if (NULL != cmd->details.withdraw_status.wsh)
+ if (NULL != cmd->details.reserve_status.wsh)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Command %u (%s) did not complete\n",
i,
cmd->label);
- TALER_MINT_withdraw_status_cancel (cmd->details.withdraw_status.wsh);
- cmd->details.withdraw_status.wsh = NULL;
+ TALER_MINT_reserve_status_cancel (cmd->details.reserve_status.wsh);
+ cmd->details.reserve_status.wsh = NULL;
}
break;
case OC_WITHDRAW_SIGN:
- if (NULL != cmd->details.withdraw_sign.wsh)
+ if (NULL != cmd->details.reserve_withdraw.wsh)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Command %u (%s) did not complete\n",
i,
cmd->label);
- TALER_MINT_withdraw_sign_cancel (cmd->details.withdraw_sign.wsh);
- cmd->details.withdraw_sign.wsh = NULL;
+ TALER_MINT_reserve_withdraw_cancel (cmd->details.reserve_withdraw.wsh);
+ cmd->details.reserve_withdraw.wsh = NULL;
}
- if (NULL != cmd->details.withdraw_sign.sig.rsa_signature)
+ if (NULL != cmd->details.reserve_withdraw.sig.rsa_signature)
{
- GNUNET_CRYPTO_rsa_signature_free (cmd->details.withdraw_sign.sig.rsa_signature);
- cmd->details.withdraw_sign.sig.rsa_signature = NULL;
+ GNUNET_CRYPTO_rsa_signature_free (cmd->details.reserve_withdraw.sig.rsa_signature);
+ cmd->details.reserve_withdraw.sig.rsa_signature = NULL;
}
- if (NULL != cmd->details.withdraw_sign.blinding_key.rsa_blinding_key)
+ if (NULL != cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key)
{
- GNUNET_CRYPTO_rsa_blinding_key_free (cmd->details.withdraw_sign.blinding_key.rsa_blinding_key);
- cmd->details.withdraw_sign.blinding_key.rsa_blinding_key = NULL;
+ GNUNET_CRYPTO_rsa_blinding_key_free (cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key);
+ cmd->details.reserve_withdraw.blinding_key.rsa_blinding_key = NULL;
}
break;
case OC_DEPOSIT:
@@ -2018,15 +2018,15 @@ run (void *cls,
{ .oc = OC_WITHDRAW_SIGN,
.label = "withdraw-coin-1",
.expected_response_code = MHD_HTTP_OK,
- .details.withdraw_sign.reserve_reference = "create-reserve-1",
- .details.withdraw_sign.amount = "EUR:5" },
+ .details.reserve_withdraw.reserve_reference = "create-reserve-1",
+ .details.reserve_withdraw.amount = "EUR:5" },
/* Check that deposit and withdraw operation are in history, and
that the balance is now at zero */
{ .oc = OC_WITHDRAW_STATUS,
.label = "withdraw-status-1",
.expected_response_code = MHD_HTTP_OK,
- .details.withdraw_status.reserve_reference = "create-reserve-1",
- .details.withdraw_status.expected_balance = "EUR:0" },
+ .details.reserve_status.reserve_reference = "create-reserve-1",
+ .details.reserve_status.expected_balance = "EUR:0" },
/* Try to deposit the 5 EUR coin (in full) */
{ .oc = OC_DEPOSIT,
.label = "deposit-simple",
@@ -2041,8 +2041,8 @@ run (void *cls,
{ .oc = OC_WITHDRAW_SIGN,
.label = "withdraw-coin-2",
.expected_response_code = MHD_HTTP_PAYMENT_REQUIRED,
- .details.withdraw_sign.reserve_reference = "create-reserve-1",
- .details.withdraw_sign.amount = "EUR:5" },
+ .details.reserve_withdraw.reserve_reference = "create-reserve-1",
+ .details.reserve_withdraw.amount = "EUR:5" },
/* Try to double-spend the 5 EUR coin with different wire details */
{ .oc = OC_DEPOSIT,
@@ -2086,8 +2086,8 @@ run (void *cls,
{ .oc = OC_WITHDRAW_SIGN,
.label = "refresh-withdraw-coin-1",
.expected_response_code = MHD_HTTP_OK,
- .details.withdraw_sign.reserve_reference = "refresh-create-reserve-1",
- .details.withdraw_sign.amount = "EUR:5" },
+ .details.reserve_withdraw.reserve_reference = "refresh-create-reserve-1",
+ .details.reserve_withdraw.amount = "EUR:5" },
/* Try to partially spend (deposit) 1 EUR of the 5 EUR coin (in full)
(merchant would receive EUR:0.99 due to 1 ct deposit fee) */
{ .oc = OC_DEPOSIT,