merchant

commit dbd20b2b84774d4c44aefd6cc218fdc753ceada4
parent 7d4b310acd6206718f92a596a91e1d536777f9fc
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 10 Dec 2017 14:50:59 +0100

use another port for the test, since it's already used on taler.net (see #5209)

Diffstat:
M
src/lib/test_merchant_api.c
 | 
2
+-
M
src/lib/test_merchant_api.conf
 | 
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -42,7 +42,7 @@
 /**
  * URI under which the exchange is reachable during the testcase.
  */
-#define EXCHANGE_URI "http://localhost:8081/"
+#define EXCHANGE_URI "http://localhost:8084/"
 
 /**
  * URI of the bank.
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
@@ -70,7 +70,7 @@ CLOSING-FEE-2026 = EUR:0.01
 
 
 [merchant-exchange-test]
-URI = http://localhost:8081/
+URI = http://localhost:8084/
 MASTER_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
 
 [merchant-instance-default]
@@ -84,12 +84,12 @@ KEYFILE = tor_merchant.priv
 
 [merchant-instance-tip]
 KEYFILE = reserve_tip.priv
-TIP_EXCHANGE = http://localhost:8081/
+TIP_EXCHANGE = http://localhost:8084/
 TIP_RESERVE_PRIV_FILENAME = reserve_key.priv
 
 [merchant-instance-dtip]
 KEYFILE = reserve_dtip.priv
-TIP_EXCHANGE = http://localhost:8081/
+TIP_EXCHANGE = http://localhost:8084/
 TIP_RESERVE_PRIV_FILENAME = reserve_dkey.priv
 
 [merchant-instance-wireformat-tor]
@@ -137,7 +137,7 @@ ADDRESS = "Garching"
 DB = postgres
 
 # HTTP port the exchange listens to
-PORT = 8081
+PORT = 8084
 
 # Our public key
 MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG