1 files changed, 20 insertions, 13 deletions

diff --git a/src/testing/testing_api_cmd_reserve_get_attestable.c b/src/testing/testing_api_cmd_reserve_get_attestable.c
index 29c8f6a3a..ed1eb1355 100644
--- a/src/testing/testing_api_cmd_reserve_get_attestable.c
+++ b/src/testing/testing_api_cmd_reserve_get_attestable.c
@@ -122,23 +122,30 @@ get_attestable_run (void *cls,
                     struct TALER_TESTING_Interpreter *is)
 {
   struct GetAttestableState *ss = cls;
-  const struct TALER_TESTING_Command *create_reserve;
+  const struct TALER_TESTING_Command *ref_reserve;
   const struct TALER_ReservePrivateKeyP *reserve_priv;
   const struct TALER_ReservePublicKeyP *reserve_pub;
+  const char *exchange_url;
 
   ss->is = is;
-  create_reserve
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  ref_reserve
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ss->reserve_reference);
 
-  if (NULL == create_reserve)
+  if (NULL == ref_reserve)
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
     return;
   }
   if (GNUNET_OK ==
-      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+      TALER_TESTING_get_trait_reserve_priv (ref_reserve,
                                             &reserve_priv))
   {
     GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
@@ -147,7 +154,7 @@ get_attestable_run (void *cls,
   else
   {
     if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_pub (create_reserve,
+        TALER_TESTING_get_trait_reserve_pub (ref_reserve,
                                              &reserve_pub))
     {
       GNUNET_break (0);
@@ -158,10 +165,12 @@ get_attestable_run (void *cls,
     }
     ss->reserve_pub = *reserve_pub;
   }
-  ss->rgah = TALER_EXCHANGE_reserves_get_attestable (is->exchange,
-                                                     &ss->reserve_pub,
-                                                     &reserve_get_attestable_cb,
-                                                     ss);
+  ss->rgah = TALER_EXCHANGE_reserves_get_attestable (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    &ss->reserve_pub,
+    &reserve_get_attestable_cb,
+    ss);
 }
 
 
@@ -180,10 +189,8 @@ get_attestable_cleanup (void *cls,
 
   if (NULL != ss->rgah)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ss->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
     TALER_EXCHANGE_reserves_get_attestable_cancel (ss->rgah);
     ss->rgah = NULL;
   }