implement spend

1 files changed, 146 insertions, 58 deletions

diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index ba293d4b9..ac5dfdc00 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -407,61 +407,6 @@ run (void *cls,
   };
 
   /**
-   * Test CS withdrawal plus spending.
-   */
-  struct TALER_TESTING_Command withdraw_cs[] = {
-    /**
-     * Move money to the exchange's bank account.
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-cs-1",
-                              "EUR:6.02"),
-    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-cs-1",
-                                                 "EUR:6.02",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
-                                                 "create-reserve-cs-1"),
-    /**
-     * Make a reserve exist, according to the previous
-     * transfer.
-     */
-    CMD_EXEC_WIREWATCH ("wirewatch-cs-1"),
-    /**
-     * Withdraw EUR:5.
-     */
-    TALER_TESTING_cmd_withdraw_cs_amount ("withdraw-cs-coin-1",
-                                          "create-reserve-cs-1",
-                                          "EUR:5",
-                                          MHD_HTTP_OK),
-    /**
-     * Withdraw EUR:1 using the SAME private coin key as for the previous coin
-     * (in violation of the specification, to be detected on spending!).
-     */
-    TALER_TESTING_cmd_withdraw_cs_amount_reuse_key ("withdraw-cs-coin-1x",
-                                                    "create-reserve-cs-1",
-                                                    "EUR:1",
-                                                    "withdraw-cs-coin-1",
-                                                    MHD_HTTP_OK),
-    /**
-     * Check the reserve is depleted.
-     */
-    TALER_TESTING_cmd_status ("status-cs-1",
-                              "create-reserve-cs-1",
-                              "EUR:0",
-                              MHD_HTTP_OK),
-    /*
-     * Try to overdraw.
-     */
-    TALER_TESTING_cmd_withdraw_cs_amount ("withdraw-cs-coin-2",
-                                          "create-reserve-cs-1",
-                                          "EUR:5",
-                                          MHD_HTTP_CONFLICT),
-    // TODO: add test for nonce reuse
-    TALER_TESTING_cmd_end ()
-  };
-
-  // TODO: CS related tests
-
-  /**
    * This block checks whether a wire deadline
    * very far in the future does NOT get aggregated now.
    */
@@ -946,6 +891,145 @@ run (void *cls,
     TALER_TESTING_cmd_end ()
   };
 
