more taler-config leftovers fixed

9 files changed, 395 insertions, 363 deletions

diff --git a/src/auditor/batch.sh b/src/auditor/batch.sh
index bbe1be0ba..4746c51ff 100755
--- a/src/auditor/batch.sh
+++ b/src/auditor/batch.sh
@@ -55,7 +55,7 @@ echo " FOUND"
 pwd
 # Clean up
 
-DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
+DATA_DIR=`taler-exchange-config -f -c $CONF -s PATHS -o TALER_HOME`
 rm -rf $DATA_DIR || true
 
 # reset database
@@ -64,18 +64,18 @@ createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB"
 
 
 # obtain key configuration data
-MASTER_PRIV_FILE=$(taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE)
+MASTER_PRIV_FILE=$(taler-exchange-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE)
 MASTER_PRIV_DIR=$(dirname $MASTER_PRIV_FILE)
 mkdir -p $MASTER_PRIV_DIR
 gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null
 MASTER_PUB=$(gnunet-ecc -p $MASTER_PRIV_FILE)
-EXCHANGE_URL=$(taler-config -c $CONF -s EXCHANGE -o BASE_URL)
-MERCHANT_PORT=$(taler-config -c $CONF -s MERCHANT -o PORT)
+EXCHANGE_URL=$(taler-exchange-config -c $CONF -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-merchant-config -c $CONF -s MERCHANT -o PORT)
 MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
-BANK_PORT=$(taler-config -c $CONF -s BANK -o HTTP_PORT)
+BANK_PORT=$(taler-exchange-config -c $CONF -s BANK -o HTTP_PORT)
 BANK_URL=http://localhost:${BANK_PORT}/
 AUDITOR_URL=http://localhost:8083/
-AUDITOR_PRIV_FILE=$(taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE)
+AUDITOR_PRIV_FILE=$(taler-auditor-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE)
 AUDITOR_PRIV_DIR=$(dirname $AUDITOR_PRIV_FILE)
 mkdir -p $AUDITOR_PRIV_DIR
 gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null
@@ -84,13 +84,41 @@ AUDITOR_PUB=$(gnunet-ecc -p $AUDITOR_PRIV_FILE)
 echo "AUDITOR PUB is $AUDITOR_PUB using file $AUDITOR_PRIV_FILE"
 
 # patch configuration
-taler-config -c $CONF -s exchange -o MASTER_PUBLIC_KEY -V $MASTER_PUB
-taler-config -c $CONF -s auditor -o PUBLIC_KEY -V $AUDITOR_PUB
-taler-config -c $CONF -s merchant-exchange-default -o MASTER_KEY -V $MASTER_PUB
-taler-config -c $CONF -s exchangedb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s auditordb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s merchantdb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s bank -o database -V postgres:///$TARGET_DB
+taler-exchange-config \
+    -c $CONF \
+    -s exchange \
+    -o MASTER_PUBLIC_KEY \
+    -V $MASTER_PUB
+taler-auditor-config \
+    -c $CONF \
+    -s auditor \
+    -o PUBLIC_KEY \
+    -V $AUDITOR_PUB
+taler-merchant-config \
+    -c $CONF \
+    -s merchant-exchange-default \
+    -o MASTER_KEY \
+    -V $MASTER_PUB
+taler-exchange-config \
+    -c $CONF \
+    -s exchangedb-postgres \
+    -o CONFIG \
+    -V postgres:///$TARGET_DB
+taler-auditor-config \
+    -c $CONF \
+    -s auditordb-postgres \
+    -o CONFIG \
+    -V postgres:///$TARGET_DB
+taler-merchant-config \
+    -c $CONF \
+    -s merchantdb-postgres \
+    -o CONFIG \
+    -V postgres:///$TARGET_DB
+taler-exchange-config \
+    -c $CONF \
+    -s bank \
+    -o database \
+    -V postgres:///$TARGET_DB
 
 # setup exchange
 echo "Setting up exchange"
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 33831d06f..fdd2ab5b3 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -58,10 +58,10 @@ setup -c "$CONF" \
       -d "iban"
 
 # obtain key configuration data
-EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
-MERCHANT_PORT=$(taler-config -c "$CONF" -s MERCHANT -o PORT)
+EXCHANGE_URL=$(taler-exchange-config -c "$CONF" -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-merchant-config -c "$CONF" -s MERCHANT -o PORT)
 MERCHANT_URL="http://localhost:${MERCHANT_PORT}/"
-BANK_PORT=$(taler-config -c "$CONF" -s BANK -o HTTP_PORT)
+BANK_PORT=$(taler-exchange-config -c "$CONF" -s BANK -o HTTP_PORT)
 BANK_URL="http://localhost:${BANK_PORT}/"
 
 echo -n "Checking setup worked ..."
@@ -135,7 +135,7 @@ mkdir -p "$(dirname "$BASEDB")"
 echo "Dumping database ${BASEDB}.sql"
 pg_dump -O "auditor-basedb" | sed -e '/AS integer/d' > "${BASEDB}.sql"
 cp "${CONF}.edited" "${BASEDB}.conf"
-cp "$(taler-config -c "${CONF}.edited" -s exchange-offline -o MASTER_PRIV_FILE -f)" "${BASEDB}.mpriv"
+cp "$(taler-exchange-config -c "${CONF}.edited" -s exchange-offline -o MASTER_PRIV_FILE -f)" "${BASEDB}.mpriv"
 
 # clean up
 echo -n "Final clean up ..."
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index 0825f3525..699a57e3c 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -28,10 +28,10 @@ setup -c "$CONF" \
       -d "iban"
 
 # obtain key configuration data
-EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
-MERCHANT_PORT=$(taler-config -c "$CONF" -s MERCHANT -o PORT)
+EXCHANGE_URL=$(taler-exchange-config -c "$CONF" -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-merchant-config -c "$CONF" -s MERCHANT -o PORT)
 MERCHANT_URL="http://localhost:${MERCHANT_PORT}/"
-BANK_PORT=$(taler-config -c "$CONF" -s BANK -o HTTP_PORT)
+BANK_PORT=$(taler-exchange-config -c "$CONF" -s BANK -o HTTP_PORT)
 BANK_URL="http://localhost:${BANK_PORT}/"
 
 
