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

more renaming

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-04 11:51:00 +01:00
parent 6cc516427b
commit 7f37017e91
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
16 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange-tools/taler-exchange-keycheck.c
View File

@ -132,7 +132,7 @@ static int
denomkeys_iter (void *cls, denomkeys_iter (void *cls,
const char *alias, const char *alias,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) TALER_EXCHANGEDB_DenominationKey *dki)
{ {
struct GNUNET_HashCode hc; struct GNUNET_HashCode hc;

4
src/exchange-tools/taler-exchange-keyup.c
View File

@ -762,7 +762,7 @@ get_cointype_params (const char *ct,
*/ */
static void static void
create_denomkey_issue (const struct CoinTypeParams *params, create_denomkey_issue (const struct CoinTypeParams *params,
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation * struct TALER_EXCHANGEDB_DenominationKey *
dki) dki)
{ {
dki->denom_priv.rsa_private_key dki->denom_priv.rsa_private_key
@ -820,7 +820,7 @@ exchange_keys_update_cointype (void *cls,
int *ret = cls; int *ret = cls;
struct CoinTypeParams p; struct CoinTypeParams p;
const char *dkf; const char *dkf;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation denomkey_issue; struct TALER_EXCHANGEDB_DenominationKey denomkey_issue;
if (0 != strncasecmp (coin_alias, if (0 != strncasecmp (coin_alias,
"coin_", "coin_",

4
src/exchange/taler-exchange-httpd_deposit.c
View File

@ -256,7 +256,7 @@ verify_and_execute_deposit (struct MHD_Connection *connection,
int mhd_ret; int mhd_ret;
struct TALER_Amount amount_without_fee; struct TALER_Amount amount_without_fee;
struct DepositContext dc; struct DepositContext dc;
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; const struct TALER_EXCHANGEDB_DenominationKey *dki;
enum TALER_ErrorCode ec; enum TALER_ErrorCode ec;
unsigned int hc; unsigned int hc;
@ -402,7 +402,7 @@ TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection,
enum TALER_ErrorCode ec; enum TALER_ErrorCode ec;
unsigned int hc; unsigned int hc;
struct TALER_EXCHANGEDB_Deposit deposit; struct TALER_EXCHANGEDB_Deposit deposit;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; struct TALER_EXCHANGEDB_DenominationKey *dki;
struct GNUNET_HashCode my_h_wire; struct GNUNET_HashCode my_h_wire;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_json ("wire", &wire), GNUNET_JSON_spec_json ("wire", &wire),

30
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -92,7 +92,7 @@ struct DenominationKeyEntry
* Reference to the public key. * Reference to the public key.
* (Must also be in the `denomkey_map`). * (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. * Head of DLL of signatures for this @e dki.
@ -424,7 +424,7 @@ free_denom_key (void *cls,
const struct GNUNET_HashCode *key, const struct GNUNET_HashCode *key,
void *value) void *value)
{ {
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = value; struct TALER_EXCHANGEDB_DenominationKey *dki = value;
(void) cls; (void) cls;
(void) key; (void) key;
@ -590,9 +590,9 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk,
static int static int
store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map, store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) TALER_EXCHANGEDB_DenominationKey *dki)
{ {
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *d2; struct TALER_EXCHANGEDB_DenominationKey *d2;
int res; 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; d2->issue = dki->issue;
if (NULL != dki->denom_priv.rsa_private_key) if (NULL != dki->denom_priv.rsa_private_key)
d2->denom_priv.rsa_private_key d2->denom_priv.rsa_private_key
@ -654,7 +654,7 @@ struct AddRevocationContext
/** /**
* Denomination key that is revoked. * Denomination key that is revoked.
*/ */
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; const struct TALER_EXCHANGEDB_DenominationKey *dki;
/** /**
* Signature affirming the revocation. * Signature affirming the revocation.
@ -733,7 +733,7 @@ add_revocations_transaction (void *cls,
/** /**
* Execute transaction to add a denomination to the DB. * 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 connection NULL
* @param session database session to use * @param session database session to use
* @param[out] mhd_ret not used * @param[out] mhd_ret not used
@ -745,7 +745,7 @@ add_denomination_transaction (void *cls,
struct TALER_EXCHANGEDB_Session *session, struct TALER_EXCHANGEDB_Session *session,
int *mhd_ret) int *mhd_ret)
{ {
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = cls; const struct TALER_EXCHANGEDB_DenominationKey *dki = cls;
enum GNUNET_DB_QueryStatus qs; enum GNUNET_DB_QueryStatus qs;
struct TALER_EXCHANGEDB_DenominationKeyInformationP issue_exists; struct TALER_EXCHANGEDB_DenominationKeyInformationP issue_exists;
@ -780,7 +780,7 @@ static int
reload_keys_denom_iter (void *cls, reload_keys_denom_iter (void *cls,
const char *alias, const char *alias,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) TALER_EXCHANGEDB_DenominationKey *dki)
{ {
struct ResponseFactoryContext *rfc = cls; struct ResponseFactoryContext *rfc = cls;
struct TEH_KS_StateHandle *key_state = rfc->key_state; struct TEH_KS_StateHandle *key_state = rfc->key_state;
@ -869,7 +869,7 @@ revocations_iter (void *cls,
struct ResponseFactoryContext *rfc = cls; struct ResponseFactoryContext *rfc = cls;
struct TEH_KS_StateHandle *key_state = rfc->key_state; struct TEH_KS_StateHandle *key_state = rfc->key_state;
struct AddRevocationContext arc; struct AddRevocationContext arc;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; struct TALER_EXCHANGEDB_DenominationKey *dki;
dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map, dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map,
denom_hash); denom_hash);
@ -1129,7 +1129,7 @@ reload_auditor_iter (void *cls,
* *
* @param cls a `struct ResponseFactoryContext` * @param cls a `struct ResponseFactoryContext`
* @param denom_hash hash of a denomination key * @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 * @return #GNUNET_OK
*/ */
static int static int
@ -1138,7 +1138,7 @@ initialize_denomkey_array (void *cls,
void *value) void *value)
{ {
struct ResponseFactoryContext *rfc = cls; 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].denom_key_hash = *denom_hash;
rfc->denomkey_array[rfc->denomkey_array_length++].dki = dki; rfc->denomkey_array[rfc->denomkey_array_length++].dki = dki;
@ -1597,7 +1597,7 @@ reload_public_denoms_cb (void *cls,
TALER_EXCHANGEDB_DenominationKeyInformationP *issue) TALER_EXCHANGEDB_DenominationKeyInformationP *issue)
{ {
struct ResponseFactoryContext *rfc = cls; struct ResponseFactoryContext *rfc = cls;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; struct TALER_EXCHANGEDB_DenominationKey dki;
int ret; int ret;
if (rfc->now.abs_value_us > GNUNET_TIME_absolute_ntoh 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, * @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) * 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_denomination_key_lookup_by_hash (const struct
TEH_KS_StateHandle *key_state, TEH_KS_StateHandle *key_state,
const struct const struct
@ -1979,7 +1979,7 @@ TEH_KS_denomination_key_lookup_by_hash (const struct
enum TALER_ErrorCode *ec, enum TALER_ErrorCode *ec,
unsigned int *hc) unsigned int *hc)
{ {
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; struct TALER_EXCHANGEDB_DenominationKey *dki;
struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Absolute now;
const struct GNUNET_CONTAINER_MultiHashMap *map; const struct GNUNET_CONTAINER_MultiHashMap *map;

2
src/exchange/taler-exchange-httpd_keystate.h
View File

@ -145,7 +145,7 @@ enum TEH_KS_DenominationKeyUse
* @return the denomination key issue, * @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) * 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_denomination_key_lookup_by_hash (const struct
TEH_KS_StateHandle *key_state, TEH_KS_StateHandle *key_state,
const struct const struct

2
src/exchange/taler-exchange-httpd_melt.c
View File

@ -454,7 +454,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
{ {
/* Baseline: check if deposits/refreshs are generally /* Baseline: check if deposits/refreshs are generally
simply still allowed for this denomination */ simply still allowed for this denomination */
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; struct TALER_EXCHANGEDB_DenominationKey *dki;
unsigned int hc; unsigned int hc;
enum TALER_ErrorCode ec; enum TALER_ErrorCode ec;

2
src/exchange/taler-exchange-httpd_recoup.c
View File

@ -420,7 +420,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection,
int refreshed) int refreshed)
{ {
struct RecoupContext pc; struct RecoupContext pc;
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; const struct TALER_EXCHANGEDB_DenominationKey *dki;
struct TALER_RecoupRequestPS pr; struct TALER_RecoupRequestPS pr;
struct GNUNET_HashCode c_hash; struct GNUNET_HashCode c_hash;
char *coin_ev; char *coin_ev;

4
src/exchange/taler-exchange-httpd_refreshes_reveal.c
View File

@ -141,7 +141,7 @@ struct RevealContext
/** /**
* Denominations being requested. * Denominations being requested.
*/ */
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation **dkis; const struct TALER_EXCHANGEDB_DenominationKey **dkis;
/** /**
* Envelopes to be signed. * 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); unsigned int num_fresh_coins = json_array_size (new_denoms_h_json);
const struct 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 GNUNET_HashCode dki_h[num_fresh_coins];
struct TALER_RefreshCoinData rcds[num_fresh_coins]; struct TALER_RefreshCoinData rcds[num_fresh_coins];
struct TALER_CoinSpendSignatureP link_sigs[num_fresh_coins]; struct TALER_CoinSpendSignatureP link_sigs[num_fresh_coins];

2
src/exchange/taler-exchange-httpd_refund.c
View File

@ -484,7 +484,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
} }
/* Obtain information about the coin's denomination! */ /* Obtain information about the coin's denomination! */
{ {
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; struct TALER_EXCHANGEDB_DenominationKey *dki;
unsigned int hc; unsigned int hc;
enum TALER_ErrorCode ec; enum TALER_ErrorCode ec;

2
src/exchange/taler-exchange-httpd_withdraw.c
View File

@ -149,7 +149,7 @@ struct WithdrawContext
/** /**
* Details about denomination we are about to withdraw. * 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. * Set to the resulting signed coin data to be returned to the client.

6
src/exchangedb/exchangedb_denomkeys.c
View File

@ -107,7 +107,7 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir,
int int
TALER_EXCHANGEDB_denomination_key_read (const char *filename, TALER_EXCHANGEDB_denomination_key_read (const char *filename,
struct struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation TALER_EXCHANGEDB_DenominationKey
*dki) *dki)
{ {
uint64_t size; uint64_t size;
@ -186,7 +186,7 @@ TALER_EXCHANGEDB_denomination_key_read (const char *filename,
int int
TALER_EXCHANGEDB_denomination_key_write (const char *filename, TALER_EXCHANGEDB_denomination_key_write (const char *filename,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation TALER_EXCHANGEDB_DenominationKey
*dki) *dki)
{ {
char *priv_enc; char *priv_enc;
@ -276,7 +276,7 @@ denomkeys_iterate_keydir_iter (void *cls,
const char *filename) const char *filename)
{ {
struct DenomkeysIterateContext *dic = cls; struct DenomkeysIterateContext *dic = cls;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation issue; struct TALER_EXCHANGEDB_DenominationKey issue;
int ret; int ret;
memset (&issue, 0, sizeof (issue)); memset (&issue, 0, sizeof (issue));

4
src/exchangedb/plugin_exchangedb_common.c
View File

@ -132,7 +132,7 @@ common_free_coin_transaction_list (void *cls,
{ {
struct TALER_EXCHANGEDB_RecoupRefreshListEntry *rr; struct TALER_EXCHANGEDB_RecoupRefreshListEntry *rr;
rr = tl->recoup_refresh; rr = tl->details.recoup_refresh;
if (NULL != rr->coin.denom_sig.rsa_signature) if (NULL != rr->coin.denom_sig.rsa_signature)
GNUNET_CRYPTO_rsa_signature_free (rr->coin.denom_sig.rsa_signature); GNUNET_CRYPTO_rsa_signature_free (rr->coin.denom_sig.rsa_signature);
GNUNET_free (rr); GNUNET_free (rr);
@ -143,7 +143,7 @@ common_free_coin_transaction_list (void *cls,
struct TALER_EXCHANGEDB_TransactionList *next; struct TALER_EXCHANGEDB_TransactionList *next;
next = tl->next; next = tl->next;
GNUNET_free (list); GNUNET_free (tl);
tl = next; tl = next;
} }
} }

4
src/exchangedb/test_exchangedb.c
View File

@ -220,7 +220,7 @@ create_denom_key_pair (unsigned int size,
const struct TALER_Amount *fee_refund) const struct TALER_Amount *fee_refund)
{ {
struct DenomKeyPair *dkp; struct DenomKeyPair *dkp;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; struct TALER_EXCHANGEDB_DenominationKey dki;
struct TALER_EXCHANGEDB_DenominationKeyInformationP issue2; struct TALER_EXCHANGEDB_DenominationKeyInformationP issue2;
dkp = GNUNET_new (struct DenomKeyPair); dkp = GNUNET_new (struct DenomKeyPair);
@ -233,7 +233,7 @@ create_denom_key_pair (unsigned int size,
are not properly initialized for this test. */ are not properly initialized for this test. */
memset (&dki, memset (&dki,
0, 0,
sizeof (struct TALER_EXCHANGEDB_DenominationKeyIssueInformation)); sizeof (struct TALER_EXCHANGEDB_DenominationKey));
dki.denom_pub = dkp->pub; dki.denom_pub = dkp->pub;
GNUNET_TIME_round_abs (&now); GNUNET_TIME_round_abs (&now);
dki.issue.properties.start = GNUNET_TIME_absolute_hton (now); dki.issue.properties.start = GNUNET_TIME_absolute_hton (now);

10
src/exchangedb/test_exchangedb_denomkeys.c
View File

@ -45,9 +45,9 @@
static int static int
dki_iter (void *cls, dki_iter (void *cls,
const char *alias, const char *alias,
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) const struct TALER_EXCHANGEDB_DenominationKey *dki)
{ {
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *exp = cls; const struct TALER_EXCHANGEDB_DenominationKey *exp = cls;
if (0 != GNUNET_memcmp (&exp->issue, if (0 != GNUNET_memcmp (&exp->issue,
&dki->issue)) &dki->issue))
@ -88,7 +88,7 @@ dki_iter_revoked (void *cls,
const struct GNUNET_HashCode *denom_hash, const struct GNUNET_HashCode *denom_hash,
const struct TALER_MasterSignatureP *revocation_master_sig) const struct TALER_MasterSignatureP *revocation_master_sig)
{ {
const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *exp = cls; const struct TALER_EXCHANGEDB_DenominationKey *exp = cls;
if (NULL == revocation_master_sig) if (NULL == revocation_master_sig)
{ {
@ -109,10 +109,10 @@ int
main (int argc, main (int argc,
const char *const argv[]) const char *const argv[])
{ {
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; struct TALER_EXCHANGEDB_DenominationKey dki;
char *enc; char *enc;
size_t enc_size; size_t enc_size;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki_read; struct TALER_EXCHANGEDB_DenominationKey dki_read;
struct GNUNET_CRYPTO_EddsaPrivateKey *pk; struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
struct TALER_MasterPrivateKeyP master_priv; struct TALER_MasterPrivateKeyP master_priv;
struct TALER_MasterPublicKeyP master_pub; struct TALER_MasterPublicKeyP master_pub;

6
src/include/taler_exchangedb_lib.h
View File

@ -105,7 +105,7 @@ typedef int
(*TALER_EXCHANGEDB_DenominationKeyIterator)(void *cls, (*TALER_EXCHANGEDB_DenominationKeyIterator)(void *cls,
const char *alias, const char *alias,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation TALER_EXCHANGEDB_DenominationKey
*dki); *dki);
@ -194,7 +194,7 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir,
int int
TALER_EXCHANGEDB_denomination_key_write (const char *filename, TALER_EXCHANGEDB_denomination_key_write (const char *filename,
const struct const struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation TALER_EXCHANGEDB_DenominationKey
*dki); *dki);
@ -208,7 +208,7 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename,
int int
TALER_EXCHANGEDB_denomination_key_read (const char *filename, TALER_EXCHANGEDB_denomination_key_read (const char *filename,
struct struct
TALER_EXCHANGEDB_DenominationKeyIssueInformation TALER_EXCHANGEDB_DenominationKey
*dki); *dki);

2
src/include/taler_exchangedb_plugin.h
View File

@ -80,7 +80,7 @@ GNUNET_NETWORK_STRUCT_END
* @brief All information about a denomination key (which is used to * @brief All information about a denomination key (which is used to
* sign coins into existence). * sign coins into existence).
*/ */
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation struct TALER_EXCHANGEDB_DenominationKey
{ {
/** /**
* The private key of the denomination. Will be NULL if the private * The private key of the denomination. Will be NULL if the private