exchange

commit 34e461f8233f416b10ca55a10951e799a6f74943
parent e326aba94adbc5556b8ea41549856625c2390a9a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  3 Jun 2024 17:28:24 +0200

-fix linker issue

Diffstat:
M
src/exchangedb/Makefile.am
 | 
2
+-
M
src/exchangedb/pg_lookup_kyc_requirement_by_row.c
 | 
2
--
M
src/exchangedb/test_exchangedb.c
 | 
25
++++++++++---------------
M
src/mhd/Makefile.am
 | 
2
+-

4 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
@@ -280,9 +280,9 @@ libtaler_plugin_exchangedb_postgres_la_SOURCES = \
   pg_select_purse_deposits_above_serial_id.h pg_select_purse_deposits_above_serial_id.c \
   pg_select_account_merges_above_serial_id.h pg_select_account_merges_above_serial_id.c \
   pg_select_all_purse_decisions_above_serial_id.h pg_select_all_purse_decisions_above_serial_id.c \
+  pg_lookup_kyc_requirement_by_row.h pg_lookup_kyc_requirement_by_row.c \
   pg_select_reserve_open_above_serial_id.c pg_select_reserve_open_above_serial_id.h
 
-#  pg_lookup_kyc_requirement_by_row.h pg_lookup_kyc_requirement_by_row.c
 #  pg_select_justification_for_missing_wire.h pg_select_justification_for_missing_wire.c
 #  pg_select_aml_process.h pg_select_aml_process.c
 #  pg_select_aml_history.h pg_select_aml_history.c
diff --git a/src/exchangedb/pg_lookup_kyc_requirement_by_row.c b/src/exchangedb/pg_lookup_kyc_requirement_by_row.c
@@ -37,7 +37,6 @@ TEH_PG_lookup_kyc_requirement_by_row (
   bool *kyc_required)
 {
   struct PostgresClosure *pg = cls;
-  uint32_t status = TALER_AML_NORMAL;
   struct GNUNET_PQ_QueryParam params[] = {
     GNUNET_PQ_query_param_uint64 (&requirement_row),
     GNUNET_PQ_query_param_end
@@ -59,7 +58,6 @@ TEH_PG_lookup_kyc_requirement_by_row (
                                 kyc_required),
     GNUNET_PQ_result_spec_end
   };
-  enum GNUNET_DB_QueryStatus qs;
 
   *jrules = NULL;
   memset (account_pub,
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
@@ -34,25 +34,25 @@ static int result;
  * Report line of error if @a cond is true, and jump to label "drop".
  */
 #define FAILIF(cond)                            \
-  do {                                          \
-    if (! (cond)) { break;}                     \
-    GNUNET_break (0);                           \
-    goto drop;                                  \
-  } while (0)
+        do {                                          \
+          if (! (cond)) { break;}                     \
+          GNUNET_break (0);                           \
+          goto drop;                                  \
+        } while (0)
 
 
 /**
  * Initializes @a ptr with random data.
  */
 #define RND_BLK(ptr)                                                    \
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
-                              sizeof (*ptr))
+        GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
+                                    sizeof (*ptr))
 
 /**
  * Initializes @a ptr with zeros.
  */
 #define ZR_BLK(ptr) \
-  memset (ptr, 0, sizeof (*ptr))
+        memset (ptr, 0, sizeof (*ptr))
 
 
 /**
@@ -984,7 +984,6 @@ test_wire_out (const struct TALER_EXCHANGEDB_BatchDeposit *bd)
     struct TALER_Amount coin_fee2;
     struct GNUNET_TIME_Timestamp execution_time2;
     struct TALER_EXCHANGEDB_KycStatus kyc;
-    enum TALER_AmlDecisionState aml;
 
     h_contract_terms_wt2.hash.bits[0]++;
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
@@ -998,8 +997,7 @@ test_wire_out (const struct TALER_EXCHANGEDB_BatchDeposit *bd)
                                                 &execution_time2,
                                                 &coin_contribution2,
                                                 &coin_fee2,
-                                                &kyc,
-                                                &aml));
+                                                &kyc));
   }
   {
     struct TALER_ReservePublicKeyP rpub;
@@ -1031,7 +1029,6 @@ test_wire_out (const struct TALER_EXCHANGEDB_BatchDeposit *bd)
     struct TALER_Amount coin_fee2;
     struct GNUNET_TIME_Timestamp execution_time2;
     struct TALER_EXCHANGEDB_KycStatus kyc;
-    enum TALER_AmlDecisionState aml = TALER_AML_FROZEN;
 
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->lookup_transfer_by_deposit (plugin->cls,
@@ -1044,9 +1041,7 @@ test_wire_out (const struct TALER_EXCHANGEDB_BatchDeposit *bd)
                                                 &execution_time2,
                                                 &coin_contribution2,
                                                 &coin_fee2,
-                                                &kyc,
-                                                &aml));
-    FAILIF (TALER_AML_NORMAL != aml);
+                                                &kyc));
     GNUNET_assert (0 == GNUNET_memcmp (&wtid2,
                                        &wire_out_wtid));
     GNUNET_assert (GNUNET_TIME_timestamp_cmp (execution_time2,
diff --git a/src/mhd/Makefile.am b/src/mhd/Makefile.am
@@ -17,7 +17,7 @@ libtalermhd_la_SOURCES = \
   mhd_run.c \
   mhd_spa.c
 libtalermhd_la_LDFLAGS = \
-  -version-info 3:1:3 \
+  -version-info 4:0:4 \
   -no-undefined
 libtalermhd_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \