From de6fa5ce1278e348a1fa5305143876869133c26d Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Mon, 16 Mar 2020 18:10:56 +0100
Subject: [PATCH] Further updates circle-ci

---
 .circleci/config.yml           | 15 +++++++++------
 test/pisa/e2e/bitcoind_snap.sh |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 test/pisa/e2e/bitcoind_snap.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cdb657e..ef681dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,15 +21,14 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v3-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}
+            - v5-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
             # fallback to using the latest cache if no exact match is found
-            - v3-dependencies-
+            - v5-dependencies-
 
       - run:
           name: Install dependencies
           command: |
-            sudo apt-get install snapd
-            sudo snap install bitcoin-core
+            sudo snap install `cat test/pisa/e2e/bitcoind_snap.sh`
             pyenv local 3.7.0
             python3 -m venv venv
             . venv/bin/activate
@@ -41,7 +40,8 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v3-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}
+            - /snap
+          key: v5-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
 
       # Run unit tests
       - run:
@@ -71,7 +71,10 @@ jobs:
       # Run bitcoind for E2E testing
       - run:
           name: Run bitcoind
-          command: bitcoin-core.daemon -conf=test/pisa/e2e/bitcoin.conf
+          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:
diff --git a/test/pisa/e2e/bitcoind_snap.sh b/test/pisa/e2e/bitcoind_snap.sh
new file mode 100644
index 0000000..78915c2
--- /dev/null
+++ b/test/pisa/e2e/bitcoind_snap.sh
@@ -0,0 +1 @@
+bitcoin-core --channel=0.19/stable
\ No newline at end of file