merchant

commit b2dd9079e56ca5a6fe5daf51f5530a34d67be4a8
parent 2981863ec280cd2d1eb9e0bb668e4c1e47348c1a
Author: Florian Dold <florian@dold.me>
Date:   Fri, 12 Jun 2026 14:59:09 +0200

remove remaining usages of removed validation_* columns

Diffstat:
M
src/backend/taler-merchant-httpd.h
 | 
6
------
M
src/backend/taler-merchant-httpd_post-management-instances.c
 | 
4
+---
M
src/backenddb/insert_instance.c
 | 
9
+++------
M
src/backenddb/test_merchantdb.c
 | 
3
+--
M
src/include/merchant-database/insert_instance.h
 | 
5
+----
M
src/merchant-tools/taler-merchant-passwd.c
 | 
3
+--

6 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h
@@ -246,12 +246,6 @@ struct TMH_MerchantInstance
    * True if this instance was deleted (but not yet purged).
    */
   bool deleted;
-
-  /**
-   * True if email/sms validation is needed before the
-   * instance can be used.
-   */
-  bool validation_needed;
 };
 
 
diff --git a/src/backend/taler-merchant-httpd_post-management-instances.c b/src/backend/taler-merchant-httpd_post-management-instances.c
@@ -481,7 +481,6 @@ post_instances (const struct TMH_RequestHandler *rh,
     if (NULL != is.logo)
       mi->settings.logo = GNUNET_strdup (is.logo);
     mi->auth = ias;
-    mi->validation_needed = validation_needed;
     GNUNET_CRYPTO_eddsa_key_create (&mi->merchant_priv.eddsa_priv);
     GNUNET_CRYPTO_eddsa_key_get_public (&mi->merchant_priv.eddsa_priv,
                                         &mi->merchant_pub.eddsa_pub);
@@ -505,8 +504,7 @@ post_instances (const struct TMH_RequestHandler *rh,
                                              &mi->merchant_pub,
                                              &mi->merchant_priv,
                                              &mi->settings,
-                                             &mi->auth,
-                                             validation_needed);
+                                             &mi->auth);
       switch (qs)
       {
       case GNUNET_DB_STATUS_HARD_ERROR:
diff --git a/src/backenddb/insert_instance.c b/src/backenddb/insert_instance.c
@@ -31,8 +31,7 @@ TALER_MERCHANTDB_insert_instance (
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   const struct TALER_MERCHANTDB_InstanceSettings *is,
-  const struct TALER_MERCHANTDB_InstanceAuthSettings *ias,
-  bool validation_needed)
+  const struct TALER_MERCHANTDB_InstanceAuthSettings *ias)
 {
   struct GNUNET_PQ_QueryParam params[] = {
     GNUNET_PQ_query_param_auto_from_type (merchant_pub),
@@ -62,7 +61,6 @@ TALER_MERCHANTDB_insert_instance (
     : GNUNET_PQ_query_param_string (is->phone),
     GNUNET_PQ_query_param_bool (is->phone_validated),
     GNUNET_PQ_query_param_bool (is->email_validated),
-    GNUNET_PQ_query_param_bool (validation_needed),
     GNUNET_PQ_query_param_string (
       GNUNET_TIME_round_interval2s (
         is->default_wire_transfer_rounding_interval)),
@@ -91,12 +89,11 @@ TALER_MERCHANTDB_insert_instance (
            ",phone_number"
            ",phone_validated"
            ",email_validated"
-           ",validation_needed"
            ",default_wire_transfer_rounding_interval)"
            "VALUES"
            "($1,$2,$3,$4,LOWER($5),$6,$7::TEXT::JSONB,$8::TEXT::JSONB,"
-           "$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,"
-           "$20::merchant.time_rounder_interval)");
+           "$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,"
+           "$19::merchant.time_rounder_interval)");
   return GNUNET_PQ_eval_prepared_non_select (pg->conn,
                                              "insert_instance",
                                              params);
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
@@ -430,8 +430,7 @@ test_insert_instance (const struct InstanceData *instance,
                                                            &instance->merchant_pub,
                                                            &instance->merchant_priv,
                                                            &instance->instance,
-                                                           &ias,
-                                                           false),
+                                                           &ias),
                          "Insert instance failed\n");
   return 0;
 }
diff --git a/src/include/merchant-database/insert_instance.h b/src/include/merchant-database/insert_instance.h
@@ -35,8 +35,6 @@ struct TALER_MERCHANTDB_PostgresContext;
  * @param merchant_priv private key of the instance
  * @param is details about the instance
  * @param ias authentication settings for the instance
- * @param validation_needed true if validation is
- *        required before the instance can be used
  * @return database result code
  */
 enum GNUNET_DB_QueryStatus
@@ -44,7 +42,6 @@ TALER_MERCHANTDB_insert_instance (struct TALER_MERCHANTDB_PostgresContext *pg,
                                   const struct TALER_MerchantPublicKeyP *merchant_pub,
                                   const struct TALER_MerchantPrivateKeyP *merchant_priv,
                                   const struct TALER_MERCHANTDB_InstanceSettings *is,
-                                  const struct TALER_MERCHANTDB_InstanceAuthSettings *ias,
-                                  bool validation_needed);
+                                  const struct TALER_MERCHANTDB_InstanceAuthSettings *ias);
 
 #endif
diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c
@@ -166,8 +166,7 @@ run (void *cls,
                                              &merchant_pub,
                                              &merchant_priv,
                                              &is,
-                                             &ias,
-                                             false);
+                                             &ias);
       json_decref (is.address);
       json_decref (is.jurisdiction);
       switch (qs)