[taler-exchange] branch master updated (04565bcb -> 3036c212)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from 04565bcb -missing
     new 5e2e71ec -testing...
     new 3036c212 fix cmd reserve close FTBFS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/gana                                |  2 +-
 src/testing/Makefile.am                     |  1 +
 src/testing/test_exchange_p2p.c             |  6 ++++++
 src/testing/testing_api_cmd_reserve_close.c | 10 +++++-----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 58a94dc4..06f87278 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 58a94dc411d8ec0f23c5364c37719e90bb9ad8a9
+Subproject commit 06f872786739c76d29d31ab45eae4a7e8da2e890
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 256276ce..8042631a 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -86,6 +86,7 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_refund.c \
   testing_api_cmd_refresh.c \
   testing_api_cmd_reserve_attest.c \
+  testing_api_cmd_reserve_close.c \
   testing_api_cmd_reserve_get.c \
   testing_api_cmd_reserve_get_attestable.c \
   testing_api_cmd_reserve_history.c \
diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c
index 726dc315..e9c3b65b 100644
--- a/src/testing/test_exchange_p2p.c
+++ b/src/testing/test_exchange_p2p.c
@@ -353,6 +353,9 @@ run (void *cls,
       NULL),
     TALER_TESTING_cmd_end ()
   };
+  struct TALER_TESTING_Command reserves[] = {
+    TALER_TESTING_cmd_end ()
+  };
 
   struct TALER_TESTING_Command commands[] = {
     /* setup exchange */
@@ -384,6 +387,9 @@ run (void *cls,
                                               config_file),
     TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
                                                 1),
+    TALER_TESTING_cmd_batch ("reserves",
+                             reserves),
+    TALER_TESTING_cmd_end (), // FIXME
     TALER_TESTING_cmd_batch ("withdraw",
                              withdraw),
     TALER_TESTING_cmd_batch ("push",
diff --git a/src/testing/testing_api_cmd_reserve_close.c 
b/src/testing/testing_api_cmd_reserve_close.c
index 5b729375..4c243c74 100644
--- a/src/testing/testing_api_cmd_reserve_close.c
+++ b/src/testing/testing_api_cmd_reserve_close.c
@@ -44,9 +44,9 @@ struct CloseState
   struct TALER_EXCHANGE_ReservesCloseHandle *rsh;
 
   /**
-   * Expected reserve balance.
+   * payto://-URI where to wire the funds.
    */
-  const char *expected_balance;
+  const char *target_account;
 
   /**
    * Private key of the reserve being analyzed.
@@ -79,11 +79,10 @@ struct CloseState
  */
 static void
 reserve_close_cb (void *cls,
-                  const struct TALER_EXCHANGE_ReserveClose *rs)
+                  const struct TALER_EXCHANGE_ReserveCloseResult *rs)
 {
   struct CloseState *ss = cls;
   struct TALER_TESTING_Interpreter *is = ss->is;
-  struct TALER_Amount eb;
 
   ss->rsh = NULL;
   if (ss->expected_response_code != rs->hr.http_status)
@@ -147,6 +146,7 @@ close_run (void *cls,
                                       &ss->reserve_pub.eddsa_pub);
   ss->rsh = TALER_EXCHANGE_reserves_close (is->exchange,
                                            ss->reserve_priv,
+                                           ss->target_account,
                                            &reserve_close_cb,
                                            ss);
 }
@@ -189,7 +189,7 @@ TALER_TESTING_cmd_reserve_close (const char *label,
   GNUNET_assert (NULL != reserve_reference);
   ss = GNUNET_new (struct CloseState);
   ss->reserve_reference = reserve_reference;
-  ss->expected_balance = expected_balance;
+  ss->target_account = target_account;
   ss->expected_response_code = expected_response_code;
   {
     struct TALER_TESTING_Command cmd = {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.