Merge branch 'master' into age-withdraw-merge

1 files changed, 40 insertions, 35 deletions

diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index a15e8dbc..dfaf31fd 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -496,12 +496,8 @@ refresh_reveal_run (void *cls,
   struct RefreshRevealState *rrs = cls;
   struct RefreshMeltState *rms;
   const struct TALER_TESTING_Command *melt_cmd;
-  struct TALER_EXCHANGE_Handle *exchange
-    = TALER_TESTING_get_exchange (is);
 
   rrs->cmd = cmd;
-  if (NULL == exchange)
-    return;
   rrs->is = is;
   melt_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                        rrs->melt_reference);
@@ -518,14 +514,16 @@ refresh_reveal_run (void *cls,
 
     for (unsigned int i = 0; i<rms->num_fresh_coins; i++)
       alg_values[i] = rms->mbds[i].alg_value;
-    rrs->rrh = TALER_EXCHANGE_refreshes_reveal (exchange,
-                                                &rms->rms,
-                                                &rms->refresh_data,
-                                                rms->num_fresh_coins,
-                                                alg_values,
-                                                rms->noreveal_index,
-                                                &reveal_cb,
-                                                rrs);
+    rrs->rrh = TALER_EXCHANGE_refreshes_reveal (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      &rms->rms,
+      &rms->refresh_data,
+      rms->num_fresh_coins,
+      alg_values,
+      rms->noreveal_index,
+      &reveal_cb,
+      rrs);
   }
   if (NULL == rrs->rrh)
   {
@@ -783,13 +781,16 @@ refresh_link_run (void *cls,
   const struct TALER_TESTING_Command *reveal_cmd;
   const struct TALER_TESTING_Command *melt_cmd;
   const struct TALER_TESTING_Command *coin_cmd;
-  struct TALER_EXCHANGE_Handle *exchange
-    = TALER_TESTING_get_exchange (is);
+  const char *exchange_url;
 
   rls->cmd = cmd;
-  if (NULL == exchange)
-    return;
   rls->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   reveal_cmd = TALER_TESTING_interpreter_lookup_command (rls->is,
                                                          rls->reveal_reference);
   if (NULL == reveal_cmd)
@@ -832,11 +833,13 @@ refresh_link_run (void *cls,
   }
 
   /* finally, use private key from withdraw sign command */
-  rls->rlh = TALER_EXCHANGE_link (exchange,
-                                  coin_priv,
-                                  rms->refresh_data.melt_age_commitment_proof,
-                                  &link_cb,
-                                  rls);
+  rls->rlh = TALER_EXCHANGE_link (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    coin_priv,
+    rms->refresh_data.melt_age_commitment_proof,
+    &link_cb,
+    rls);
 
   if (NULL == rls->rlh)
   {
@@ -908,12 +911,8 @@ melt_cb (void *cls,
 {
   struct RefreshMeltState *rms = cls;
   const struct TALER_EXCHANGE_HttpResponse *hr = &mr->hr;
-  struct TALER_EXCHANGE_Handle *exchange
-    = TALER_TESTING_get_exchange (rms->is);
 
   rms->rmh = NULL;
-  if (NULL == exchange)
-    return;
   if (rms->expected_response_code != hr->http_status)
   {
     if (0 != rms->do_retry)
@@ -973,11 +972,14 @@ melt_cb (void *cls,
   {
     TALER_LOG_DEBUG ("Doubling the melt (%s)\n",
                      rms->cmd->label);
-    rms->rmh = TALER_EXCHANGE_melt (exchange,
-                                    &rms->rms,
-                                    &rms->refresh_data,
-                                    &melt_cb,
-                                    rms);
+    rms->rmh = TALER_EXCHANGE_melt (
+      TALER_TESTING_interpreter_get_context (rms->is),
+      TALER_TESTING_get_exchange_url (rms->is),
+      TALER_TESTING_get_keys (rms->is),
+      &rms->rms,
+      &rms->refresh_data,
+      &melt_cb,
+      rms);
     rms->double_melt = false;
     return;
   }
@@ -1149,11 +1151,14 @@ melt_run (void *cls,
     GNUNET_assert (age_restricted ==
                    (NULL != age_commitment_proof));
 
-    rms->rmh = TALER_EXCHANGE_melt (exchange,
-                                    &rms->rms,
-                                    &rms->refresh_data,
-                                    &melt_cb,
-                                    rms);
+    rms->rmh = TALER_EXCHANGE_melt (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      TALER_TESTING_get_keys (is),
+      &rms->rms,
+      &rms->refresh_data,
+      &melt_cb,
+      rms);
 
     if (NULL == rms->rmh)
     {