From 0bc042618692ca196ba4582495976791ccfbc5d5 Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Tue, 17 Mar 2020 11:48:07 +0100
Subject: [PATCH] Changes ports for bitcoind e2e and runs it earlier to give it
 time to boostrap

---
 .circleci/config.yml       | 16 ++++++++--------
 test/pisa/e2e/bitcoin.conf |  8 ++++----
 test/pisa/e2e/pisa-conf.py |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0e3b58..eeef7ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,14 @@ jobs:
             - /snap
           key: v1-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
 
+      # Run bitcoind for E2E testing (running it early so it has time to bootstrap)
+      - run:
+          name: Run bitcoind
+          command: |
+            mkdir -p /home/circleci/snap/bitcoin-core/common/.bitcoin/
+            cp test/pisa/e2e/bitcoin.conf /home/circleci/snap/bitcoin-core/common/.bitcoin/
+            /snap/bin/bitcoin-core.daemon
+
       # Run unit tests
       - run:
           name: Creates config files
@@ -66,14 +74,6 @@ jobs:
             . venv/bin/activate
             pytest test/apps/cli/unit
 
-      # Run bitcoind for E2E testing
-      - run:
-          name: Run bitcoind
-          command: |
-            mkdir -p /home/circleci/snap/bitcoin-core/common/.bitcoin/
-            cp test/pisa/e2e/bitcoin.conf /home/circleci/snap/bitcoin-core/common/.bitcoin/
-            /snap/bin/bitcoin-core.daemon
-
       # Setup pisa for E2E testing
       - run:
           name: Setup pisa
diff --git a/test/pisa/e2e/bitcoin.conf b/test/pisa/e2e/bitcoin.conf
index e11a3ed..3083b7c 100644
--- a/test/pisa/e2e/bitcoin.conf
+++ b/test/pisa/e2e/bitcoin.conf
@@ -15,9 +15,9 @@ rpcallowip=0.0.0.0/0
 rpcservertimeout=300
 
 # [zmq]
-zmqpubhashblock=tcp://0.0.0.0:28332
-zmqpubrawblock=tcp://0.0.0.0:28332
-zmqpubrawtx=tcp://0.0.0.0:28333
+zmqpubhashblock=tcp://0.0.0.0:28335
+zmqpubrawblock=tcp://0.0.0.0:28335
+zmqpubrawtx=tcp://0.0.0.0:28336
 
 # [blockchain]
 txindex=1
@@ -25,4 +25,4 @@ txindex=1
 # There are some parameters that only work in the specific on regtest if specified in the regtest section
 [regtest]
 rpcbind=0.0.0.0
-rpcport=18443
\ No newline at end of file
+rpcport=18445
\ No newline at end of file
diff --git a/test/pisa/e2e/pisa-conf.py b/test/pisa/e2e/pisa-conf.py
index 3c219c1..f53a81b 100644
--- a/test/pisa/e2e/pisa-conf.py
+++ b/test/pisa/e2e/pisa-conf.py
@@ -2,13 +2,13 @@
 BTC_RPC_USER = "user"
 BTC_RPC_PASSWD = "passwd"
 BTC_RPC_HOST = "localhost"
-BTC_RPC_PORT = 18443
+BTC_RPC_PORT = 18445
 BTC_NETWORK = "regtest"
 
 # ZMQ
 FEED_PROTOCOL = "tcp"
 FEED_ADDR = "127.0.0.1"
-FEED_PORT = 28332
+FEED_PORT = 28335
 
 # PISA
 DATA_FOLDER = "~/.pisa_btc/"