summaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_deposit.c4
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c30
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.h2
-rw-r--r--src/exchange/taler-exchange-httpd_melt.c2
-rw-r--r--src/exchange/taler-exchange-httpd_recoup.c2
-rw-r--r--src/exchange/taler-exchange-httpd_refreshes_reveal.c4
-rw-r--r--src/exchange/taler-exchange-httpd_refund.c2
-rw-r--r--src/exchange/taler-exchange-httpd_withdraw.c2
8 files changed, 24 insertions, 24 deletions
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
index da89ff47e..29a41ddec 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -256,7 +256,7 @@ verify_and_execute_deposit (struct MHD_Connection *connection,
int mhd_ret;
struct TALER_Amount amount_without_fee;
struct DepositContext dc;
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ const struct TALER_EXCHANGEDB_DenominationKey *dki;
enum TALER_ErrorCode ec;
unsigned int hc;
@@ -402,7 +402,7 @@ TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection,
enum TALER_ErrorCode ec;
unsigned int hc;
struct TALER_EXCHANGEDB_Deposit deposit;
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
struct GNUNET_HashCode my_h_wire;
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_json ("wire", &wire),
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index 357616d1a..75e20ad04 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -92,7 +92,7 @@ struct DenominationKeyEntry
* Reference to the public key.
* (Must also be in the `denomkey_map`).
*/
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ const struct TALER_EXCHANGEDB_DenominationKey *dki;
/**
* Head of DLL of signatures for this @e dki.
@@ -424,7 +424,7 @@ free_denom_key (void *cls,
const struct GNUNET_HashCode *key,
void *value)
{
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = value;
+ struct TALER_EXCHANGEDB_DenominationKey *dki = value;
(void) cls;
(void) key;
@@ -590,9 +590,9 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk,
static int
store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map,
const struct
- TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki)
+ TALER_EXCHANGEDB_DenominationKey *dki)
{
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *d2;
+ struct TALER_EXCHANGEDB_DenominationKey *d2;
int res;
{
@@ -620,7 +620,7 @@ store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map,
}
}
- d2 = GNUNET_new (struct TALER_EXCHANGEDB_DenominationKeyIssueInformation);
+ d2 = GNUNET_new (struct TALER_EXCHANGEDB_DenominationKey);
d2->issue = dki->issue;
if (NULL != dki->denom_priv.rsa_private_key)
d2->denom_priv.rsa_private_key
@@ -654,7 +654,7 @@ struct AddRevocationContext
/**
* Denomination key that is revoked.
*/
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ const struct TALER_EXCHANGEDB_DenominationKey *dki;
/**
* Signature affirming the revocation.
@@ -733,7 +733,7 @@ add_revocations_transaction (void *cls,
/**
* Execute transaction to add a denomination to the DB.
*
- * @param cls closure with the `const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *`
+ * @param cls closure with the `const struct TALER_EXCHANGEDB_DenominationKey *`
* @param connection NULL
* @param session database session to use
* @param[out] mhd_ret not used
@@ -745,7 +745,7 @@ add_denomination_transaction (void *cls,
struct TALER_EXCHANGEDB_Session *session,
int *mhd_ret)
{
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = cls;
+ const struct TALER_EXCHANGEDB_DenominationKey *dki = cls;
enum GNUNET_DB_QueryStatus qs;
struct TALER_EXCHANGEDB_DenominationKeyInformationP issue_exists;
@@ -780,7 +780,7 @@ static int
reload_keys_denom_iter (void *cls,
const char *alias,
const struct
- TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki)
+ TALER_EXCHANGEDB_DenominationKey *dki)
{
struct ResponseFactoryContext *rfc = cls;
struct TEH_KS_StateHandle *key_state = rfc->key_state;
@@ -869,7 +869,7 @@ revocations_iter (void *cls,
struct ResponseFactoryContext *rfc = cls;
struct TEH_KS_StateHandle *key_state = rfc->key_state;
struct AddRevocationContext arc;
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map,
denom_hash);
@@ -1129,7 +1129,7 @@ reload_auditor_iter (void *cls,
*
* @param cls a `struct ResponseFactoryContext`
* @param denom_hash hash of a denomination key
- * @param value a `struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *`
+ * @param value a `struct TALER_EXCHANGEDB_DenominationKey *`
* @return #GNUNET_OK
*/
static int
@@ -1138,7 +1138,7 @@ initialize_denomkey_array (void *cls,
void *value)
{
struct ResponseFactoryContext *rfc = cls;
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = value;
+ struct TALER_EXCHANGEDB_DenominationKey *dki = value;
rfc->denomkey_array[rfc->denomkey_array_length].denom_key_hash = *denom_hash;
rfc->denomkey_array[rfc->denomkey_array_length++].dki = dki;
@@ -1597,7 +1597,7 @@ reload_public_denoms_cb (void *cls,
TALER_EXCHANGEDB_DenominationKeyInformationP *issue)
{
struct ResponseFactoryContext *rfc = cls;
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki;
+ struct TALER_EXCHANGEDB_DenominationKey dki;
int ret;
if (rfc->now.abs_value_us > GNUNET_TIME_absolute_ntoh
@@ -1970,7 +1970,7 @@ TEH_KS_acquire_ (struct GNUNET_TIME_Absolute now,
* @return the denomination key issue,
* or NULL if denom_pub could not be found (or is not valid at this time for the given @a use)
*/
-struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *
+struct TALER_EXCHANGEDB_DenominationKey *
TEH_KS_denomination_key_lookup_by_hash (const struct
TEH_KS_StateHandle *key_state,
const struct
@@ -1979,7 +1979,7 @@ TEH_KS_denomination_key_lookup_by_hash (const struct
enum TALER_ErrorCode *ec,
unsigned int *hc)
{
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
struct GNUNET_TIME_Absolute now;
const struct GNUNET_CONTAINER_MultiHashMap *map;
diff --git a/src/exchange/taler-exchange-httpd_keystate.h b/src/exchange/taler-exchange-httpd_keystate.h
index a69060964..1b8e820a9 100644
--- a/src/exchange/taler-exchange-httpd_keystate.h
+++ b/src/exchange/taler-exchange-httpd_keystate.h
@@ -145,7 +145,7 @@ enum TEH_KS_DenominationKeyUse
* @return the denomination key issue,
* or NULL if denom_pub could not be found (or is not valid at this time for the given @a use)
*/
-struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *
+struct TALER_EXCHANGEDB_DenominationKey *
TEH_KS_denomination_key_lookup_by_hash (const struct
TEH_KS_StateHandle *key_state,
const struct
diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c
index 035fc48f1..e0f67d5e4 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -454,7 +454,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
{
/* Baseline: check if deposits/refreshs are generally
simply still allowed for this denomination */
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
unsigned int hc;
enum TALER_ErrorCode ec;
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c
index f4cd99155..b3fca6371 100644
--- a/src/exchange/taler-exchange-httpd_recoup.c
+++ b/src/exchange/taler-exchange-httpd_recoup.c
@@ -420,7 +420,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
int refreshed)
{
struct RecoupContext pc;
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ const struct TALER_EXCHANGEDB_DenominationKey *dki;
struct TALER_RecoupRequestPS pr;
struct GNUNET_HashCode c_hash;
char *coin_ev;
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index ff5718fcc..3d759734a 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -141,7 +141,7 @@ struct RevealContext
/**
* Denominations being requested.
*/
- const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation **dkis;
+ const struct TALER_EXCHANGEDB_DenominationKey **dkis;
/**
* Envelopes to be signed.
@@ -538,7 +538,7 @@ resolve_refresh_reveal_denominations (struct TEH_KS_StateHandle *key_state,
{
unsigned int num_fresh_coins = json_array_size (new_denoms_h_json);
const struct
- TALER_EXCHANGEDB_DenominationKeyIssueInformation *dkis[num_fresh_coins];
+ TALER_EXCHANGEDB_DenominationKey *dkis[num_fresh_coins];
struct GNUNET_HashCode dki_h[num_fresh_coins];
struct TALER_RefreshCoinData rcds[num_fresh_coins];
struct TALER_CoinSpendSignatureP link_sigs[num_fresh_coins];
diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c
index 2bbab0418..c66a7da47 100644
--- a/src/exchange/taler-exchange-httpd_refund.c
+++ b/src/exchange/taler-exchange-httpd_refund.c
@@ -484,7 +484,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
}
/* Obtain information about the coin's denomination! */
{
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
unsigned int hc;
enum TALER_ErrorCode ec;
diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c
index 33308dce2..c8ca4822f 100644
--- a/src/exchange/taler-exchange-httpd_withdraw.c
+++ b/src/exchange/taler-exchange-httpd_withdraw.c
@@ -149,7 +149,7 @@ struct WithdrawContext
/**
* Details about denomination we are about to withdraw.
*/
- struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki;
+ struct TALER_EXCHANGEDB_DenominationKey *dki;
/**
* Set to the resulting signed coin data to be returned to the client.