run fakebank on 8083, use new port consistently

4 files changed, 27 insertions, 18 deletions

diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index cdc0effc..1e54107d 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -41,6 +41,16 @@
 #define EXCHANGE_URI "http://localhost:8081/"
 
 /**
+ * URI of the bank.
+ */
+#define BANK_URI "http://localhost:8083/"
+
+/**
+ * On which port do we run the (fake) bank?
+ */
+#define BANK_PORT 8083
+
+/**
  * Handle to access the exchange.
  */
 static struct TALER_EXCHANGE_Handle *exchange;
@@ -1604,19 +1614,11 @@ run (void *cls)
   struct InterpreterState *is;
   static struct Command commands[] =
   {
-#if NEW_MARCELLO_CODE
-    { .oc = OC_TRACK_DEPOSIT,
-      .label = "track-deposit-1",
-      .expected_response_code = MHD_HTTP_OK,
-      .details.track_deposit.wtid = "TESTWTID"},
-
-    { .oc = OC_END },
-#endif
     /* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per config */
     { .oc = OC_ADMIN_ADD_INCOMING,
       .label = "create-reserve-1",
       .expected_response_code = MHD_HTTP_OK,
-      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"http://localhost/\", \"account_number\":62, \"uuid\":1 }",
+      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"" BANK_URI "\", \"account_number\":62, \"uuid\":1 }",
       .details.admin_add_incoming.transfer_details = "{ \"uuid\": 1}",
       .details.admin_add_incoming.amount = "EUR:5.01" },
     /* Withdraw a 5 EUR coin, at fee of 1 ct */
@@ -1664,7 +1666,7 @@ run (void *cls)
     { .oc = OC_ADMIN_ADD_INCOMING,
       .label = "create-reserve-2",
       .expected_response_code = MHD_HTTP_OK,
-      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"http://localhost/\", \"account_number\":63, \"uuid\":2 }",
+      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"" BANK_URI "\", \"account_number\":63, \"uuid\":2 }",
       .details.admin_add_incoming.transfer_details = "{ \"uuid\": 2}",
       .details.admin_add_incoming.amount = "EUR:1" },
     /* Add another 4.01 EUR to reserve #2 */
@@ -1672,7 +1674,7 @@ run (void *cls)
       .label = "create-reserve-2b",
       .expected_response_code = MHD_HTTP_OK,
       .details.admin_add_incoming.reserve_reference = "create-reserve-2",
-      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"http://localhost/\", \"account_number\":63, \"uuid\":3  }",
+      .details.admin_add_incoming.sender_details = "{ \"type\":\"test\", \"bank_uri\":\"" BANK_URI "\", \"account_number\":63, \"uuid\":3  }",
       .details.admin_add_incoming.transfer_details = "{ \"uuid\": 3}",
       .details.admin_add_incoming.amount = "EUR:4.01" },
 
@@ -1683,17 +1685,24 @@ run (void *cls)
       .details.reserve_withdraw.reserve_reference = "create-reserve-2",
       .details.reserve_withdraw.amount = "EUR:5" },
 
-    /* Run transfers. */
 #if 0
+    /* Run transfers. */
     { .oc = OC_RUN_AGGREGATOR,
       .label = "run-aggregator" },
 #endif
+#if NEW_MARCELLO_CODE
+    { .oc = OC_TRACK_DEPOSIT,
+      .label = "track-deposit-1",
+      .expected_response_code = MHD_HTTP_OK,
+      .details.track_deposit.wtid = "TESTWTID"},
+
+#endif
     { .oc = OC_END }
   };
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Interpreter initializing\n");
-  fakebank = TALER_FAKEBANK_start (8888);
+  fakebank = TALER_FAKEBANK_start (BANK_PORT);
   if (NULL == fakebank)
   {
     fprintf (stderr,
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
index 7d603c6d..2b4d66f7 100644
--- a/src/lib/test_merchant_api.conf
+++ b/src/lib/test_merchant_api.conf
@@ -95,7 +95,7 @@ TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/test.json
 
 [exchange-wire-outgoing-test]
 # What is the main website of the bank?
-BANK_URI = "http://localhost/"
+BANK_URI = "http://localhost:8083/"
 # Into which account at the 'bank' should (incoming) wire transfers be made?
 BANK_ACCOUNT_NUMBER = 2
 
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json b/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json
index 42b3b19e..99c9c661 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json
+++ b/src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json
@@ -1,5 +1,5 @@
 {
   "type":"test",
-  "bank_uri":"http://localhost/",
+  "bank_uri":"http://localhost:8083/",
   "account_number":62
 }
diff --git a/src/lib/test_merchant_api_home/.config/taler/test.json b/src/lib/test_merchant_api_home/.config/taler/test.json
index cea8128e..6c8c61f4 100644
--- a/src/lib/test_merchant_api_home/.config/taler/test.json
+++ b/src/lib/test_merchant_api_home/.config/taler/test.json
@@ -1,8 +1,8 @@
 {
   "name": "The exchange",
   "account_number": 3,
-  "salt": "YJGMBQ9JQR767THRXQTXP00WPMEZPQ54WHYJ4SARW1CG1PEG34W19BDSMW0B3D45XMTSHMMCCG2VBXD22GBJP788J9CR90JEYH8DA70",
-  "bank_uri": "http://localhost/",
+  "bank_uri": "http://localhost:8083/",
+  "salt": "6259MV4W9V8D2A75RSGGPKYHQRXRPQZ33EBG263JZRJ6SA5HK0RRKHV70TNA1RVRG77M57CCFVSK2B0EJN3SR8S21F0ZX2MR9DNVG50",
   "type": "test",
-  "sig": "Z97149S8AGD6RDD20ZFBNKD514Q4VGFPSC0RYS59GJCPAKTAKWW8TQ1MDSSDM2569FRQXWKZVSCVP99Y9HWAF28Q0PVDZF7PC928J2G"
+  "sig": "8C3D3J816S29AA2AJ7P9TS6W13KFNFS2RCVYJEWRBNHRRMTTRAWKY7WA1N3G54E4K3XAC2HN6JDHS42TWR5315J34JHHCKV618K221G"
 }
\ No newline at end of file