more rename-fest work

7 files changed, 19 insertions, 19 deletions

diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c
index a86735963..5e7557b99 100644
--- a/src/mint/taler-mint-httpd.c
+++ b/src/mint/taler-mint-httpd.c
@@ -264,7 +264,7 @@ mint_serve_process_config (const char *mint_directory)
   GNUNET_free (TMH_master_public_key_str);
 
   if (NULL ==
-      (TMH_plugin = TALER_MINT_plugin_load (cfg)))
+      (TMH_plugin = TALER_MINTDB_plugin_load (cfg)))
   {
     fprintf (stderr,
              "failed to initialize DB subsystem\n");
@@ -358,6 +358,6 @@ main (int argc, char *const *argv)
 
   ret = TMH_KS_loop ();
   MHD_stop_daemon (mydaemon);
-  TALER_MINT_plugin_unload (TMH_plugin);
+  TALER_MINTDB_plugin_unload (TMH_plugin);
   return (GNUNET_OK == ret) ? 0 : 1;
 }
diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index 13fde7240..f1253bd51 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -106,7 +106,7 @@ TMH_DB_execute_deposit (struct MHD_Connection *connection,
   struct TALER_Amount spent;
   struct TALER_Amount value;
   struct TMH_KS_StateHandle *mks;
-  struct TALER_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   int ret;
 
   if (NULL == (session = TMH_plugin->get_session (TMH_plugin->cls,
@@ -266,8 +266,8 @@ TMH_DB_execute_withdraw_sign (struct MHD_Connection *connection,
   const struct ReserveHistory *pos;
   struct TMH_KS_StateHandle *key_state;
   struct CollectableBlindcoin collectable;
-  struct TALER_DenominationKeyIssueInformation *dki;
-  struct TALER_DenominationKeyIssueInformation *tdki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *tdki;
   struct GNUNET_CRYPTO_rsa_Signature *sig;
   struct TALER_Amount amount_required;
   struct TALER_Amount deposit_total;
@@ -987,7 +987,7 @@ refresh_mint_coin (struct MHD_Connection *connection,
                    const struct RefreshCommitCoin *commit_coin,
                    unsigned int coin_off)
 {
-  struct TALER_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TALER_DenominationSignature ev_sig;
 
   dki = TMH_KS_denomination_key_lookup (key_state,
diff --git a/src/mint/taler-mint-httpd_deposit.c b/src/mint/taler-mint-httpd_deposit.c
index ee2d24845..e732c87d7 100644
--- a/src/mint/taler-mint-httpd_deposit.c
+++ b/src/mint/taler-mint-httpd_deposit.c
@@ -57,7 +57,7 @@ verify_and_execute_deposit (struct MHD_Connection *connection,
 {
   struct TMH_KS_StateHandle *key_state;
   struct TALER_DepositRequestPS dr;
-  struct TALER_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TALER_Amount fee_deposit;
 
   dr.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_DEPOSIT);
diff --git a/src/mint/taler-mint-httpd_keystate.c b/src/mint/taler-mint-httpd_keystate.c
index 746c257a9..16b23aae3 100644
--- a/src/mint/taler-mint-httpd_keystate.c
+++ b/src/mint/taler-mint-httpd_keystate.c
@@ -76,7 +76,7 @@ struct TMH_KS_StateHandle
   /**
    * Mint signing key that should be used currently.
    */
-  struct TALER_MintSigningKeyValidityPSPriv current_sign_key_issue;
+  struct TALER_MINTDB_PrivateSigningKeyInformationP current_sign_key_issue;
 
   /**
    * Reference count.  The struct is released when the RC hits zero.
@@ -189,13 +189,13 @@ TALER_MINT_conf_duration_provide ()
 static int
 reload_keys_denom_iter (void *cls,
                         const char *alias,
-                        const struct TALER_DenominationKeyIssueInformation *dki)
+                        const struct TALER_MINTDB_DenominationKeyIssueInformation *dki)
 {
   struct TMH_KS_StateHandle *ctx = cls;
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_TIME_Absolute horizon;
   struct GNUNET_HashCode denom_key_hash;
-  struct TALER_DenominationKeyIssueInformation *d2;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *d2;
   int res;
 
   horizon = GNUNET_TIME_relative_to_absolute (TALER_MINT_conf_duration_provide ());
@@ -220,7 +220,7 @@ reload_keys_denom_iter (void *cls,
   GNUNET_CRYPTO_rsa_public_key_hash (dki->denom_pub.rsa_public_key,
                                      &denom_key_hash);
   d2 = GNUNET_memdup (dki,
-                      sizeof (struct TALER_DenominationKeyIssueInformation));
+                      sizeof (struct TALER_MINTDB_DenominationKeyIssueInformation));
   res = GNUNET_CONTAINER_multihashmap_put (ctx->denomkey_map,
                                            &denom_key_hash,
                                            d2,
@@ -277,7 +277,7 @@ sign_key_issue_to_json (const struct TALER_MintSigningKeyValidityPS *ski)
 static int
 reload_keys_sign_iter (void *cls,
                        const char *filename,
-                       const struct TALER_MintSigningKeyValidityPSPriv *ski)
+                       const struct TALER_MINTDB_PrivateSigningKeyInformationP *ski)
 {
   struct TMH_KS_StateHandle *ctx = cls;
   struct GNUNET_TIME_Absolute now;
@@ -332,7 +332,7 @@ free_denom_key (void *cls,
                 const struct GNUNET_HashCode *key,
                 void *value)
 {
-  struct TALER_DenominationKeyIssueInformation *dki = value;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki = value;
 
   GNUNET_free (dki);
   return GNUNET_OK;
@@ -398,10 +398,10 @@ TMH_KS_acquire (void)
     key_state->denomkey_map = GNUNET_CONTAINER_multihashmap_create (32,
                                                                     GNUNET_NO);
     key_state->reload_time = GNUNET_TIME_absolute_get ();
-    TALER_MINT_denomkeys_iterate (TMH_mint_directory,
+    TALER_MINTDB_denomination_keys_iterate (TMH_mint_directory,
                                   &reload_keys_denom_iter,
                                   key_state);
-    TALER_MINT_signkeys_iterate (TMH_mint_directory,
+    TALER_MINTDB_signing_keys_iterate (TMH_mint_directory,
                                  &reload_keys_sign_iter,
                                  key_state);
     key_state->next_reload = GNUNET_TIME_absolute_ntoh (key_state->current_sign_key_issue.issue.expire);
@@ -452,7 +452,7 @@ TMH_KS_acquire (void)
  * @return the denomination key issue,
  *         or NULL if denom_pub could not be found
  */
-struct TALER_DenominationKeyIssueInformation *
+struct TALER_MINTDB_DenominationKeyIssueInformation *
 TMH_KS_denomination_key_lookup (const struct TMH_KS_StateHandle *key_state,
                           const struct TALER_DenominationPublicKey *denom_pub)
 {
diff --git a/src/mint/taler-mint-httpd_keystate.h b/src/mint/taler-mint-httpd_keystate.h
index 26c9ccad6..ec0d24aa3 100644
--- a/src/mint/taler-mint-httpd_keystate.h
+++ b/src/mint/taler-mint-httpd_keystate.h
@@ -65,7 +65,7 @@ TMH_KS_release (struct TMH_KS_StateHandle *key_state);
  * @return the denomination key issue,
  *         or NULL if denom_pub could not be found
  */
-struct TALER_DenominationKeyIssueInformation *
+struct TALER_MINTDB_DenominationKeyIssueInformation *
 TMH_KS_denomination_key_lookup (const struct TMH_KS_StateHandle *key_state,
                                 const struct TALER_DenominationPublicKey *denom_pub);
 
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index e315555c9..ef7fb03ad 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -240,7 +240,7 @@ verify_coin_public_info (struct MHD_Connection *connection,
 {
   struct TALER_RefreshMeltCoinAffirmationPS body;
   struct TMH_KS_StateHandle *key_state;
-  struct TALER_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TALER_Amount fee_refresh;
 
   body.purpose.size = htonl (sizeof (struct TALER_RefreshMeltCoinAffirmationPS));
diff --git a/src/mint/taler-mint-httpd_responses.c b/src/mint/taler-mint-httpd_responses.c
index 31a4ecd0b..95bb95cef 100644
--- a/src/mint/taler-mint-httpd_responses.c
+++ b/src/mint/taler-mint-httpd_responses.c
@@ -437,7 +437,7 @@ compile_reserve_history (const struct ReserveHistory *rh,
   json_t *transaction;
   int ret;
   const struct ReserveHistory *pos;
-  struct TALER_DenominationKeyIssueInformation *dki;
+  struct TALER_MINTDB_DenominationKeyIssueInformation *dki;
   struct TMH_KS_StateHandle *key_state;
   struct TALER_WithdrawRequestPS wr;