more rename-fest work

5 files changed, 22 insertions, 22 deletions

diff --git a/src/mint-tools/Makefile.am b/src/mint-tools/Makefile.am
index 7ae6f355a..5230f0b62 100644
--- a/src/mint-tools/Makefile.am
+++ b/src/mint-tools/Makefile.am
@@ -14,7 +14,7 @@ taler_mint_keyup_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/mint/libtalermint_common.la \
+  $(top_builddir)/src/mintdb/libtalermintdb.la \
   -lgnunetutil
 taler_mint_keyup_LDFLAGS = $(POSTGRESQL_LDFLAGS)
 
@@ -25,8 +25,7 @@ taler_mint_keycheck_SOURCES = \
 taler_mint_keycheck_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/mint/libtalermint_common.la \
+  $(top_builddir)/src/mintdb/libtalermintdb.la \
   -lgnunetutil
 taler_mint_keycheck_LDFLAGS = $(POSTGRESQL_LDFLAGS)
 
@@ -36,7 +35,7 @@ taler_mint_reservemod_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/mint/libtalermint_common.la \
+  $(top_builddir)/src/mintdb/libtalermintdb.la \
   -lpq \
   -lgnunetutil
 taler_mint_reservemod_LDFLAGS = \
@@ -52,7 +51,7 @@ taler_mint_dbinit_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/mint/libtalermint_common.la \
+  $(top_builddir)/src/mintdb/libtalermintdb.la \
   -lpq \
   -lgnunetutil
 taler_mint_dbinit_LDFLAGS = \