+  /**
+   * Test CS withdrawal plus spending.
+   */
+  struct TALER_TESTING_Command withdraw_cs[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-cs-1",
+                              "EUR:6.02"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-cs-1",
+                                                 "EUR:6.02",
+                                                 bc.user42_payto,
+                                                 bc.exchange_payto,
+                                                 "create-reserve-cs-1"),
+    /**
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-cs-1"),
+    /**
+     * Withdraw EUR:5.
+     */
+    TALER_TESTING_cmd_withdraw_cs_amount ("withdraw-cs-coin-1",
+                                          "create-reserve-cs-1",
+                                          "EUR:5",
+                                          MHD_HTTP_OK),
+    /**
+     * Withdraw EUR:1 using the SAME private coin key as for the previous coin
+     * (in violation of the specification, to be detected on spending!).
+     */
+    TALER_TESTING_cmd_withdraw_cs_amount_reuse_key ("withdraw-cs-coin-1x",
+                                                    "create-reserve-cs-1",
+                                                    "EUR:1",
+                                                    "withdraw-cs-coin-1",
+                                                    MHD_HTTP_OK),
+    /**
+     * Check the reserve is depleted.
+     */
+    TALER_TESTING_cmd_status ("status-cs-1",
+                              "create-reserve-cs-1",
+                              "EUR:0",
+                              MHD_HTTP_OK),
+    /*
+     * Try to overdraw.
+     */
+    TALER_TESTING_cmd_withdraw_cs_amount ("withdraw-cs-coin-2",
+                                          "create-reserve-cs-1",
+                                          "EUR:5",
+                                          MHD_HTTP_CONFLICT),
+    // TODO: add test for nonce reuse
+    TALER_TESTING_cmd_end ()
+  };
+
+  struct TALER_TESTING_Command spend_cs[] = {
+    /**
+     * Spend the coin.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-cs-simple",
+                               "withdraw-cs-coin-1",
+                               0,
+                               bc.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:5",
+                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit_replay ("deposit-cs-simple-replay",
+                                      "deposit-cs-simple",
+                                      MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit ("deposit-cs-reused-coin-key-failure",
+                               "withdraw-cs-coin-1x",
+                               0,
+                               bc.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:1",
+                               MHD_HTTP_CONFLICT),
+    /**
+     * Try to double spend using different wire details.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-cs-double-1",
+                               "withdraw-cs-coin-1",
+                               0,
+                               bc.user43_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:5",
+                               MHD_HTTP_CONFLICT),
+    /* Try to double spend using a different transaction id.
+     * The test needs the contract terms to differ. This
+     * is currently the case because of the "timestamp" field,
+     * which is set automatically by #TALER_TESTING_cmd_deposit().
+     * This could theoretically fail if at some point a deposit
+     * command executes in less than 1 ms. *///
+    TALER_TESTING_cmd_deposit ("deposit-cs-double-1",
+                               "withdraw-cs-coin-1",
+                               0,
+                               bc.user43_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:5",
+                               MHD_HTTP_CONFLICT),
+    /**
+     * Try to double spend with different proposal.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-cs-double-2",
+                               "withdraw-cs-coin-1",
+                               0,
+                               bc.user43_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":2}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:5",
+                               MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_end ()
+  };
+
+  // TODO: CS refresh
+
+  struct TALER_TESTING_Command track_cs[] = {
+    /* Try resolving a deposit's WTID, as we never triggered
+     * execution of transactions, the answer should be that
+     * the exchange knows about the deposit, but has no WTID yet.
+     *///
+    TALER_TESTING_cmd_track_transaction ("deposit-cs-wtid-found",
+                                         "deposit-cs-simple",
+                                         0,
+                                         MHD_HTTP_ACCEPTED,
+                                         NULL),
+    /* Try resolving a deposit's WTID for a failed deposit.
+     * As the deposit failed, the answer should be that the
+     * exchange does NOT know about the deposit.
+     */
+    TALER_TESTING_cmd_track_transaction ("deposit-cs-wtid-failing",
+                                         "deposit-cs-double-2",
+                                         0,
+                                         MHD_HTTP_NOT_FOUND,
+                                         NULL),
+    TALER_TESTING_cmd_end ()
+  };
+
 #define RESERVE_OPEN_CLOSE_CHUNK 4
 #define RESERVE_OPEN_CLOSE_ITERATIONS 3
 
@@ -1007,9 +1091,6 @@ run (void *cls,
                                refresh),
       TALER_TESTING_cmd_batch ("track",
                                track),
-      TALER_TESTING_cmd_batch ("withdraw-cs",
-                               withdraw_cs),
-      // TODO: Clause Schnorr related tests
       TALER_TESTING_cmd_batch ("unaggregation",
                                unaggregation),
       TALER_TESTING_cmd_batch ("aggregation",
@@ -1018,6 +1099,13 @@ run (void *cls,
                                refund),
       TALER_TESTING_cmd_batch ("recoup",
                                recoup),
+      TALER_TESTING_cmd_batch ("withdraw-cs",
+                               withdraw_cs),
+      TALER_TESTING_cmd_batch ("spend-cs",
+                               spend_cs),
+      // TODO: Clause Schnorr refresh
+      TALER_TESTING_cmd_batch ("track-cs",
+                               track_cs),
       TALER_TESTING_cmd_batch ("reserve-open-close",
                                reserve_open_close),
       /* End the suite. */