-towards reserve history testing

2 files changed, 156 insertions, 28 deletions

diff --git a/src/testing/testing_api_cmd_purse_merge.c b/src/testing/testing_api_cmd_purse_merge.c
index 27aa120ed..28193b3e8 100644
--- a/src/testing/testing_api_cmd_purse_merge.c
+++ b/src/testing/testing_api_cmd_purse_merge.c
@@ -72,6 +72,42 @@ struct PurseMergeState
   struct TALER_TESTING_Interpreter *is;
 
   /**
+   * Reserve history entry that corresponds to this operation.
+   * Will be of type #TALER_EXCHANGE_RTT_MERGE.
+   */
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Public key of the merge capability.
+   */
+  struct TALER_PurseMergePublicKeyP merge_pub;
+
+  /**
+   * Contract value.
+   */
+  struct TALER_Amount value_after_fees;
+
+  /**
+   * Hash of the contract.
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * When does the purse expire.
+   */
+  struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Minimum age of deposits into the purse.
+   */
+  uint32_t min_age;
+
+  /**
    * Expected HTTP response code.
    */
   unsigned int expected_response_code;
@@ -93,6 +129,36 @@ merge_cb (void *cls,
   struct PurseMergeState *ds = cls;
 
   ds->dh = NULL;
+  if (MHD_HTTP_OK == dr->hr.http_status)
+  {
+    const struct TALER_EXCHANGE_Keys *keys;
+    const struct TALER_EXCHANGE_GlobalFee *gf;
+
+    ds->reserve_history.type = TALER_EXCHANGE_RTT_MERGE;
+    keys = TALER_EXCHANGE_get_keys (ds->is->exchange);
+    GNUNET_assert (NULL != keys);
+    gf = TALER_EXCHANGE_get_global_fee (keys,
+                                        ds->merge_timestamp);
+    GNUNET_assert (NULL != gf);
+    ds->reserve_history.amount = gf->fees.purse;
+    ds->reserve_history.details.merge_details.purse_fee = gf->fees.purse;
+    ds->reserve_history.details.merge_details.h_contract_terms
+      = ds->h_contract_terms;
+    ds->reserve_history.details.merge_details.merge_pub
+      = ds->merge_pub;
+    ds->reserve_history.details.merge_details.reserve_sig
+      = *dr->reserve_sig;
+    ds->reserve_history.details.merge_details.merge_timestamp
+      = ds->merge_timestamp;
+    ds->reserve_history.details.merge_details.purse_expiration
+      = ds->purse_expiration;
+    ds->reserve_history.details.merge_details.min_age
+      = ds->min_age;
+    ds->reserve_history.details.merge_details.flags
+      = TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE;
+  }
+
+
   if (ds->expected_response_code != dr->hr.http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -124,13 +190,8 @@ merge_run (void *cls,
            struct TALER_TESTING_Interpreter *is)
 {
   struct PurseMergeState *ds = cls;
-  const struct TALER_PurseContractPublicKeyP *purse_pub;
   const struct TALER_PurseMergePrivateKeyP *merge_priv;
   const json_t *ct;
-  struct TALER_PrivateContractHashP h_contract_terms;
-  uint32_t min_age = 0;
-  struct TALER_Amount value_after_fees;
-  struct GNUNET_TIME_Timestamp purse_expiration;
   const struct TALER_TESTING_Command *ref;
 
   (void) cmd;
@@ -146,14 +207,20 @@ merge_run (void *cls,
     TALER_TESTING_interpreter_fail (ds->is);
     return;
   }
-  if (GNUNET_OK !=
-      TALER_TESTING_get_trait_purse_pub (ref,
-                                         &purse_pub))
   {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (ds->is);
-    return;
+    const struct TALER_PurseContractPublicKeyP *purse_pub;
+
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_purse_pub (ref,
+                                           &purse_pub))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ds->is);
+      return;
+    }
+    ds->purse_pub = *purse_pub;
   }
+
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_contract_terms (ref,
                                               &ct))
@@ -164,7 +231,7 @@ merge_run (void *cls,
   }
   if (GNUNET_OK !=
       TALER_JSON_contract_hash (ct,
-                                &h_contract_terms))
+                                &ds->h_contract_terms))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (ds->is);
@@ -173,12 +240,12 @@ merge_run (void *cls,
   {
     struct GNUNET_JSON_Specification spec[] = {
       GNUNET_JSON_spec_timestamp ("pay_deadline",
-                                  &purse_expiration),
+                                  &ds->purse_expiration),
       TALER_JSON_spec_amount_any ("amount",
-                                  &value_after_fees),
+                                  &ds->value_after_fees),
       GNUNET_JSON_spec_mark_optional (
         GNUNET_JSON_spec_uint32 ("minimum_age",
-                                 &min_age),
+                                 &ds->min_age),
         NULL),
       GNUNET_JSON_spec_end ()
     };
