major libtalertesting API refactoring, including no longer having taler-specific logic in the test engine core

1 files changed, 10 insertions, 9 deletions

diff --git a/src/testing/testing_api_cmd_delete_account.c b/src/testing/testing_api_cmd_delete_account.c
index 8f1e657a..1490dc31 100644
--- a/src/testing/testing_api_cmd_delete_account.c
+++ b/src/testing/testing_api_cmd_delete_account.c
@@ -124,7 +124,7 @@ delete_account_run (void *cls,
   struct DeleteAccountState *das = cls;
   const struct TALER_TESTING_Command *ref;
   const struct TALER_MerchantWireHashP *h_wire;
-  const char **merchant_url;
+  const char *merchant_url;
 
   das->is = is;
   ref = TALER_TESTING_interpreter_lookup_command (is,
@@ -146,9 +146,9 @@ delete_account_run (void *cls,
     TALER_TESTING_FAIL (is);
     return;
   }
-  for (unsigned int i=0;i<UINT_MAX;i++)
+  for (unsigned int i = 0; i<UINT_MAX; i++)
   {
-    const char **payto_uri;
+    const char *payto_uri;
 
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_payto_uris (ref,
@@ -163,7 +163,7 @@ delete_account_run (void *cls,
       TALER_TESTING_FAIL (is);
       return;
     }
-    if (0 != strcmp (*payto_uri,
+    if (0 != strcmp (payto_uri,
                      das->payto_uri))
       continue; /* different account */
     if (GNUNET_OK !=
@@ -182,11 +182,12 @@ delete_account_run (void *cls,
     break;
   }
   GNUNET_assert (NULL != h_wire);
-  das->adh = TALER_MERCHANT_account_delete (is->ctx,
-                                            *merchant_url,
-                                            h_wire,
-                                            &delete_account_cb,
-                                            das);
+  das->adh = TALER_MERCHANT_account_delete (
+    TALER_TESTING_interpreter_get_context (is),
+    merchant_url,
+    h_wire,
+    &delete_account_cb,
+    das);
   GNUNET_assert (NULL != das->adh);
 }