From dcc80fd35dccf7c4686d267d37c95c38eb5fd36f Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 17 Jan 2020 03:39:15 +0100
Subject: [PATCH] make aggregator test case pass again

---
 src/lib/test-taler-exchange-aggregator-postgres.conf | 9 ++++++++-
 src/lib/test_taler_exchange_aggregator.c             | 9 +++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib/test-taler-exchange-aggregator-postgres.conf b/src/lib/test-taler-exchange-aggregator-postgres.conf
index 25ca80fdf..7f22acd29 100644
--- a/src/lib/test-taler-exchange-aggregator-postgres.conf
+++ b/src/lib/test-taler-exchange-aggregator-postgres.conf
@@ -57,13 +57,20 @@ LEGAL_RESERVE_EXPIRATION_TIME = 7 years
 [account-1]
 
 # What is the account URL?
-URL = "payto://x-taler-bank/localhost:8082/2"
+URL = "payto://x-taler-bank/localhost/2"
+WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
 method = "x-taler-bank"
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 TALER_BANK_AUTH_METHOD = NONE
 
+[bank]
+HTTP_PORT = 8082
+
 [fees-x-taler-bank]
 
 # Fees for the forseeable future...
diff --git a/src/lib/test_taler_exchange_aggregator.c b/src/lib/test_taler_exchange_aggregator.c
index 6ae155083..6241d2bd6 100644
--- a/src/lib/test_taler_exchange_aggregator.c
+++ b/src/lib/test_taler_exchange_aggregator.c
@@ -186,22 +186,19 @@ run (void *cls,
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           TALER_payto_xtalerbank_make (
-                                             bc.bank_url, "4")),
+                                           "payto://x-taler-bank/localhost/4"),
 
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3b",
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           TALER_payto_xtalerbank_make (
-                                             bc.bank_url, "4")),
+                                           "payto://x-taler-bank/localhost/4"),
 
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3c",
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           TALER_payto_xtalerbank_make (
-                                             bc.bank_url, "5")),
+                                           "payto://x-taler-bank/localhost/5"),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-after-3"),
 
     // checking that aggregator waits for the deadline.