1 files changed, 43 insertions, 23 deletions

diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index b87b9d95b..6b7ae667d 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -315,10 +315,10 @@ struct TALER_TESTING_Command
    * @return #GNUNET_OK on success
    */
   enum GNUNET_GenericReturnValue
-    (*traits)(void *cls,
-              const void **ret,
-              const char *trait,
-              unsigned int index);
+  (*traits)(void *cls,
+            const void **ret,
+            const char *trait,
+            unsigned int index);
 
   /**
    * When did the execution of this command start?
@@ -354,8 +354,9 @@ struct TALER_TESTING_Command
  * @return the command, if it is found, or NULL.
  */
 const struct TALER_TESTING_Command *
-TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
-                                          const char *label);
+TALER_TESTING_interpreter_lookup_command (
+  struct TALER_TESTING_Interpreter *is,
+  const char *label);
 
 
 /**
@@ -366,8 +367,9 @@ TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
  * @return the command, if it is found, or NULL.
  */
 const struct TALER_TESTING_Command *
-TALER_TESTING_interpreter_get_command (struct TALER_TESTING_Interpreter *is,
-                                       const char *name);
+TALER_TESTING_interpreter_get_command (
+  struct TALER_TESTING_Interpreter *is,
+  const char *name);
 
 
 /**
@@ -627,6 +629,19 @@ TALER_TESTING_cmd_set_var (const char *name,
 
 
 /**
+ * Update interpeter @a is variable state due to execution of @a cmd.
+ *
+ * @param[in,out] is interpreter to update
+ * @param[in,out] cmd command that we are exeucting and that
+ *   needs to be checked for side-effects on the variable state
+ */
+void
+TALER_TESTING_update_variables_ (
+  struct TALER_TESTING_Interpreter *is,
+  struct TALER_TESTING_Command *cmd);
+
+
+/**
  * Launch GNU Taler setup.
  *
  * @param label command label.
@@ -1658,11 +1673,12 @@ TALER_TESTING_cmd_track_transfer (const char *label,
  * @return the command
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_bank_transfer (const char *label,
-                                       const char *exchange_base_url,
-                                       const char *amount,
-                                       const char *debit_payto,
-                                       const char *credit_payto);
+TALER_TESTING_cmd_check_bank_transfer (
+  const char *label,
+  const char *exchange_base_url,
+  const char *amount,
+  const char *debit_payto,
+  const char *credit_payto);
 
 
 /**
@@ -1677,11 +1693,12 @@ TALER_TESTING_cmd_check_bank_transfer (const char *label,
  * @return the command
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_bank_admin_transfer (const char *label,
-                                             const char *amount,
-                                             const char *debit_payto,
-                                             const char *credit_payto,
-                                             const char *reserve_pub_ref);
+TALER_TESTING_cmd_check_bank_admin_transfer (
+  const char *label,
+  const char *amount,
+  const char *debit_payto,
+  const char *credit_payto,
+  const char *reserve_pub_ref);
 
 
 /**
@@ -1696,8 +1713,9 @@ TALER_TESTING_cmd_check_bank_admin_transfer (const char *label,
  * @return the command.
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_bank_transfer_with_ref (const char *label,
-                                                const char *deposit_reference);
+TALER_TESTING_cmd_check_bank_transfer_with_ref (
+  const char *label,
+  const char *deposit_reference);
 
 
 /**
@@ -2209,6 +2227,7 @@ TALER_TESTING_cmd_wallet_kyc_get (
  * @param label command label.
  * @param payment_target_reference command with a payment target to query
  * @param account_reference command with account private key to query
+ * @param lpt target for long polling
  * @param expected_response_code expected HTTP status
  * @return the command
  */
@@ -2217,6 +2236,7 @@ TALER_TESTING_cmd_check_kyc_get (
   const char *label,
   const char *payment_target_reference,
   const char *account_reference,
+  enum TALER_EXCHANGE_KycLongPollTarget lpt,
   unsigned int expected_response_code);
 
 
@@ -2636,7 +2656,7 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
         enum GNUNET_GenericReturnValue                          \
         TALER_TESTING_get_trait_ ## name (                    \
           const struct TALER_TESTING_Command *cmd,              \
-          type **ret);                                          \
+          type * *ret);                                          \
         struct TALER_TESTING_Trait                              \
         TALER_TESTING_make_trait_ ## name (                   \
           type * value);
@@ -2679,11 +2699,11 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
         TALER_TESTING_get_trait_ ## name (                    \
           const struct TALER_TESTING_Command *cmd,              \
           unsigned int index,                                   \
-          type **ret);                                          \
+          type * *ret);                                          \
         struct TALER_TESTING_Trait                              \
         TALER_TESTING_make_trait_ ## name (                   \
           unsigned int index,                                   \
-          type *value);
+          type * value);
 
 
 /**