-re-enable test-revocation.sh, works again

src/auditor/Makefile.am

@@ -194,10 +194,7 @@ check_SCRIPTS = \
 
 .NOTPARALLEL:
 # revocation test disabled for now: need working wallet first!
-# TESTS = $(check_SCRIPTS)
+TESTS = $(check_SCRIPTS)
-TESTS = \
-  test-auditor.sh \
-  test-sync.sh
 
 EXTRA_DIST = \
   taler-auditor.in \

src/auditor/revoke-basedb.age

@@ -1 +1 @@
-1647492342
+1647525828

src/auditor/revoke-basedb.mpub

@@ -1 +1 @@
-FGRF6J6HM8AQNGF12MBXCK6ZWSVVBAR4HPGST36WBVQKXMRTVJ2G
+B2W8HJBYYJTX19W60SAASE3923XBEZFDVQVYAFN7XCJKZAYWF370

src/auditor/taler-helper-auditor-coins.c

@@ -1959,29 +1959,6 @@ check_recoup (struct CoinContext *cc,
     cc->qs = qs;
     return GNUNET_SYSERR;
   }
-  if (GNUNET_OK !=
-      TALER_wallet_recoup_verify (&coin->denom_pub_hash,
-                                  coin_blind,
-                                  &coin->coin_pub,
-                                  coin_sig))
-  {
-    TALER_ARL_report (report_bad_sig_losses,
-                      GNUNET_JSON_PACK (
-                        GNUNET_JSON_pack_string ("operation",
-                                                 operation),
-                        GNUNET_JSON_pack_uint64 ("row",
-                                                 rowid),
-                        TALER_JSON_pack_amount ("loss",
-                                                amount),
-                        GNUNET_JSON_pack_data_auto ("coin_pub",
-                                                    &coin->coin_pub)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
-                          amount);
-    if (TALER_ARL_do_abort ())
-      return GNUNET_SYSERR;
-    return GNUNET_OK;
-  }
   ds = get_denomination_summary (cc,
                                  issue,
                                  &issue->denom_hash);
@@ -2056,6 +2033,29 @@ recoup_cb (void *cls,
   ppc.last_recoup_serial_id = rowid + 1;
   (void) timestamp;
   (void) reserve_pub;
+  if (GNUNET_OK !=
+      TALER_wallet_recoup_verify (&coin->denom_pub_hash,
+                                  coin_blind,
+                                  &coin->coin_pub,
+                                  coin_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "recoup"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                amount),
+                        GNUNET_JSON_pack_data_auto ("coin_pub",
+                                                    &coin->coin_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          amount);
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
   return check_recoup (cc,
                        "recoup",
                        rowid,
@@ -2147,6 +2147,29 @@ recoup_refresh_cb (void *cls,
     }
   }
 
+  if (GNUNET_OK !=
+      TALER_wallet_recoup_refresh_verify (&coin->denom_pub_hash,
+                                          coin_blind,
+                                          &coin->coin_pub,
+                                          coin_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "recoup-refresh"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                amount),
+                        GNUNET_JSON_pack_data_auto ("coin_pub",
+                                                    &coin->coin_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          amount);
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
   return check_recoup (cc,
                        "recoup-refresh",
                        rowid,

src/util/wallet_signatures.c

@@ -191,7 +191,7 @@ TALER_wallet_recoup_sign (
 {
   struct TALER_RecoupRequestPS pr = {
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_RECOUP),
-    .purpose.size = htonl (sizeof (struct TALER_RecoupRequestPS)),
+    .purpose.size = htonl (sizeof (pr)),
     .h_denom_pub = *h_denom_pub,
     .coin_blind = *coin_bks
   };