diff --git a/src/mint-tools/taler-mint-dbinit.c b/src/mint-tools/taler-mint-dbinit.c
index ec08369b8..612cb4c3f 100644
--- a/src/mint-tools/taler-mint-dbinit.c
+++ b/src/mint-tools/taler-mint-dbinit.c
@@ -84,7 +84,7 @@ main (int argc,
     return 1;
   }
   if (NULL ==
-      (plugin = TALER_MINT_plugin_load (cfg)))
+      (plugin = TALER_MINTDB_plugin_load (cfg)))
   {
     fprintf (stderr,
              "Failed to initialize database plugin.\n");
@@ -96,10 +96,10 @@ main (int argc,
   {
     fprintf (stderr,
              "Failed to initialize database.\n");
-    TALER_MINT_plugin_unload (plugin);
+    TALER_MINTDB_plugin_unload (plugin);
     return 1;
   }
-  TALER_MINT_plugin_unload (plugin);
+  TALER_MINTDB_plugin_unload (plugin);
   return 0;
 }
 
diff --git a/src/mint-tools/taler-mint-keycheck.c b/src/mint-tools/taler-mint-keycheck.c
index b18ebdf7a..df228994d 100644
--- a/src/mint-tools/taler-mint-keycheck.c
+++ b/src/mint-tools/taler-mint-keycheck.c
@@ -50,7 +50,7 @@ static struct GNUNET_CONFIGURATION_Handle *kcfg;
 static int
 signkeys_iter (void *cls,
                const char *filename,
-               const struct TALER_MintSigningKeyValidityPSPriv *ski)
+               const struct TALER_MINTDB_PrivateSigningKeyInformationP *ski)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Iterating over key `%s' for start time %s\n",
@@ -93,7 +93,7 @@ signkeys_iter (void *cls,
 static int
 mint_signkeys_check ()
 {
-  if (0 > TALER_MINT_signkeys_iterate (mint_directory,
+  if (0 > TALER_MINTDB_signing_keys_iterate (mint_directory,
                                        &signkeys_iter,
                                        NULL))
     return GNUNET_NO;
@@ -114,7 +114,7 @@ mint_signkeys_check ()
 static int
 denomkeys_iter (void *cls,
                 const char *alias,
-                const struct TALER_DenominationKeyIssueInformation *dki)
+                const struct TALER_MINTDB_DenominationKeyIssueInformation *dki)
 {
   struct GNUNET_HashCode hc;
 
@@ -165,7 +165,7 @@ denomkeys_iter (void *cls,
 static int
 mint_denomkeys_check ()
 {
-  if (0 > TALER_MINT_denomkeys_iterate (mint_directory,
+  if (0 > TALER_MINTDB_denomination_keys_iterate (mint_directory,
                                         &denomkeys_iter,
                                         NULL))
     return GNUNET_NO;
diff --git a/src/mint-tools/taler-mint-keyup.c b/src/mint-tools/taler-mint-keyup.c
index 8ffe7d165..0d84635af 100644
--- a/src/mint-tools/taler-mint-keyup.c
+++ b/src/mint-tools/taler-mint-keyup.c
@@ -207,7 +207,7 @@ get_signkey_file (struct GNUNET_TIME_Absolute start)
 
   GNUNET_snprintf (dir,
                    sizeof (dir),
-                   "%s" DIR_SEPARATOR_STR DIR_SIGNKEYS DIR_SEPARATOR_STR "%llu",
+                   "%s" DIR_SEPARATOR_STR TALER_MINTDB_DIR_SIGNING_KEYS DIR_SEPARATOR_STR "%llu",
                    mint_directory,
                    (unsigned long long) start.abs_value_us);
   return dir;
@@ -285,7 +285,7 @@ get_cointype_dir (const struct CoinTypeParams *p)
 
   GNUNET_snprintf (dir,
                    sizeof (dir),
-                   "%s" DIR_SEPARATOR_STR DIR_DENOMKEYS DIR_SEPARATOR_STR "%s-%s",
+                   "%s" DIR_SEPARATOR_STR TALER_MINTDB_DIR_DENOMINATION_KEYS DIR_SEPARATOR_STR "%s-%s",
                    mint_directory,
                    val_str,
                    hash_str);
@@ -434,7 +434,7 @@ get_anchor (const char *dir,
 static void
 create_signkey_issue_priv (struct GNUNET_TIME_Absolute start,
                            struct GNUNET_TIME_Relative duration,
-                           struct TALER_MintSigningKeyValidityPSPriv *pi)
+                           struct TALER_MINTDB_PrivateSigningKeyInformationP *pi)
 {
   struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
   struct TALER_MintSigningKeyValidityPS *issue = &pi->issue;
@@ -487,7 +487,7 @@ mint_keys_update_signkeys ()
   ROUND_TO_SECS (signkey_duration,
                  rel_value_us);
   GNUNET_asprintf (&signkey_dir,
-                   "%s" DIR_SEPARATOR_STR DIR_SIGNKEYS,
+                   "%s" DIR_SEPARATOR_STR TALER_MINTDB_DIR_SIGNING_KEYS,
                    mint_directory);
   /* make sure the directory exists */
   if (GNUNET_OK !=
@@ -506,7 +506,7 @@ mint_keys_update_signkeys ()
   while (anchor.abs_value_us < lookahead_sign_stamp.abs_value_us)
   {
     const char *skf;
-    struct TALER_MintSigningKeyValidityPSPriv signkey_issue;
+    struct TALER_MINTDB_PrivateSigningKeyInformationP signkey_issue;
     ssize_t nwrite;
 
     skf = get_signkey_file (anchor);
@@ -676,7 +676,7 @@ get_cointype_params (const char *ct,
  */
 static void
 create_denomkey_issue (const struct CoinTypeParams *params,
-                       struct TALER_DenominationKeyIssueInformation *dki)
+                       struct TALER_MINTDB_DenominationKeyIssueInformation *dki)
 {
   dki->denom_priv.rsa_private_key
     = GNUNET_CRYPTO_rsa_private_key_create (params->rsa_keysize);
@@ -702,8 +702,8 @@ create_denomkey_issue (const struct CoinTypeParams *params,
   TALER_amount_hton (&dki->issue.fee_refresh,
                      &params->fee_refresh);
   dki->issue.purpose.purpose = htonl (TALER_SIGNATURE_MINT_DENOMINATION_KEY_VALIDITY);
-  dki->issue.purpose.size = htonl (sizeof (struct TALER_DenominationKeyIssueInformation) -
-                                   offsetof (struct TALER_DenominationKeyIssueInformation,
+  dki->issue.purpose.size = htonl (sizeof (struct TALER_MINTDB_DenominationKeyIssueInformation) -
+                                   offsetof (struct TALER_MINTDB_DenominationKeyIssueInformation,
                                              issue.purpose));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
@@ -726,7 +726,7 @@ mint_keys_update_cointype (void *cls,
   int *ret = cls;
   struct CoinTypeParams p;
   const char *dkf;
-  struct TALER_DenominationKeyIssueInformation denomkey_issue;
+  struct TALER_MINTDB_DenominationKeyIssueInformation denomkey_issue;
 
   if (0 != strncasecmp (coin_alias,
                         "coin_",
@@ -759,7 +759,7 @@ mint_keys_update_cointype (void *cls,
     create_denomkey_issue (&p,
                            &denomkey_issue);
     if (GNUNET_OK !=
-        TALER_MINT_write_denom_key (dkf,
+        TALER_MINTDB_denomination_key_write (dkf,
                                     &denomkey_issue))
     {
       fprintf (stderr,
diff --git a/src/mint-tools/taler-mint-reservemod.c b/src/mint-tools/taler-mint-reservemod.c
index 3261f47cf..3f3bdcd98 100644
--- a/src/mint-tools/taler-mint-reservemod.c
+++ b/src/mint-tools/taler-mint-reservemod.c
@@ -24,6 +24,7 @@
 #include <libpq-fe.h>
 #include "taler_util.h"
 #include "taler_signatures.h"
+#include "taler_pq_lib.h"
 #include "taler_mintdb_plugin.h"
 #include "taler_mintdb_lib.h"