From 4b5e113c03306478b0bb4734f0553ef70209fa20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dni=20=E2=9A=A1?= <office@dnilabs.com>
Date: Mon, 25 Jul 2022 07:31:15 +0200
Subject: [PATCH] Regtest update (#775)

* preparation pr for regtest update

* remove FIXMEs

Co-authored-by: dni <dni.khr@gmail.com>
---
 .github/workflows/regtest.yml | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml
index 7883cf199..f26e6c386 100644
--- a/.github/workflows/regtest.yml
+++ b/.github/workflows/regtest.yml
@@ -19,17 +19,11 @@ jobs:
           docker build -t lnbits-legend .
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
-          source docker-scripts.sh
-          lnbits-regtest-start
-          echo "sleeping 60 seconds"
-          sleep 60
-          echo "continue"
-          lnbits-regtest-init
-          bitcoin-cli-sim -generate 1
-          lncli-sim 1 listpeers
+          chmod +x ./tests
+          ./tests
           sudo chmod -R a+rwx .
       - name: Install dependencies
-        env: 
+        env:
           VIRTUAL_ENV: ./venv
           PATH: ${{ env.VIRTUAL_ENV }}/bin:${{ env.PATH }}
         run: |
@@ -37,7 +31,7 @@ jobs:
           ./venv/bin/python -m pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
           ./venv/bin/pip install pylightning
-          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock      
+          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock
       - name: Run tests
         env:
           PYTHONUNBUFFERED: 1
@@ -66,17 +60,11 @@ jobs:
           docker build -t lnbits-legend .
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
-          source docker-scripts.sh
-          lnbits-regtest-start
-          echo "sleeping 60 seconds"
-          sleep 60
-          echo "continue"
-          lnbits-regtest-init
-          bitcoin-cli-sim -generate 1
-          lncli-sim 1 listpeers
+          chmod +x ./tests
+          ./tests
           sudo chmod -R a+rwx .
       - name: Install dependencies
-        env: 
+        env:
           VIRTUAL_ENV: ./venv
           PATH: ${{ env.VIRTUAL_ENV }}/bin:${{ env.PATH }}
         run: |
@@ -84,7 +72,7 @@ jobs:
           ./venv/bin/python -m pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
           ./venv/bin/pip install pylightning
-          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock      
+          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock
       - name: Run tests
         env:
           PYTHONUNBUFFERED: 1
@@ -94,4 +82,4 @@ jobs:
           CLIGHTNING_RPC: docker/data/clightning-1/regtest/lightning-rpc
         run: |
           sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
\ No newline at end of file
+          make test-real-wallet