From d95f2a9e437b946bba66c2a0054524fc2e320621 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 17 Jan 2020 23:40:33 +0100
Subject: DCE, part one

---
 src/benchmark/taler-exchange-benchmark.c | 44 ++++++++++----------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

(limited to 'src/benchmark')

diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index bf6bf4f91..d2f1b8420 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -56,14 +56,6 @@ enum BenchmarkError
 
 #define FIRST_INSTRUCTION -1
 
-#define CMD_TRANSFER_TO_EXCHANGE(label, amount) \
-  TALER_TESTING_cmd_admin_add_incoming_retry \
-    (TALER_TESTING_cmd_admin_add_incoming (label, amount, \
-                                           exchange_bank_account.details. \
-                                           x_taler_bank.account_base_url,    \
-                                           NULL, \
-                                           user_payto_url))
-
 
 /**
  * What mode should the benchmark run in?
@@ -90,7 +82,7 @@ enum BenchmarkMode
 /**
  * Hold information regarding which bank has the exchange account.
  */
-static struct TALER_Account exchange_bank_account;
+static struct TALER_BANK_AuthenticationData exchange_bank_account;
 
 /**
  * Configuration of our exchange.
@@ -190,6 +182,18 @@ static char *remote_dir;
 static int linger;
 
 
+static struct TALER_TESTING_Command
+CMD_TRANSFER_TO_EXCHANGE (char *label, char *amount)
+{
+  return TALER_TESTING_cmd_admin_add_incoming_retry
+           (TALER_TESTING_cmd_admin_add_incoming (label, amount,
+                                                  exchange_bank_account.
+                                                  wire_gateway_url,
+                                                  NULL,
+                                                  user_payto_url));
+}
+
+
 /**
  * Decide which exchange account is going to be
  * used to address a wire transfer to.  Used at
@@ -462,7 +466,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
                         NULL == loglev ? "INFO" : loglev,
                         logfile);
       GNUNET_SCHEDULER_run (&launch_fakebank,
-                            exchange_bank_account.details.x_taler_bank.hostname);
+                            exchange_bank_account.wire_gateway_url);
       exit (0);
     }
     if (-1 == fakebank)
@@ -855,26 +859,6 @@ main (int argc,
                                  "url");
       return BAD_CONFIG_FILE;
     }
-
-    if (TALER_EC_NONE !=
-        TALER_BANK_payto_to_account (exchange_payto_url,
-                                     &exchange_bank_account))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Malformed payto:// URL `%s' in configuration\n"),
-                  exchange_payto_url);
-      GNUNET_free (exchange_payto_url);
-      return BAD_CONFIG_FILE;
-    }
-    if (TALER_PAC_X_TALER_BANK != exchange_bank_account.type)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ (
-                    "Malformed payto:// URL `%s' in configuration: x-taler-bank required\n"),
-                  exchange_payto_url);
-      GNUNET_free (exchange_payto_url);
-      return BAD_CONFIG_FILE;
-    }
   }
   if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) )
   {
-- 
cgit v1.2.3