@@ -217,17 +284,19 @@ merge_run (void *cls,
   }
   GNUNET_CRYPTO_eddsa_key_get_public (&ds->reserve_priv.eddsa_priv,
                                       &ds->reserve_pub.eddsa_pub);
+  GNUNET_CRYPTO_eddsa_key_get_public (&merge_priv->eddsa_priv,
+                                      &ds->merge_pub.eddsa_pub);
   ds->merge_timestamp = GNUNET_TIME_timestamp_get ();
   ds->dh = TALER_EXCHANGE_account_merge (
     is->exchange,
     NULL, /* no wad */
     &ds->reserve_priv,
-    purse_pub,
+    &ds->purse_pub,
     merge_priv,
-    &h_contract_terms,
-    min_age,
-    &value_after_fees,
-    purse_expiration,
+    &ds->h_contract_terms,
+    ds->min_age,
+    &ds->value_after_fees,
+    ds->purse_expiration,
     ds->merge_timestamp,
     &merge_cb,
     ds);
@@ -285,12 +354,16 @@ merge_traits (void *cls,
 {
   struct PurseMergeState *ds = cls;
   struct TALER_TESTING_Trait traits[] = {
+    /* history entry MUST be first due to response code logic below! */
+    TALER_TESTING_make_trait_reserve_history (&ds->reserve_history),
     TALER_TESTING_make_trait_timestamp (0,
                                         &ds->merge_timestamp),
     TALER_TESTING_trait_end ()
   };
 
-  return TALER_TESTING_get_trait (traits,
+  return TALER_TESTING_get_trait ((ds->expected_response_code == MHD_HTTP_OK)
+                                  ? &traits[0]   /* we have reserve history */
+                                  : &traits[1],  /* skip reserve history */
                                   ret,
                                   trait,
                                   index);
diff --git a/src/testing/testing_api_cmd_reserve_history.c b/src/testing/testing_api_cmd_reserve_history.c
index e79180643..ec190d5ce 100644
--- a/src/testing/testing_api_cmd_reserve_history.c
+++ b/src/testing/testing_api_cmd_reserve_history.c
@@ -32,6 +32,12 @@
  */
 struct HistoryState
 {
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
   /**
    * Label to the command which created the reserve to check,
    * needed to resort the reserve key.
@@ -54,19 +60,21 @@ struct HistoryState
   const struct TALER_ReservePrivateKeyP *reserve_priv;
 
   /**
-   * Public key of the reserve being analyzed.
+   * Interpreter state.
    */
-  struct TALER_ReservePublicKeyP reserve_pub;
+  struct TALER_TESTING_Interpreter *is;
 
   /**
-   * Expected HTTP response code.
+   * Reserve history entry that corresponds to this operation.
+   * Will be of type #TALER_EXCHANGE_RTT_HISTORY.
    */
-  unsigned int expected_response_code;
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
 
   /**
-   * Interpreter state.
+   * Expected HTTP response code.
    */
-  struct TALER_TESTING_Interpreter *is;
+  unsigned int expected_response_code;
+
 };
 
 
@@ -177,6 +185,21 @@ reserve_history_cb (void *cls,
   struct TALER_Amount eb;
 
   ss->rsh = NULL;
+  if (MHD_HTTP_OK == rs->hr.http_status)
+  {
+    const struct TALER_EXCHANGE_Keys *keys;
+    const struct TALER_EXCHANGE_GlobalFee *gf;
+
+    ss->reserve_history.type = TALER_EXCHANGE_RTT_HISTORY;
+    keys = TALER_EXCHANGE_get_keys (ss->is->exchange);
+    GNUNET_assert (NULL != keys);
+    gf = TALER_EXCHANGE_get_global_fee (keys,
+                                        rs->ts);
+    GNUNET_assert (NULL != gf);
+    ss->reserve_history.amount = gf->fees.history;
+    ss->reserve_history.details.history_details.request_timestamp = rs->ts;
+    ss->reserve_history.details.history_details.reserve_sig = *rs->reserve_sig;
+  }
   if (ss->expected_response_code != rs->hr.http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -291,6 +314,37 @@ history_run (void *cls,
 
 
 /**
+ * Offer internal data from a "history" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+history_traits (void *cls,
+                const void **ret,
+                const char *trait,
+                unsigned int index)
+{
+  struct HistoryState *hs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    /* history entry MUST be first due to response code logic below! */
+    TALER_TESTING_make_trait_reserve_history (&hs->reserve_history),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait ((hs->expected_response_code == MHD_HTTP_OK)
+                                  ? &traits[0]   /* we have reserve history */
+                                  : &traits[1],  /* skip reserve history */
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+/**
  * Cleanup the state from a "reserve history" CMD, and possibly
  * cancel a pending operation thereof.
  *
@@ -334,7 +388,8 @@ TALER_TESTING_cmd_reserve_history (const char *label,
       .cls = ss,
       .label = label,
       .run = &history_run,
-      .cleanup = &history_cleanup
+      .cleanup = &history_cleanup,
+      .traits = &history_traits
     };
 
     return cmd;