diff --git a/src/auditor/setup.sh b/src/auditor/setup.sh
index 18892e896..60ff4af24 100755
--- a/src/auditor/setup.sh
+++ b/src/auditor/setup.sh
@@ -84,7 +84,7 @@ function launch_libeufin() {
     >"${MY_TMP_DIR}/libeufin-bank-stdout.log" \
     2>"${MY_TMP_DIR}/libeufin-bank-stderr.log" &
   echo $! >"${MY_TMP_DIR}/libeufin-bank.pid"
-  BANK_PORT=$(taler-config -c "$CONF" -s "libeufin-bank" -o "PORT")
+  BANK_PORT=$(taler-exchange-config -c "$CONF" -s "libeufin-bank" -o "PORT")
   BANK_URL="http://localhost:${BANK_PORT}/"
   for n in $(seq 1 100); do
     echo -n "."
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index b2e5aac20..04461b95a 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -2138,7 +2138,7 @@ function check_with_database()
     export CONF
     echo "Running test suite with database $BASEDB using configuration $CONF"
     MASTER_PRIV_FILE="${BASEDB}.mpriv"
-    taler-config \
+    taler-exchange-config \
         -f \
         -c "${CONF}" \
         -s exchange-offline \
diff --git a/src/auditor/test-kyc.sh b/src/auditor/test-kyc.sh
index f90350184..259e08041 100755
--- a/src/auditor/test-kyc.sh
+++ b/src/auditor/test-kyc.sh
@@ -627,7 +627,7 @@ function check_with_database()
     CONF="$1.conf"
     echo "Running test suite with database $BASEDB using configuration $CONF"
     MASTER_PRIV_FILE="${BASEDB}.mpriv"
-    taler-config \
+    taler-exchange-config \
         -f \
         -c "${CONF}" \
         -s exchange-offline \
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index 277b102fb..53bbeabb1 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -636,7 +636,11 @@ function check_with_database()
     echo "Running test suite with database $BASEDB using configuration $CONF"
 
     MASTER_PRIV_FILE="${BASEDB}.mpriv"
-    taler-config -f -c "${CONF}" -s exchange-offline -o MASTER_PRIV_FILE -V "${MASTER_PRIV_FILE}"
+    taler-exchange-config -f \
+                          -c "${CONF}" \
+                          -s exchange-offline \
+                          -o MASTER_PRIV_FILE \
+                          -V "${MASTER_PRIV_FILE}"
     MASTER_PUB=$(gnunet-ecc -p "$MASTER_PRIV_FILE")
 
     echo "MASTER PUB is ${MASTER_PUB} using file ${MASTER_PRIV_FILE}"
diff --git a/src/exchangedb/exchangedb_aml.c b/src/exchangedb/exchangedb_aml.c
index c709ce1be..63d533c29 100644
--- a/src/exchangedb/exchangedb_aml.c
+++ b/src/exchangedb/exchangedb_aml.c
@@ -68,21 +68,21 @@ TALER_EXCHANGEDB_persist_aml_program_result (
     }
     qs = plugin->insert_kyc_measure_result (
       plugin->cls,
-    process_row,
-    account_id,
-    birthday,
-    GNUNET_TIME_timestamp_get (),
-    provider_name,
-    provider_user_id,
-    provider_legitimization_id,
-    expiration,
-    apr->details.success.account_properties,
-    apr->details.success.new_rules,
-    apr->details.success.to_investigate,
-    apr->details.success.num_events,
-    apr->details.success.events,
-    eas,
-    ea);
+      process_row,
+      account_id,
+      birthday,
+      GNUNET_TIME_timestamp_get (),
+      provider_name,
+      provider_user_id,
+      provider_legitimization_id,
+      expiration,
+      apr->details.success.account_properties,
+      apr->details.success.new_rules,
+      apr->details.success.to_investigate,
+      apr->details.success.num_events,
+      apr->details.success.events,
+      eas,
+      ea);
     GNUNET_free (ea);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Stored encrypted KYC process #%llu attributes: %d\n",
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 072545f5b..3b155dab7 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -3696,7 +3696,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
    */
   enum GNUNET_GenericReturnValue
-  (*drop_tables)(void *cls);
+    (*drop_tables)(void *cls);
 
   /**
    * Create the necessary tables if they are not present
@@ -3709,9 +3709,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
    */
   enum GNUNET_GenericReturnValue
-  (*create_tables)(void *cls,
-                   bool support_partitions,
-                   uint32_t num_partitions);
+    (*create_tables)(void *cls,
+                     bool support_partitions,
+                     uint32_t num_partitions);
 
 
   /**
@@ -3723,8 +3723,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK on success
    */
   enum GNUNET_GenericReturnValue
-  (*start)(void *cls,
-           const char *name);
+    (*start)(void *cls,
+             const char *name);
 
 
   /**
@@ -3736,8 +3736,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK on success
    */
   enum GNUNET_GenericReturnValue
-  (*start_read_committed)(void *cls,
-                          const char *name);
+    (*start_read_committed)(void *cls,
+                            const char *name);
 
   /**
    * Start a READ ONLY serializable transaction.
@@ -3748,8 +3748,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK on success
    */
   enum GNUNET_GenericReturnValue
-  (*start_read_only)(void *cls,
-                     const char *name);
+    (*start_read_only)(void *cls,
+                       const char *name);
 
 
   /**
@@ -3759,7 +3759,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*commit)(void *cls);
+    (*commit)(void *cls);
 
 
   /**
@@ -3773,7 +3773,7 @@ struct TALER_EXCHANGEDB_Plugin
    *         #GNUNET_SYSERR on hard errors
    */
   enum GNUNET_GenericReturnValue
-  (*preflight)(void *cls);
+    (*preflight)(void *cls);
 
 
   /**
@@ -3840,7 +3840,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return status of the query
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_denomination_info)(
+    (*insert_denomination_info)(
     void *cls,
     const struct TALER_DenominationPublicKey *denom_pub,
     const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue);
@@ -3855,7 +3855,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_denomination_info)(
+    (*get_denomination_info)(
     void *cls,
     const struct TALER_DenominationHashP *denom_pub_hash,
     struct TALER_EXCHANGEDB_DenominationKeyInformation *issue);
@@ -3873,9 +3873,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_denomination_info)(void *cls,
-                               TALER_EXCHANGEDB_DenominationCallback cb,
-                               void *cb_cls);
+    (*iterate_denomination_info)(void *cls,
+                                 TALER_EXCHANGEDB_DenominationCallback cb,
+                                 void *cb_cls);
 
 
   /**
@@ -3889,9 +3889,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_denominations)(void *cls,
-                           TALER_EXCHANGEDB_DenominationsCallback cb,
-                           void *cb_cls);
+    (*iterate_denominations)(void *cls,
+                             TALER_EXCHANGEDB_DenominationsCallback cb,
+                             void *cb_cls);
 
   /**
    * Function called to invoke @a cb on every non-revoked exchange signing key
@@ -3904,9 +3904,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_active_signkeys)(void *cls,
-                             TALER_EXCHANGEDB_ActiveSignkeysCallback cb,
-                             void *cb_cls);
+    (*iterate_active_signkeys)(void *cls,
+                               TALER_EXCHANGEDB_ActiveSignkeysCallback cb,
+                               void *cb_cls);
 
 
   /**
@@ -3919,9 +3919,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_active_auditors)(void *cls,
-                             TALER_EXCHANGEDB_AuditorsCallback cb,
-                             void *cb_cls);
+    (*iterate_active_auditors)(void *cls,
+                               TALER_EXCHANGEDB_AuditorsCallback cb,
+                               void *cb_cls);
 
 
   /**
@@ -3935,7 +3935,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_auditor_denominations)(
+    (*iterate_auditor_denominations)(
     void *cls,
     TALER_EXCHANGEDB_AuditorDenominationsCallback cb,
     void *cb_cls);
@@ -3951,8 +3951,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*reserves_get)(void *cls,
-                  struct TALER_EXCHANGEDB_Reserve *reserve);
+    (*reserves_get)(void *cls,
+                    struct TALER_EXCHANGEDB_Reserve *reserve);
 
 
   /**
@@ -3965,7 +3965,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*reserves_get_origin)(
+    (*reserves_get_origin)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     struct TALER_FullPaytoHashP *h_payto,
@@ -3981,9 +3981,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*drain_kyc_alert)(void *cls,
-                     uint32_t trigger_type,
-                     struct TALER_NormalizedPaytoHashP *h_payto);
+    (*drain_kyc_alert)(void *cls,
+                       uint32_t trigger_type,
+                       struct TALER_NormalizedPaytoHashP *h_payto);
 
 
   /**
@@ -3997,7 +3997,7 @@ struct TALER_EXCHANGEDB_Plugin
    *             set to the status of the
    */
   enum GNUNET_DB_QueryStatus
