Extend tests.

Give a way to force redownload (= no cherry picking) all /keys.

2 files changed, 25 insertions, 1 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index fa93dca80..a1ecc0bef 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -433,7 +433,8 @@ TALER_EXCHANGE_get_keys (struct TALER_EXCHANGE_Handle *exchange);
  */
 struct GNUNET_TIME_Absolute
 TALER_EXCHANGE_check_keys_current (struct TALER_EXCHANGE_Handle *exchange,
-                                   int force_download);
+                                   int force_download,
+                                   int pull_all_keys);
 
 
 /**
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index ed09ad471..eeb0a5c00 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1402,6 +1402,29 @@ TALER_TESTING_cmd_check_keys
 
 
 /**
+ * Make a "check keys" command that forcedly does NOT cherry pick;
+ * just redownload the whole /keys.  Then checks whether the number
+ * of denomination keys from @a exchange matches @a num_denom_keys.
+ *
+ * @param label command label
+ * @param generation when this command is run, exactly @a
+ *        generation /keys downloads took place.  If the number
+ *        of downloads is less than @a generation, the logic will
+ *        first make sure that @a generation downloads are done,
+ *        and _then_ execute the rest of the command.
+ * @param num_denom_keys expected number of denomination keys.
+ * @param exchange connection handle to the exchange to test.
+ *
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_check_keys_pull_all_keys
+  (const char *label,
+   unsigned int generation,
+   unsigned int num_denom_keys);
+
+
+/**
  * Create a "batch" command.  Such command takes a
  * end_CMD-terminated array of CMDs and executed them.
  * Once it hits the end CMD, it passes the control