-  (*reserves_in_insert)(
+    (*reserves_in_insert)(
     void *cls,
     const struct TALER_EXCHANGEDB_ReserveInInfo *reserves,
     unsigned int reserves_length,
@@ -4018,7 +4018,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param serial_id bank-specific row identifying the transfer
    */
   enum GNUNET_DB_QueryStatus
-  (*kycauth_in_insert)(
+    (*kycauth_in_insert)(
     void *cls,
     const union TALER_AccountPublicKeyP *account_pub,
     const struct TALER_Amount *credit_amount,
@@ -4041,7 +4041,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param serial_id bank-specific row identifying the transfer
    */
   enum GNUNET_DB_QueryStatus
-  (*wad_in_insert)(
+    (*wad_in_insert)(
     void *cls,
     const struct TALER_WadIdentifierP *wad_id,
     const char *origin_exchange_url,
@@ -4062,10 +4062,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return statement execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*lock_nonce)(void *cls,
-                const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
-                const struct TALER_DenominationHashP *denom_pub_hash,
-                const union TALER_EXCHANGEDB_NonceLockTargetP *target);
+    (*lock_nonce)(void *cls,
+                  const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
+                  const struct TALER_DenominationHashP *denom_pub_hash,
+                  const union TALER_EXCHANGEDB_NonceLockTargetP *target);
 
 
   /**
@@ -4080,10 +4080,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return statement execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_withdraw_info)(void *cls,
-                       const struct TALER_BlindedCoinHashP *bch,
-                       struct TALER_EXCHANGEDB_CollectableBlindcoin *
-                       collectable);
+    (*get_withdraw_info)(void *cls,
+                         const struct TALER_BlindedCoinHashP *bch,
+                         struct TALER_EXCHANGEDB_CollectableBlindcoin *
+                         collectable);
 
 
   /**
@@ -4114,7 +4114,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_batch_withdraw)(
+    (*do_batch_withdraw)(
     void *cls,
     struct GNUNET_TIME_Timestamp now,
     const struct TALER_ReservePublicKeyP *reserve_pub,
@@ -4143,7 +4143,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_batch_withdraw_insert)(
+    (*do_batch_withdraw_insert)(
     void *cls,
     const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
     const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
@@ -4165,7 +4165,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return statement execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_age_withdraw)(
+    (*get_age_withdraw)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     const struct TALER_AgeWithdrawCommitmentHashP *ach,
@@ -4187,7 +4187,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_age_withdraw)(
+    (*do_age_withdraw)(
     void *cls,
     const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
     struct GNUNET_TIME_Timestamp now,
@@ -4208,7 +4208,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_policy_details)(
+    (*get_policy_details)(
     void *cls,
     const struct GNUNET_HashCode *hc,
     struct TALER_PolicyDetails *detail);
@@ -4226,7 +4226,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*persist_policy_details)(
+    (*persist_policy_details)(
     void *cls,
     const struct TALER_PolicyDetails *details,
     uint64_t *policy_details_serial_id,
@@ -4248,7 +4248,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_deposit)(
+    (*do_deposit)(
     void *cls,
     const struct TALER_EXCHANGEDB_BatchDeposit *bd,
     struct GNUNET_TIME_Timestamp *exchange_timestamp,
@@ -4267,7 +4267,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_check_deposit_idempotent)(
+    (*do_check_deposit_idempotent)(
     void *cls,
     const struct TALER_EXCHANGEDB_BatchDeposit *bd,
     struct GNUNET_TIME_Timestamp *exchange_timestamp,
@@ -4288,7 +4288,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_melt)(
+    (*do_melt)(
     void *cls,
     const struct TALER_RefreshMasterSecretP *rms,
     struct TALER_EXCHANGEDB_Refresh *refresh,
@@ -4305,7 +4305,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*add_policy_fulfillment_proof)(
+    (*add_policy_fulfillment_proof)(
     void *cls,
     struct TALER_PolicyFulfillmentTransactionData *fulfillment);
 
@@ -4324,7 +4324,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*cs_refreshes_reveal)(
+    (*cs_refreshes_reveal)(
     void *cls,
     const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
     const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
@@ -4347,7 +4347,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_refund)(
+    (*do_refund)(
     void *cls,
     const struct TALER_EXCHANGEDB_Refund *refund,
     const struct TALER_Amount *deposit_fee,
@@ -4375,7 +4375,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_recoup)(
+    (*do_recoup)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     uint64_t reserve_out_serial_id,
@@ -4405,7 +4405,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_recoup_refresh)(
+    (*do_recoup_refresh)(
     void *cls,
     const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
     uint64_t rrc_serial,
@@ -4436,7 +4436,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_history)(
+    (*get_reserve_history)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     uint64_t start_off,
@@ -4457,7 +4457,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_balance)(
+    (*get_reserve_balance)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     struct TALER_Amount *balance,
@@ -4559,7 +4559,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status, non-negative on success
    */
   enum GNUNET_DB_QueryStatus
-  (*batch_ensure_coin_known)(
+    (*batch_ensure_coin_known)(
     void *cls,
     const struct TALER_CoinPublicInfo *coin,
     struct TALER_EXCHANGEDB_CoinInfo *result,
@@ -4576,9 +4576,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status, non-negative on success
    */
   enum GNUNET_DB_QueryStatus
-  (*get_known_coin)(void *cls,
-                    const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                    struct TALER_CoinPublicInfo *coin_info);
+    (*get_known_coin)(void *cls,
+                      const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                      struct TALER_CoinPublicInfo *coin_info);
 
   /**
    * Retrieve the signature and corresponding denomination for a given @a coin
@@ -4590,7 +4590,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] denom_sig the signature with the denomination's private key over the coin_pub
    */
   enum GNUNET_DB_QueryStatus
-  (*get_signature_for_known_coin)(
+    (*get_signature_for_known_coin)(
     void *cls,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     struct TALER_DenominationPublicKey *denom_pub,
@@ -4606,10 +4606,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_coin_denomination)(void *cls,
-                           const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                           uint64_t *known_coin_id,
-                           struct TALER_DenominationHashP *denom_hash);
+    (*get_coin_denomination)(void *cls,
+                             const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                             uint64_t *known_coin_id,
+                             struct TALER_DenominationHashP *denom_hash);
 
 
   /**
@@ -4624,7 +4624,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] h_wire hash of the wire details
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_hash_for_contract)(
+    (*get_wire_hash_for_contract)(
     void *cls,
     const struct TALER_MerchantPublicKeyP *merchant_pub,
     const struct TALER_PrivateContractHashP *h_contract_terms,
@@ -4648,7 +4648,7 @@ struct TALER_EXCHANGEDB_Plugin
    */
   // FIXME: rename!
   enum GNUNET_DB_QueryStatus
-  (*have_deposit2)(
+    (*have_deposit2)(
     void *cls,
     const struct TALER_PrivateContractHashP *h_contract_terms,
     const struct TALER_MerchantWireHashP *h_wire,
@@ -4668,8 +4668,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_refund)(void *cls,
-                   const struct TALER_EXCHANGEDB_Refund *refund);
+    (*insert_refund)(void *cls,
+                     const struct TALER_EXCHANGEDB_Refund *refund);
 
 
   /**
@@ -4684,7 +4684,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_refunds_by_coin)(
+    (*select_refunds_by_coin)(
     void *cls,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -4707,11 +4707,11 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_ready_deposit)(void *cls,
-                       uint64_t start_shard_row,
-                       uint64_t end_shard_row,
-                       struct TALER_MerchantPublicKeyP *merchant_pub,
-                       struct TALER_FullPayto *payto_uri);
+    (*get_ready_deposit)(void *cls,
+                         uint64_t start_shard_row,
+                         uint64_t end_shard_row,
+                         struct TALER_MerchantPublicKeyP *merchant_pub,
+                         struct TALER_FullPayto *payto_uri);
 
 
   /**
@@ -4726,7 +4726,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*aggregate)(
+    (*aggregate)(
     void *cls,
     const struct TALER_FullPaytoHashP *h_payto,
     const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -4747,7 +4747,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*create_aggregation_transient)(
+    (*create_aggregation_transient)(
     void *cls,
     const struct TALER_FullPaytoHashP *h_payto,
     const char *exchange_account_section,
@@ -4769,7 +4769,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aggregation_transient)(
+    (*select_aggregation_transient)(
     void *cls,
     const struct TALER_FullPaytoHashP *h_payto,
     const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -4788,7 +4788,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*find_aggregation_transient)(
+    (*find_aggregation_transient)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     TALER_EXCHANGEDB_TransientAggregationCallback cb,
@@ -4807,7 +4807,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*update_aggregation_transient)(
+    (*update_aggregation_transient)(
     void *cls,
     const struct TALER_FullPaytoHashP *h_payto,
     const struct TALER_WireTransferIdentifierRawP *wtid,
@@ -4825,7 +4825,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*delete_aggregation_transient)(
+    (*delete_aggregation_transient)(
     void *cls,
     const struct TALER_FullPaytoHashP *h_payto,
     const struct TALER_WireTransferIdentifierRawP *wtid);
@@ -4843,10 +4843,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_melt)(void *cls,
-              const struct TALER_RefreshCommitmentP *rc,
-              struct TALER_EXCHANGEDB_Melt *melt,
-              uint64_t *melt_serial_id);
+    (*get_melt)(void *cls,
+                const struct TALER_RefreshCommitmentP *rc,
+                struct TALER_EXCHANGEDB_Melt *melt,
+                uint64_t *melt_serial_id);
 
 
   /**
@@ -4864,7 +4864,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query status for the transaction
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_refresh_reveal)(
+    (*insert_refresh_reveal)(
     void *cls,
     uint64_t melt_serial_id,
     uint32_t num_rrcs,
@@ -4885,10 +4885,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_refresh_reveal)(void *cls,
-                        const struct TALER_RefreshCommitmentP *rc,
-                        TALER_EXCHANGEDB_RefreshCallback cb,
-                        void *cb_cls);
+    (*get_refresh_reveal)(void *cls,
+                          const struct TALER_RefreshCommitmentP *rc,
+                          TALER_EXCHANGEDB_RefreshCallback cb,
+                          void *cb_cls);
 
 
   /**
@@ -4904,10 +4904,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return statement execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_link_data)(void *cls,
-                   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                   TALER_EXCHANGEDB_LinkCallback ldc,
-                   void *tdc_cls);
+    (*get_link_data)(void *cls,
+                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                     TALER_EXCHANGEDB_LinkCallback ldc,
+                     void *tdc_cls);
 
 
   /**
@@ -4932,7 +4932,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_coin_transactions)(
+    (*get_coin_transactions)(
     void *cls,
     bool begin_transaction,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -4967,7 +4967,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query status of the transaction
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_wire_transfer)(
+    (*lookup_wire_transfer)(
     void *cls,
     const struct TALER_WireTransferIdentifierRawP *wtid,
     TALER_EXCHANGEDB_AggregationDataCallback cb,
@@ -4996,7 +4996,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_transfer_by_deposit)(
+    (*lookup_transfer_by_deposit)(
     void *cls,
     const struct TALER_PrivateContractHashP *h_contract_terms,
     const struct TALER_MerchantWireHashP *h_wire,
@@ -5023,7 +5023,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_wire_fee)(
+    (*insert_wire_fee)(
     void *cls,
     const char *wire_method,
     struct GNUNET_TIME_Timestamp start_date,
@@ -5046,7 +5046,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_global_fee)(
+    (*insert_global_fee)(
     void *cls,
     struct GNUNET_TIME_Timestamp start_date,
     struct GNUNET_TIME_Timestamp end_date,
@@ -5070,7 +5070,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query status of the transaction
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_fee)(
+    (*get_wire_fee)(
     void *cls,
     const char *type,
     struct GNUNET_TIME_Timestamp date,
@@ -5095,7 +5095,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query status of the transaction
    */
   enum GNUNET_DB_QueryStatus
-  (*get_global_fee)(
+    (*get_global_fee)(
     void *cls,
     struct GNUNET_TIME_Timestamp date,
     struct GNUNET_TIME_Timestamp *start_date,
@@ -5118,7 +5118,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_expired_reserves)(
+    (*get_expired_reserves)(
     void *cls,
     struct GNUNET_TIME_Timestamp now,
     TALER_EXCHANGEDB_ReserveExpiredCallback rec,
@@ -5137,7 +5137,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_unfinished_close_requests)(
+    (*get_unfinished_close_requests)(
     void *cls,
     TALER_EXCHANGEDB_ReserveExpiredCallback rec,
     void *rec_cls);
@@ -5158,7 +5158,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, 0 if operation is already in the DB
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_reserve_open_deposit)(
+    (*insert_reserve_open_deposit)(
     void *cls,
     const struct TALER_CoinPublicInfo *cpi,
     const struct TALER_CoinSpendSignatureP *coin_sig,
@@ -5188,7 +5188,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_reserve_open)(
+    (*do_reserve_open)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     const struct TALER_Amount *total_paid,
@@ -5217,7 +5217,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, 0 if reserve unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*select_reserve_close_info)(
+    (*select_reserve_close_info)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     struct TALER_Amount *balance,
@@ -5240,7 +5240,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, 0 if reserve unknown
    */
   enum GNUNET_DB_QueryStatus
-  (*select_reserve_close_request_info)(
+    (*select_reserve_close_request_info)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     uint64_t rowid,
@@ -5263,7 +5263,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_reserve_close_info)(
+    (*iterate_reserve_close_info)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Absolute time_limit,
@@ -5285,7 +5285,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_reserve_closed)(
+    (*insert_reserve_closed)(
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     struct GNUNET_TIME_Timestamp execution_date,
@@ -5306,10 +5306,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query status code
    */
   enum GNUNET_DB_QueryStatus
-  (*wire_prepare_data_insert)(void *cls,
-                              const char *type,
-                              const char *buf,
-                              size_t buf_size);
+    (*wire_prepare_data_insert)(void *cls,
+                                const char *type,
+                                const char *buf,
+                                size_t buf_size);
 
 
   /**
@@ -5320,8 +5320,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*wire_prepare_data_mark_finished)(void *cls,
-                                     uint64_t rowid);
+    (*wire_prepare_data_mark_finished)(void *cls,
+                                       uint64_t rowid);
 
 
   /**
@@ -5332,8 +5332,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*wire_prepare_data_mark_failed)(void *cls,
-                                   uint64_t rowid);
+    (*wire_prepare_data_mark_failed)(void *cls,
+                                     uint64_t rowid);
 
 
   /**
@@ -5348,7 +5348,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*wire_prepare_data_get)(
+    (*wire_prepare_data_get)(
     void *cls,
     uint64_t start_row,
     uint64_t limit,
@@ -5365,7 +5365,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return #GNUNET_OK on success
    */
   enum GNUNET_GenericReturnValue
-  (*start_deferred_wire_out)(void *cls);
+    (*start_deferred_wire_out)(void *cls);
 
 
   /**
@@ -5382,7 +5382,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*store_wire_transfer_out)(
+    (*store_wire_transfer_out)(
     void *cls,
     struct GNUNET_TIME_Timestamp date,
     const struct TALER_WireTransferIdentifierRawP *wtid,
@@ -5400,7 +5400,7 @@ struct TALER_EXCHANGEDB_Plugin
    *         #GNUNET_SYSERR on DB errors
    */
   enum GNUNET_GenericReturnValue
-  (*gc)(void *cls);
+    (*gc)(void *cls);
 
 
   /**
@@ -5414,7 +5414,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_coin_deposits_above_serial_id)(
+    (*select_coin_deposits_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_DepositCallback cb,
@@ -5432,7 +5432,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_requests_above_serial_id)(
+    (*select_purse_requests_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_PurseRequestCallback cb,
@@ -5450,7 +5450,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_deposits_above_serial_id)(
+    (*select_purse_deposits_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_PurseDepositCallback cb,
@@ -5468,7 +5468,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_account_merges_above_serial_id)(
+    (*select_account_merges_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_AccountMergeCallback cb,
@@ -5486,7 +5486,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_merges_above_serial_id)(
+    (*select_purse_merges_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_PurseMergeCallback cb,
@@ -5505,7 +5505,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_decisions_above_serial_id)(
+    (*select_purse_decisions_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     bool refunded,
@@ -5524,7 +5524,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_all_purse_decisions_above_serial_id)(
+    (*select_all_purse_decisions_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_AllPurseDecisionCallback cb,
@@ -5541,7 +5541,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_deposits_by_purse)(
+    (*select_purse_deposits_by_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     TALER_EXCHANGEDB_PurseRefundCoinCallback cb,
@@ -5559,7 +5559,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_refreshes_above_serial_id)(
+    (*select_refreshes_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_RefreshesCallback cb,
@@ -5577,7 +5577,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_refunds_above_serial_id)(
+    (*select_refunds_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_RefundCallback cb,
@@ -5595,7 +5595,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_reserves_in_above_serial_id)(
+    (*select_reserves_in_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_ReserveInCallback cb,
@@ -5614,7 +5614,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_reserves_in_above_serial_id_by_account)(
+    (*select_reserves_in_above_serial_id_by_account)(
     void *cls,
     const char *account_name,
     uint64_t serial_id,
@@ -5634,7 +5634,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_withdrawals_above_serial_id)(
+    (*select_withdrawals_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_WithdrawCallback cb,
@@ -5652,7 +5652,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_wire_out_above_serial_id)(
+    (*select_wire_out_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_WireTransferOutCallback cb,
@@ -5670,7 +5670,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_wire_out_above_serial_id_by_account)(
+    (*select_wire_out_above_serial_id_by_account)(
     void *cls,
     const char *account_name,
     uint64_t serial_id,
@@ -5689,7 +5689,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_recoup_above_serial_id)(
+    (*select_recoup_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_RecoupCallback cb,
@@ -5707,7 +5707,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_recoup_refresh_above_serial_id)(
+    (*select_recoup_refresh_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_RecoupRefreshCallback cb,
@@ -5725,7 +5725,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_reserve_open_above_serial_id)(
+    (*select_reserve_open_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_ReserveOpenCallback cb,
@@ -5743,7 +5743,7 @@ struct TALER_EXCHANGEDB_Plugin
  * @return transaction status code
  */
   enum GNUNET_DB_QueryStatus
-  (*select_reserve_closed_above_serial_id)(
+    (*select_reserve_closed_above_serial_id)(
     void *cls,
     uint64_t serial_id,
     TALER_EXCHANGEDB_ReserveClosedCallback cb,
@@ -5761,7 +5761,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_by_h_blind)(
+    (*get_reserve_by_h_blind)(
     void *cls,
     const struct TALER_BlindedCoinHashP *bch,
     struct TALER_ReservePublicKeyP *reserve_pub,
@@ -5779,7 +5779,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_old_coin_by_h_blind)(
+    (*get_old_coin_by_h_blind)(
     void *cls,
     const struct TALER_BlindedCoinHashP *h_blind_ev,
     struct TALER_CoinSpendPublicKeyP *old_coin_pub,
@@ -5796,7 +5796,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_denomination_revocation)(
+    (*insert_denomination_revocation)(
     void *cls,
     const struct TALER_DenominationHashP *denom_pub_hash,
     const struct TALER_MasterSignatureP *master_sig);
@@ -5813,7 +5813,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_denomination_revocation)(
+    (*get_denomination_revocation)(
     void *cls,
     const struct TALER_DenominationHashP *denom_pub_hash,
     struct TALER_MasterSignatureP *master_sig,
@@ -5831,7 +5831,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_batch_deposits_missing_wire)(
+    (*select_batch_deposits_missing_wire)(
     void *cls,
     uint64_t min_batch_deposit_serial_id,
     TALER_EXCHANGEDB_WireMissingCallback cb,
@@ -5849,7 +5849,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aggregations_above_serial)(
+    (*select_aggregations_above_serial)(
     void *cls,
     uint64_t min_tracking_serial_id,
     TALER_EXCHANGEDB_AggregationCallback cb,
@@ -5869,7 +5869,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_justification_for_missing_wire)(
+    (*select_justification_for_missing_wire)(
     void *cls,
     const struct TALER_FullPaytoHashP *wire_target_h_payto,
     struct TALER_FullPayto *payto_uri,
@@ -5886,7 +5886,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_auditor_timestamp)(
+    (*lookup_auditor_timestamp)(
     void *cls,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
     struct GNUNET_TIME_Timestamp *last_date);
@@ -5903,7 +5903,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_auditor_status)(
+    (*lookup_auditor_status)(
     void *cls,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
     char **auditor_url,
@@ -5922,7 +5922,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_auditor)(
+    (*insert_auditor)(
     void *cls,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
     const char *auditor_url,
@@ -5943,7 +5943,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_auditor)(
+    (*update_auditor)(
     void *cls,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
     const char *auditor_url,
@@ -5961,9 +5961,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_wire_timestamp)(void *cls,
-                           const struct TALER_FullPayto payto_uri,
-                           struct GNUNET_TIME_Timestamp *last_date);
+    (*lookup_wire_timestamp)(void *cls,
+                             const struct TALER_FullPayto payto_uri,
+                             struct GNUNET_TIME_Timestamp *last_date);
 
 
   /**
@@ -5983,15 +5983,15 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_wire)(void *cls,
-                 const struct TALER_FullPayto payto_uri,
-                 const char *conversion_url,
-                 const json_t *debit_restrictions,
-                 const json_t *credit_restrictions,
-                 struct GNUNET_TIME_Timestamp start_date,
-                 const struct TALER_MasterSignatureP *master_sig,
-                 const char *bank_label,
-                 int64_t priority);
+    (*insert_wire)(void *cls,
+                   const struct TALER_FullPayto payto_uri,
+                   const char *conversion_url,
+                   const json_t *debit_restrictions,
+                   const json_t *credit_restrictions,
+                   struct GNUNET_TIME_Timestamp start_date,
+                   const struct TALER_MasterSignatureP *master_sig,
+                   const char *bank_label,
+                   int64_t priority);
 
 
   /**
@@ -6011,16 +6011,16 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_wire)(void *cls,
-                 const struct TALER_FullPayto payto_uri,
-                 const char *conversion_url,
-                 const json_t *debit_restrictions,
-                 const json_t *credit_restrictions,
-                 struct GNUNET_TIME_Timestamp change_date,
-                 const struct TALER_MasterSignatureP *master_sig,
-                 const char *bank_label,
-                 int64_t priority,
-                 bool enabled);
+    (*update_wire)(void *cls,
+                   const struct TALER_FullPayto payto_uri,
+                   const char *conversion_url,
+                   const json_t *debit_restrictions,
+                   const json_t *credit_restrictions,
+                   struct GNUNET_TIME_Timestamp change_date,
+                   const struct TALER_MasterSignatureP *master_sig,
+                   const char *bank_label,
+                   int64_t priority,
+                   bool enabled);
 
 
   /**
@@ -6032,9 +6032,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_accounts)(void *cls,
-                       TALER_EXCHANGEDB_WireAccountCallback cb,
-                       void *cb_cls);
+    (*get_wire_accounts)(void *cls,
+                         TALER_EXCHANGEDB_WireAccountCallback cb,
+                         void *cb_cls);
 
 
   /**
@@ -6048,10 +6048,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_fees)(void *cls,
-                   const char *wire_method,
-                   TALER_EXCHANGEDB_WireFeeCallback cb,
-                   void *cb_cls);
+    (*get_wire_fees)(void *cls,
+                     const char *wire_method,
+                     TALER_EXCHANGEDB_WireFeeCallback cb,
+                     void *cb_cls);
 
 
   /**
@@ -6063,9 +6063,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_global_fees)(void *cls,
-                     TALER_EXCHANGEDB_GlobalFeeCallback cb,
-                     void *cb_cls);
+    (*get_global_fees)(void *cls,
+                       TALER_EXCHANGEDB_GlobalFeeCallback cb,
+                       void *cb_cls);
 
 
   /**
@@ -6077,7 +6077,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_signkey_revocation)(
+    (*insert_signkey_revocation)(
     void *cls,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
     const struct TALER_MasterSignatureP *master_sig);
@@ -6092,7 +6092,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_signkey_revocation)(
+    (*lookup_signkey_revocation)(
     void *cls,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
     struct TALER_MasterSignatureP *master_sig);
@@ -6107,7 +6107,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_denomination_key)(
+    (*lookup_denomination_key)(
     void *cls,
     const struct TALER_DenominationHashP *h_denom_pub,
     struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta);
@@ -6124,7 +6124,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*add_denomination_key)(
+    (*add_denomination_key)(
     void *cls,
     const struct TALER_DenominationHashP *h_denom_pub,
     const struct TALER_DenominationPublicKey *denom_pub,
@@ -6143,7 +6143,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*activate_signing_key)(
+    (*activate_signing_key)(
     void *cls,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
     const struct TALER_EXCHANGEDB_SignkeyMetaData *meta,
@@ -6159,7 +6159,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_signing_key)(
+    (*lookup_signing_key)(
     void *cls,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
     struct TALER_EXCHANGEDB_SignkeyMetaData *meta);
@@ -6175,7 +6175,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_auditor_denom_sig)(
+    (*insert_auditor_denom_sig)(
     void *cls,
     const struct TALER_DenominationHashP *h_denom_pub,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
@@ -6192,7 +6192,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_auditor_denom_sig)(
+    (*select_auditor_denom_sig)(
     void *cls,
     const struct TALER_DenominationHashP *h_denom_pub,
     const struct TALER_AuditorPublicKeyP *auditor_pub,
@@ -6212,7 +6212,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_wire_fee_by_time)(
+    (*lookup_wire_fee_by_time)(
     void *cls,
     const char *wire_method,
     struct GNUNET_TIME_Timestamp start_time,
@@ -6235,7 +6235,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_global_fee_by_time)(
+    (*lookup_global_fee_by_time)(
     void *cls,
     struct GNUNET_TIME_Timestamp start_time,
     struct GNUNET_TIME_Timestamp end_time,
@@ -6256,9 +6256,9 @@ struct TALER_EXCHANGEDB_Plugin
    *         @a table does not have a serial number
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_serial_by_table)(void *cls,
-                            enum TALER_EXCHANGEDB_ReplicatedTable table,
-                            uint64_t *serial);
+    (*lookup_serial_by_table)(void *cls,
+                              enum TALER_EXCHANGEDB_ReplicatedTable table,
+                              uint64_t *serial);
 
   /**
    * Lookup records above @a serial number in @a table. Used in
@@ -6273,11 +6273,11 @@ struct TALER_EXCHANGEDB_Plugin
    *         @a table does not have a serial number
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_records_by_table)(void *cls,
-                             enum TALER_EXCHANGEDB_ReplicatedTable table,
-                             uint64_t serial,
-                             TALER_EXCHANGEDB_ReplicationCallback cb,
-                             void *cb_cls);
+    (*lookup_records_by_table)(void *cls,
+                               enum TALER_EXCHANGEDB_ReplicatedTable table,
+                               uint64_t serial,
+                               TALER_EXCHANGEDB_ReplicationCallback cb,
+                               void *cb_cls);
 
 
   /**
@@ -6291,8 +6291,8 @@ struct TALER_EXCHANGEDB_Plugin
    *         @a table does not have a serial number
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_records_by_table)(void *cls,
-                             const struct TALER_EXCHANGEDB_TableData *td);
+    (*insert_records_by_table)(void *cls,
+                               const struct TALER_EXCHANGEDB_TableData *td);
 
 
   /**
@@ -6308,12 +6308,12 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*begin_shard)(void *cls,
-                 const char *job_name,
-                 struct GNUNET_TIME_Relative delay,
-                 uint64_t shard_size,
-                 uint64_t *start_row,
-                 uint64_t *end_row);
+    (*begin_shard)(void *cls,
+                   const char *job_name,
+                   struct GNUNET_TIME_Relative delay,
+                   uint64_t shard_size,
+                   uint64_t *start_row,
+                   uint64_t *end_row);
 
   /**
    * Function called to abort work on a shard.
@@ -6325,10 +6325,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*abort_shard)(void *cls,
-                 const char *job_name,
-                 uint64_t start_row,
-                 uint64_t end_row);
+    (*abort_shard)(void *cls,
+                   const char *job_name,
+                   uint64_t start_row,
+                   uint64_t end_row);
 
   /**
    * Function called to persist that work on a shard was completed.
@@ -6340,10 +6340,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*complete_shard)(void *cls,
-                    const char *job_name,
-                    uint64_t start_row,
-                    uint64_t end_row);
+    (*complete_shard)(void *cls,
+                      const char *job_name,
+                      uint64_t start_row,
+                      uint64_t end_row);
 
 
   /**
@@ -6359,12 +6359,12 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*begin_revolving_shard)(void *cls,
-                           const char *job_name,
-                           uint32_t shard_size,
-                           uint32_t shard_limit,
-                           uint32_t *start_row,
-                           uint32_t *end_row);
+    (*begin_revolving_shard)(void *cls,
+                             const char *job_name,
+                             uint32_t shard_size,
+                             uint32_t shard_limit,
+                             uint32_t *start_row,
+                             uint32_t *end_row);
 
 
   /**
@@ -6378,10 +6378,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*release_revolving_shard)(void *cls,
-                             const char *job_name,
-                             uint32_t start_row,
-                             uint32_t end_row);
+    (*release_revolving_shard)(void *cls,
+                               const char *job_name,
+                               uint32_t start_row,
+                               uint32_t end_row);
 
 
   /**
@@ -6394,7 +6394,7 @@ struct TALER_EXCHANGEDB_Plugin
    *         #GNUNET_SYSERR on failure
    */
   enum GNUNET_GenericReturnValue
-  (*delete_shard_locks)(void *cls);
+    (*delete_shard_locks)(void *cls);
 
 
   /**
@@ -6407,9 +6407,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*set_extension_manifest)(void *cls,
-                            const char *extension_name,
-                            const char *manifest);
+    (*set_extension_manifest)(void *cls,
+                              const char *extension_name,
+                              const char *manifest);
 
 
   /**
@@ -6422,9 +6422,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_extension_manifest)(void *cls,
-                            const char *extension_name,
-                            char **manifest);
+    (*get_extension_manifest)(void *cls,
+                              const char *extension_name,
+                              char **manifest);
 
 
   /**
@@ -6442,14 +6442,14 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_partner)(void *cls,
-                    const struct TALER_MasterPublicKeyP *master_pub,
-                    struct GNUNET_TIME_Timestamp start_date,
-                    struct GNUNET_TIME_Timestamp end_date,
-                    struct GNUNET_TIME_Relative wad_frequency,
-                    const struct TALER_Amount *wad_fee,
-                    const char *partner_base_url,
-                    const struct TALER_MasterSignatureP *master_sig);
+    (*insert_partner)(void *cls,
+                      const struct TALER_MasterPublicKeyP *master_pub,
+                      struct GNUNET_TIME_Timestamp start_date,
+                      struct GNUNET_TIME_Timestamp end_date,
+                      struct GNUNET_TIME_Relative wad_frequency,
+                      const struct TALER_Amount *wad_fee,
+                      const char *partner_base_url,
+                      const struct TALER_MasterSignatureP *master_sig);
 
 
   /**
@@ -6465,10 +6465,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_contract)(void *cls,
-                     const struct TALER_PurseContractPublicKeyP *purse_pub,
-                     const struct TALER_EncryptedContract *econtract,
-                     bool *in_conflict);
+    (*insert_contract)(void *cls,
+                       const struct TALER_PurseContractPublicKeyP *purse_pub,
+                       const struct TALER_EncryptedContract *econtract,
+                       bool *in_conflict);
 
 
   /**
@@ -6483,7 +6483,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_contract)(
+    (*select_contract)(
     void *cls,
     const struct TALER_ContractDiffiePublicP *pub_ckey,
     struct TALER_PurseContractPublicKeyP *purse_pub,
@@ -6501,7 +6501,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_contract_by_purse)(
+    (*select_contract_by_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     struct TALER_EncryptedContract *econtract);
@@ -6527,7 +6527,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_purse_request)(
+    (*insert_purse_request)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_PurseMergePublicKeyP *merge_pub,
@@ -6550,7 +6550,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code (#GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if no purse expired in the given time interval).
    */
   enum GNUNET_DB_QueryStatus
-  (*expire_purse)(
+    (*expire_purse)(
     void *cls,
     struct GNUNET_TIME_Absolute start_time,
     struct GNUNET_TIME_Absolute end_time);
@@ -6572,7 +6572,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse)(
+    (*select_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     struct GNUNET_TIME_Timestamp *purse_creation,
@@ -6601,7 +6601,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_purse_request)(
+    (*get_purse_request)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     struct TALER_PurseMergePublicKeyP *merge_pub,
@@ -6629,7 +6629,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_by_merge_pub)(
+    (*select_purse_by_merge_pub)(
     void *cls,
     const struct TALER_PurseMergePublicKeyP *merge_pub,
     struct TALER_PurseContractPublicKeyP *purse_pub,
@@ -6665,7 +6665,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_purse_deposit)(
+    (*do_purse_deposit)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -6690,7 +6690,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_purse_delete)(
+    (*do_purse_delete)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_PurseContractSignatureP *purse_sig,
@@ -6709,7 +6709,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*set_purse_balance)(
+    (*set_purse_balance)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_Amount *balance);
@@ -6730,7 +6730,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_purse_deposit)(
+    (*get_purse_deposit)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -6760,7 +6760,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_purse_merge)(
+    (*do_purse_merge)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_PurseMergeSignatureP *merge_sig,
@@ -6791,7 +6791,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_reserve_purse)(
+    (*do_reserve_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_PurseMergeSignatureP *merge_sig,
@@ -6818,7 +6818,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_merge)(
+    (*select_purse_merge)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     struct TALER_PurseMergeSignatureP *merge_sig,
@@ -6841,13 +6841,13 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_close_request)(void *cls,
-                          const struct TALER_ReservePublicKeyP *reserve_pub,
-                          const struct TALER_FullPayto payto_uri,
-                          const struct TALER_ReserveSignatureP *reserve_sig,
-                          struct GNUNET_TIME_Timestamp request_timestamp,
-                          const struct TALER_Amount *balance,
-                          const struct TALER_Amount *closing_fee);
+    (*insert_close_request)(void *cls,
+                            const struct TALER_ReservePublicKeyP *reserve_pub,
+                            const struct TALER_FullPayto payto_uri,
+                            const struct TALER_ReserveSignatureP *reserve_sig,
+                            struct GNUNET_TIME_Timestamp request_timestamp,
+                            const struct TALER_Amount *balance,
+                            const struct TALER_Amount *closing_fee);
 
 
   /**
@@ -6863,13 +6863,13 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_drain_profit)(void *cls,
-                         const struct TALER_WireTransferIdentifierRawP *wtid,
-                         const char *account_section,
-                         const struct TALER_FullPayto payto_uri,
-                         struct GNUNET_TIME_Timestamp request_timestamp,
-                         const struct TALER_Amount *amount,
-                         const struct TALER_MasterSignatureP *master_sig);
+    (*insert_drain_profit)(void *cls,
+                           const struct TALER_WireTransferIdentifierRawP *wtid,
+                           const char *account_section,
+                           const struct TALER_FullPayto payto_uri,
+                           struct GNUNET_TIME_Timestamp request_timestamp,
+                           const struct TALER_Amount *amount,
+                           const struct TALER_MasterSignatureP *master_sig);
 
 
   /**
@@ -6886,14 +6886,14 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_drain_profit)(void *cls,
-                      const struct TALER_WireTransferIdentifierRawP *wtid,
-                      uint64_t *serial,
-                      char **account_section,
-                      struct TALER_FullPayto *payto_uri,
-                      struct GNUNET_TIME_Timestamp *request_timestamp,
-                      struct TALER_Amount *amount,
-                      struct TALER_MasterSignatureP *master_sig);
+    (*get_drain_profit)(void *cls,
+                        const struct TALER_WireTransferIdentifierRawP *wtid,
+                        uint64_t *serial,
+                        char **account_section,
+                        struct TALER_FullPayto *payto_uri,
+                        struct GNUNET_TIME_Timestamp *request_timestamp,
+                        struct TALER_Amount *amount,
+                        struct TALER_MasterSignatureP *master_sig);
 
 
   /**
@@ -6910,7 +6910,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*profit_drains_get_pending)(
+    (*profit_drains_get_pending)(
     void *cls,
     uint64_t *serial,
     struct TALER_WireTransferIdentifierRawP *wtid,
@@ -6929,7 +6929,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*profit_drains_set_finished)(
+    (*profit_drains_set_finished)(
     void *cls,
     uint64_t serial);
 
@@ -6955,7 +6955,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*trigger_kyc_rule_for_account)(
+    (*trigger_kyc_rule_for_account)(
     void *cls,
     const struct TALER_FullPayto payto_uri,
     const struct TALER_NormalizedPaytoHashP *h_payto,
@@ -6984,7 +6984,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_kyc_requirement_process)(
+    (*insert_kyc_requirement_process)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     uint32_t measure_index,
@@ -7005,7 +7005,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_pending_kyc_requirement_process)(
+    (*get_pending_kyc_requirement_process)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     const char *provider_name,
@@ -7030,7 +7030,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*update_kyc_process_by_row)(
+    (*update_kyc_process_by_row)(
     void *cls,
     uint64_t process_row,
     const char *provider_name,
@@ -7066,7 +7066,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_kyc_requirement_by_row)(
+    (*lookup_kyc_requirement_by_row)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     union TALER_AccountPublicKeyP *account_pub,
@@ -7087,7 +7087,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_kyc_status_by_token)(
+    (*lookup_kyc_status_by_token)(
     void *cls,
     const struct TALER_AccountAccessTokenP *access_token,
     uint64_t *row,
@@ -7104,7 +7104,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_rules_by_access_token)(
+    (*lookup_rules_by_access_token)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     json_t **jnew_rules,
@@ -7124,7 +7124,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_kyc_process_by_account)(
+    (*lookup_kyc_process_by_account)(
     void *cls,
     const char *provider_name,
     const struct TALER_NormalizedPaytoHashP *h_payto,
@@ -7145,7 +7145,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*kyc_provider_account_lookup)(
+    (*kyc_provider_account_lookup)(
     void *cls,
     const char *provider_name,
     const char *provider_legitimization_id,
@@ -7170,7 +7170,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_kyc_rules)(
+    (*get_kyc_rules)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     bool *no_account_pub,
@@ -7190,7 +7190,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_kyc_rules2)(
+    (*get_kyc_rules2)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     json_t **jrules);
@@ -7207,7 +7207,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*iterate_kyc_reference)(
+    (*iterate_kyc_reference)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     TALER_EXCHANGEDB_LegitimizationProcessCallback lpc,
@@ -7226,7 +7226,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
    */
   enum GNUNET_DB_QueryStatus
-  (*select_withdraw_amounts_for_kyc_check)(
+    (*select_withdraw_amounts_for_kyc_check)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Absolute time_limit,
@@ -7246,7 +7246,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aggregation_amounts_for_kyc_check)(
+    (*select_aggregation_amounts_for_kyc_check)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Absolute time_limit,
@@ -7266,7 +7266,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
    */
   enum GNUNET_DB_QueryStatus
-  (*select_merge_amounts_for_kyc_check)(
+    (*select_merge_amounts_for_kyc_check)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Absolute time_limit,
@@ -7288,7 +7288,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
    */
   enum GNUNET_DB_QueryStatus
-  (*select_deposit_amounts_for_kyc_check)(
+    (*select_deposit_amounts_for_kyc_check)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Absolute time_limit,
@@ -7319,7 +7319,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_kyc_measure_result)(
+    (*insert_kyc_measure_result)(
     void *cls,
     uint64_t process_row,
     const struct TALER_NormalizedPaytoHashP *h_payto,
@@ -7342,7 +7342,7 @@ struct TALER_EXCHANGEDB_Plugin
    * Revert account back to default rules and insert successor measure.
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_successor_measure)(
+    (*insert_successor_measure)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     struct GNUNET_TIME_Timestamp decision_time,
@@ -7362,7 +7362,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_kyc_attributes)(
+    (*select_kyc_attributes)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     TALER_EXCHANGEDB_AttributeCallback cb,
@@ -7384,7 +7384,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aml_measures)(
+    (*select_aml_measures)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     enum TALER_EXCHANGE_YesNoAll active_only,
@@ -7408,7 +7408,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_aml_officer)(
+    (*insert_aml_officer)(
     void *cls,
     const struct TALER_AmlOfficerPublicKeyP *decider_pub,
     const struct TALER_MasterSignatureP *master_sig,
@@ -7428,7 +7428,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status, if member is unknown or not active, 1 if member is active
    */
   enum GNUNET_DB_QueryStatus
-  (*test_aml_officer)(
+    (*test_aml_officer)(
     void *cls,
     const struct TALER_AmlOfficerPublicKeyP *decider_pub);
 
@@ -7446,7 +7446,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_aml_officer)(
+    (*lookup_aml_officer)(
     void *cls,
     const struct TALER_AmlOfficerPublicKeyP *decider_pub,
     struct TALER_MasterSignatureP *master_sig,
@@ -7468,7 +7468,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status, 0 if no threshold was set
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aml_statistics)(
+    (*select_aml_statistics)(
     void *cls,
     const char *name,
     struct GNUNET_TIME_Timestamp start_date,
@@ -7491,7 +7491,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aml_decisions)(
+    (*select_aml_decisions)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     enum TALER_EXCHANGE_YesNoAll investigation_only,
@@ -7515,7 +7515,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_aml_attributes)(
+    (*select_aml_attributes)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     uint64_t offset,
@@ -7535,7 +7535,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_h_payto_by_access_token)(
+    (*lookup_h_payto_by_access_token)(
     void *cls,
     const struct TALER_AccountAccessTokenP *access_token,
     struct TALER_NormalizedPaytoHashP *h_payto);
@@ -7558,7 +7558,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_pending_legitimization)(
+    (*lookup_pending_legitimization)(
     void *cls,
     uint64_t legitimization_measure_serial_id,
     struct TALER_AccountAccessTokenP *access_token,
@@ -7591,7 +7591,7 @@ struct TALER_EXCHANGEDB_Plugin
  * @return database transaction status
  */
   enum GNUNET_DB_QueryStatus
-  (*lookup_completed_legitimization)(
+    (*lookup_completed_legitimization)(
     void *cls,
     uint64_t legitimization_measure_serial_id,
     uint32_t measure_index,
@@ -7614,7 +7614,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_aml_history)(
+    (*lookup_aml_history)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     TALER_EXCHANGEDB_AmlHistoryCallback cb,
@@ -7632,7 +7632,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_kyc_history)(
+    (*lookup_kyc_history)(
     void *cls,
     const struct TALER_NormalizedPaytoHashP *h_payto,
     TALER_EXCHANGEDB_KycHistoryCallback cb,
@@ -7653,7 +7653,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_active_legitimization) (
+    (*lookup_active_legitimization) (
     void *cls,
     uint64_t legitimization_process_serial_id,
     uint32_t *measure_index,
@@ -7674,7 +7674,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_active_legitimization_measure) (
+    (*insert_active_legitimization_measure) (
     void *cls,
     const struct TALER_AccountAccessTokenP *access_token,
     const json_t *jmeasures,
@@ -7709,7 +7709,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_aml_decision)(
+    (*insert_aml_decision)(
     void *cls,
     const struct TALER_FullPayto payto_uri,
     const struct TALER_NormalizedPaytoHashP *h_payto,
@@ -7743,7 +7743,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_kyc_failure)(
+    (*insert_kyc_failure)(
     void *cls,
     uint64_t process_row,
     const struct TALER_NormalizedPaytoHashP *h_payto,
@@ -7763,7 +7763,7 @@ struct TALER_EXCHANGEDB_Plugin
    *         #GNUNET_SYSERR on DB errors
    */
   enum GNUNET_GenericReturnValue
-  (*inject_auditor_triggers)(void *cls);
+    (*inject_auditor_triggers)(void *cls);
 
 };